Added support for automatic updates

Updated readme file
Updated Spotify extension
Added an autoloader
Added new code libraries
Updated search to use these new libraries
Added an update and releases file

Author: phpfunk

README.md

@@ -8,6 +8,9 @@ If you are looking for the Spotify Extension for Alfred Version 1, you can find
 
 To install Spotify Controls in Alfred double click on `Spotify.alfredworkflow` or drag the workflow to the workflow window in Alfred.
 
+## Using automatic updates
+The auto-updater is baked just for this extension. It will ping Github and get the last 5 releases of this extension. You can easily press `Enter` to install a new version, or downgrade to an older version. If you would like to view the release first, simply `Control + Enter` to be taken directly to the release page on Github. Yep that's it. No more downloading squat from here.
+
 ## Hotkeys
 Version 2.2.1 introduced the use of Hotkeys to invoke certain actions. All hotkeys are customizable in the workflow.
 
@@ -52,6 +55,7 @@ spot repeat   ::  Toggle repeat (only available in 0.8.0 or above)
 spot help     ::  Open this help file
 spot dev      ::  My info
 spot clear    ::  Clears any artwork cache from you HDD
+spot update   ::  Gets the last 5 releases of the extension, enter to install, ctrl+enter to view release
 
 Commands that also send a notification
 spot now      ::  Current track name, artist, album and duration (can also use i or current)
@@ -96,6 +100,7 @@ $ spot repeat
 $ spot help
 $ spot dev
 $ spot version
+$ spot update
 ```
 
 ## Searching using the Hotkey (default to Command + Return)
@@ -135,6 +140,10 @@ Instead it calls out to the actual Spotify URL and scrapes the image from the pa
 ### Creating a Radio Station from the current track
 Easy, just press the Hotkey command of `Option + Command + R` and the workflow will create a Spotify radio station from the current track playing. The Hotkey can be customized in the workflow to anything you would like.
 
+
+### Using automatic updates
+The auto-updater is baked just for this extension. It will ping Github and get the last 5 releases of this extension. You can easily press `Enter` to install a new version, or downgrade to an older version. If you would like to view the release first, simply `Control + Enter` to be taken directly to the release page on Github. Yep that's it. No more downloading squat from here.
+
 ## Contributors
 
 * [Jeff Johns](https://github.com/phpfunk)
@@ -148,6 +157,11 @@ Easy, just press the Hotkey command of `Option + Command + R` and the workflow w
 
 ## Version History
 
+### 2.2.2 - July 7, 2013
+* Added support for automatic updates
+* Updated Spotify icon
+* Updated codebase a bit
+
 ### 2.2.1 - July 3, 2013
 * Added hotkey support for searching
 * Added hotkey support for creating custom radio stations

Spotify.alfredworkflow

@@ -2,5 +2,5 @@
 
 function __autoload($class)
 {
-    require 'libs/' . $class . '.php';
+    require dirname(__FILE__) . '/libs/' . $class . '.php';
 }

autoload.php

@@ -23,21 +23,22 @@ public static function get($repo, $release, $user='phpfunk', $max_releases=5)
             $current  = str_replace('.', '', $release);
 
             foreach ($arr as $n => $release) {
-                if ($x < $max_releases) {
+                if ($x <= $max_releases) {
 
                     $title = 'Version ' . $release;
                     if ($current > $n) {
-                        $subtitle = 'Downgrade to version ' . $release . '. (Ctrl+Enter to view release)';
+                        $subtitle = 'Downgrade to version ' . $release . '. (Ctrl+Enter to view this release)';
                     }
                     elseif ($current < $n) {
-                        $subtitle = 'Upgrade to version ' . $release . '. (Ctrl+Enter to view release)';
+                        $subtitle = 'Upgrade to version ' . $release . '. (Ctrl+Enter to view this release)';
                     }
                     else {
                         $title    .= ' (Current Version)';
                         $subtitle = 'This is the version you are currently running.';
                     }
 
                     array_push($releases, array(
+                        'uid'             => $release,
                         'arg'             => $release,
                         'title'           => $title,
                         'subtitle'        => $subtitle,
@@ -54,6 +55,7 @@ public static function get($repo, $release, $user='phpfunk', $max_releases=5)
         else {
             $release = array();
             array_push($releases, array(
+                'uid'             => 'error',
                 'arg'             => 'error',
                 'title'           => 'Error',
                 'subtitle'        => 'There was an error extracting the releases from Github.',
@@ -63,7 +65,31 @@ public static function get($repo, $release, $user='phpfunk', $max_releases=5)
         }
 
         if (! empty($releases)) {
-                print Tools::arrayToXML($releases);
-            }
+            print Tools::arrayToXML($releases);
+        }
+    }
+
+    public static function update($release)
+    {
+        $user_folder = explode('/', dirname(__FILE__));
+        $user_folder = '/' . $user_folder[1] . '/' . $user_folder[2];
+        $dl_locale   = $user_folder . '/Downloads/Spotify.alfredworkflow';
+        $workflow    = 'https://github.com/phpfunk/alfred-spotify-controls/raw/' . $release . '/Spotify.alfredworkflow';
+        $file        = fopen($dl_locale, 'w');
+        $ch          = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $workflow);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_FILE, $file);
+        curl_exec($ch);
+        curl_close($ch);
+        fclose($file);
+
+        if (! file_exists($dl_locale)) {
+            print 'Sorry, could NOT download the update :(';
+        }
+        else {
+            shell_exec('open "' . $dl_locale . '"');
+        }
     }
 }

libs/Releases.php

@@ -1,3 +1,3 @@
 <?php
-include 'autoload.php';
+include dirname(__FILE__) . '/autoload.php';
 Releases::get('alfred-spotify-controls', '2.2.2');

libs/Spotify.php

@@ -1,6 +1,5 @@
 <?php
-include_once 'incl/functions.php';
-
+include dirname(__FILE__) . '/autoload.php';
 $query          = $argv[2];
 $show_images    = (isset($argv[1]) && trim(strtolower($argv[1])) == 'yes') ? true : false;
 $tmp            = explode(' ', $query);
@@ -16,7 +15,7 @@
     exit(1);
 }
 
-$json       = fetch('http://ws.spotify.com/search/1/' . $type . '.json?q=' . urlencode($query));
+$json       = Tools::fetch('http://ws.spotify.com/search/1/' . $type . '.json?q=' . urlencode($query));
 $results    = array();
 
 if (! empty($json)) {
@@ -47,7 +46,7 @@
                 $thumb_path    = $thumbs_path . '/' . $track_id . '.png';
 
                 if (! file_exists($thumb_path)) {
-                    $artwork = getTrackArtwork($type, $track_id);
+                    $artwork = Tools::getTrackArtwork($type, $track_id);
                     if (! empty($artwork)) {
                         shell_exec('curl -s ' . $artwork . ' -o ' . $thumb_path);
                     }
@@ -74,5 +73,5 @@
         }
     }
 
-    print arrayToXML($results);
+    print Tools::arrayToXML($results);
 }

releases.php

@@ -0,0 +1,8 @@
+<?php
+include dirname(__FILE__) . '/autoload.php';
+if (isset($argv[1]) && ! empty($argv[1])) {
+    Releases::update(trim($argv[1]));
+}
+else {
+    print 'Could NOT find correct release to download and install';
+}