updated tutorial

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog #
 
-## v0.12 ##
+## v0.11.2 ##
+- Added: opt-out feature for location information
+- Changed: better installation guide
+
+## v0.11.1 ##
 - Fixed: non-responsiveness after some requests to Spotify
 
 ## v0.11 ##

README.md

@@ -18,31 +18,37 @@ A quick rundown of its coolness:
 ### A controller, not a workflow ###
 
 Spotifious just *feels* fun to use, like a real plugin for Alfred, not a workflow. It
-can do in-depth, album-scouring searches and gives you useful information even if something goes wrong.
+can do in-depth, album-scouring searches and gives you useful information even if something goes wrong. Filter by artist or album, search for specific tracks or just plain see what's playing. It's all there.
 
 Not unlike the iTunes Mini Player.
 
 ### Alfred-like ###
 
-Spotifious is also especially Alfred-like. Just start typing to scour Spotify's servers for music. Browse through artists and albums like nobody's business  and drill down through Queen's huge anthologies with a snappy context-based search.
+Spotifious is also especially Alfred-like. Just start typing to scour Spotify's servers for music. Browse through artists and albums like nobody's business and drill down through Queen's huge anthologies with a snappy context-based search and filtering. Your frequent searches rise to the top, and your controls pop up with the letter `c`.
 
 ### Smart ###
 
-Spotifious uses Packal to make sure you always have the latest version. It gives you a heads-up about what's going on with Spotify *the moment you
-start it*. And don't worry about errors— we'll handle those.
+Spotifious uses Packal to make sure you always have the latest version. It gives you a heads-up about what's going on with Spotify *the moment you start it*. And don't worry about errors— we'll handle those. All you have to do is choose how you want to pop it up on screen.
 
 ## Download & Install ##
 
-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)
+Latest version: [v0.11.2](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip) | Latest dev build: [v0.11.2](https://github.com/citelao/Spotify-for-Alfred/archive/dev.zip)
 
 1. [Download](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip)
 this repository.
 2. Open `Spotifious.alfredworkflow` by double-clicking it or dragging it into
 Alfred.
-3. Double-click the thingy marked `Hotkey`.
+3. Double-click the first thingy marked `Hotkey`.
 4. Click the textfield labeled `Hotkey` and press `^⌘⏎`.
 5. Click `Save` to store the binding.
-6. Continue on with your merry day— but now with Spotifious.
+6. Bind the other hotkeys as you wish. Their actions are visible in the `Text` field, under `Argument`.
+7. Pop up Spotifious with the key command you set— I would have `^⌘⏎`.
+8. Follow the instructions on the settings menu.
+9. You'll be asked to type in your country.
+ - Type it in, if you'd like. This option is recommmended.
+ - Choose `I'd rather not give a country!`. The country is stored locally and only sent to Spotify to narrow results, with no other identifying information, but Spotifious can avoid that if you'd prefer. Choosing this option will noticeably degrade your search results. 
+ - You can always change your settings by typing `s` at the main menu.
+10. Continue on with your merry day— but now with Spotifious.
 
 ![A visual install guide](include/screenshots/install.png)
 
@@ -69,6 +75,14 @@ If you're looking through a really long album or a particularly prodigious artis
 
 **Note:** You can always leave a menu and go back just by pressing `⌫`.
 
+You can access a small controls menu by typing `c` at the main menu.
+
+![A preview of the controls menu](include/screenshots/controls.png)
+
+You can change your settings by typing `s` at the main menu.
+
+![The settings menu](include/screenshots/settings.png)
+
 ## Acknowledgements ##
 
 A lot of people helped out on this:
@@ -92,11 +106,12 @@ Oh, and thanks for reading this whole README. I hope you enjoy Spotifious!
 
 See `CHANGELOG.md` for more detailed information.
 
-- v0.11.1: fixed response freezing
-- v0.11: new API, hotkeys, and notifications
+- v0.11.2: Location opt-out and tutorial
+- 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.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.

info.plist

@@ -345,7 +345,7 @@
  </array>
  <key>readme</key>
  <string># Spotifious
-# v0.10
+# v0.11
 
 I’ve worked a long time on it to make it as good as it can be, and if you have any ideas to make it better or if you need to complain, leave me a note on my GitHub page or on the forum threads, linked below.
 

src/citelao/Spotifious/Menus/DetailAlbum.php

@@ -32,7 +32,11 @@ public function __construct($options) {
  $this->name = $artistJson->name;
  $this->type = $artistJson->type;
 
- $tracksFetcher = new JsonFetcher("https://api.spotify.com/v1/albums/{$options['id']}/tracks?market=$locale");
+ $url = "https://api.spotify.com/v1/albums/{$options['id']}/tracks";
+ if($locale != 'not-given') {
+ $url .= "?market=$locale";
+ }
+ $tracksFetcher = new JsonFetcher($url);
  $tracksJson = $tracksFetcher->run();
 
  $this->tracks = array();

src/citelao/Spotifious/Menus/DetailArtist.php

@@ -32,7 +32,11 @@ public function __construct($options) {
  $this->name = $artistJson->name;
  $this->type = $artistJson->type;
 
- $albumFetcher = new JsonFetcher("https://api.spotify.com/v1/artists/{$options['id']}/albums?market=$locale");
+ $url = "https://api.spotify.com/v1/artists/{$options['id']}/albums";
+ if($locale != 'not-given') {
+ $url .= "?market=$locale";
+ }
+ $albumFetcher = new JsonFetcher($url);
  $albumsJson = $albumFetcher->run();
 
  $this->albums = array();

src/citelao/Spotifious/Menus/Search.php

@@ -20,7 +20,10 @@ public function __construct($query) {
 
  /* Fetch and parse the search results. */
  $urlQuery = str_replace("%3A", ":", urlencode($query));
- $url = "https://api.spotify.com/v1/search?q=$urlQuery&type=artist,album,track&market=$locale";
+ $url = "https://api.spotify.com/v1/search?q=$urlQuery&type=artist,album,track";
+ if($locale != 'not-given') {
+ $url .= "&market=$locale";
+ }
 
  $fetcher = new JsonFetcher($url);
  $json = $fetcher->run();

src/citelao/Spotifious/Menus/SetupCountryCode.php

@@ -25,6 +25,11 @@ public function __construct($query) {
 
  $this->countries[] = $currentCountry;
  }
+
+ $this->countries[] = array(
+ 'name' => "I'd rather not give a country!",
+ 'code' => 'not-given'
+ );
  }
 
  public function output() {
@@ -66,7 +71,8 @@ protected function countrySort($a, $b) {
  "United States", // America first hehehe
  "United Kingdom",
  "Canada",
- "Australia"
+ "Australia",
+ "I'd rather not give a country!"
  );
 
  if(in_array($a['title'], $common)) {