Merge pull request #42 from citelao/dev

Geographic filtering and a whole lot more

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog #
 
+## v0.12 ##
+- Fixed: non-responsiveness after some requests to Spotify
+
+## v0.11 ##
+- Added: hotkeys, configurable via Alfred
+- Added: notifications
+- Added: controls menu (type `c`)
+- Changed: using Spotify's faster web API!
+- Changed: non-unicode popularity glyphs
+
+## v0.10 ##
+- Added: Settings menu (accessible using "s")
+- Added: Location-based filtering of search results
+- Changed: Actions route through `action.php` now, instead of direct Applescript execution.
+
 ## v0.9.4 ##
 - Changed: more compatibility changes for PHP v5.3. These did not get included in v0.9.3.
 

LICENSE.md

@@ -0,0 +1,42 @@
+# Licenses
+
+## Main code
+
+You may do what you want with this program and its source subject to these restrictions:
+
+- You MUST reference me (Ben Stolovitz) as the author of the original version
+- You MUST provide a link to this original version
+- You MUST respect the licenses for the software below
+- You MUST NOT misrepresent this software as yours.
+
+## Entypo
+
+Entypo pictograms by Daniel Bruce — www.entypo.com
+
+I created album.png, if you were wondering. The other images are Entypo's.
+
+## Terminal Notifier
+
+All the works are available under the MIT license. **Except** for
+‘Terminal.icns’, which is a copy of Apple’s Terminal.app icon and as such is
+copyright of Apple.
+
+Copyright (C) 2012-2013 Eloy Durán <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -33,7 +33,7 @@ start it*. And don't worry about errors— we'll handle those.
 
 ## Download & Install ##
 
-Latest version: [v0.9.4](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip) | Latest dev build: [v0.9.4](https://github.com/citelao/Spotify-for-Alfred/archive/dev.zip)
+Latest version: [v0.11.1](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip) | Latest dev build: [v0.11.1](https://github.com/citelao/Spotify-for-Alfred/archive/dev.zip)
 
 1. [Download](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip)
 this repository.
@@ -92,15 +92,18 @@ Oh, and thanks for reading this whole README. I hope you enjoy Spotifious!
 
 See `CHANGELOG.md` for more detailed information.
 
-- v0.9.4: actually implemented the aforementioned changes.
-- v0.9.3: more compatibility changes for PHP v5.3
-- v0.9.2: Compatibility changes for PHP v5.3
-- v0.9.1: Fixed "no track" bug.
-- v0.9:   Added error reporting and context-based searching; restructrued app.
-- v0.8:   Added new icons; set them as default
-- v0.7:   General clean-up; added artist- and album-specific menus
-- v0.6:   Added Alleyoop support
-- v0.5:   Added a menu system
-- v0.1:   Inital search system
+- v0.11.1: fixed response freezing
+- v0.11:   new API, hotkeys, and notifications
+- v0.10:   Location-based filtering
+- v0.9.4:  Actually implemented the aforementioned changes
+- v0.9.3:  more compatibility changes for PHP v5.3
+- v0.9.2:  Compatibility changes for PHP v5.3
+- v0.9.1:  Fixed "no track" bug.
+- v0.9:    Added error reporting and context-based searching; restructrued app.
+- v0.8:    Added new icons; set them as default
+- v0.7:    General clean-up; added artist- and album-specific menus
+- v0.6:    Added Alleyoop support
+- v0.5:    Added a menu system
+- v0.1:    Inital search system
 
 This code is MIT Licensed.

action.php

@@ -0,0 +1,19 @@
+<?php
+// thanks to http://www.alfredforum.com/topic/1788-prevent-flash-of-no-result
+mb_internal_encoding("UTF-8");
+date_default_timezone_set('America/New_York');
+
+use OhAlfred\OhAlfred;
+use Spotifious\Spotifious;
+require 'vendor/autoload.php';
+
+$spotifious = new Spotifious();
+
+$action = $argv[1];
+$results = $spotifious->process($action);
+
+// For debugging
+// print_r($action);
+// print("\n");
+
+print_r($results);

include/terminal-notifier.app/Contents/Info.plist

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>13F34</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>terminal-notifier</string>
+	<key>CFBundleIconFile</key>
+	<string>Spotify</string>
+	<key>CFBundleIdentifier</key>
+	<string>nl.superalloy.oss.terminal-notifier.citelao-icon</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>terminal-notifier</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.6.1</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>12</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>6A317</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>13F26</string>
+	<key>DTSDKName</key>
+	<string>macosx10.9</string>
+	<key>DTXcode</key>
+	<string>0600</string>
+	<key>DTXcodeBuild</key>
+	<string>6A317</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.8</string>
+	<key>LSUIElement</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2012 Eloy Durán. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

include/terminal-notifier.app/Contents/PkgInfo

@@ -0,0 +1 @@
+APPL????

include/terminal-notifier.app/Contents/Resources/en.lproj/Credits.rtf

@@ -0,0 +1,29 @@
+{\rtf0\ansi{\fonttbl\f0\fswiss Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\paperw9840\paperh8400
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs24 \cf0 Engineering:
+\b0 \
+	Some people\
+\
+
+\b Human Interface Design:
+\b0 \
+	Some other people\
+\
+
+\b Testing:
+\b0 \
+	Hopefully not nobody\
+\
+
+\b Documentation:
+\b0 \
+	Whoever\
+\
+
+\b With special thanks to:
+\b0 \
+	Mom\
+}