Merge branch '2.2.2'

phpfunk · phpfunk · commit 500423d74f82 · 2013-07-07T21:58:43.000-04:00
diff --git a/README.md b/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
diff --git a/Spotify.alfredworkflow b/Spotify.alfredworkflow
diff --git a/autoload.php b/autoload.php
@@ -0,0 +1,6 @@
+<?php
+
+function __autoload($class)
+{
+    require dirname(__FILE__) . '/libs/' . $class . '.php';
+}
diff --git a/incl/functions.php b/incl/functions.php
diff --git a/libs/Releases.php b/libs/Releases.php
@@ -0,0 +1,95 @@
+<?php
+
+class Releases {
+
+
+    public static function get($repo, $release, $user='phpfunk', $max_releases=5)
+    {
+        $releases = json_decode(Tools::fetch('https://api.github.com/repos/' . $user . '/' . $repo . '/tags'));
+        $arr      = array();
+
+        // If good-to-go, do it
+        if (json_last_error() == JSON_ERROR_NONE && ! empty($releases) && ! isset($releases->message)) {
+            foreach ($releases as $k => $obj) {
+                $version = str_replace('.', '', $obj->name);
+                if (is_numeric($version)) {
+                    $arr[$version] = $obj->name;
+                }
+            }
+            krsort($arr);
+
+            $releases = array();
+            $x        = 1;
+            $current  = str_replace('.', '', $release);
+
+            foreach ($arr as $n => $release) {
+                if ($x <= $max_releases) {
+
+                    $title = 'Version ' . $release;
+                    if ($current > $n) {
+                        $subtitle = 'Downgrade to version ' . $release . '. (Ctrl+Enter to view this release)';
+                    }
+                    elseif ($current < $n) {
+                        $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,
+                        'icon'            => 'icon.png',
+                        'autocomplete'    => $release
+                    ));
+                    $x += 1;
+                }
+                else {
+                    break;
+                }
+            }
+        }
+        else {
+            $release = array();
+            array_push($releases, array(
+                'uid'             => 'error',
+                'arg'             => 'error',
+                'title'           => 'Error',
+                'subtitle'        => 'There was an error extracting the releases from Github.',
+                'icon'            => 'icon.png',
+                'autocomplete'    => 'error'
+            ));
+        }
+
+        if (! empty($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 . '"');
+        }
+    }
+}
diff --git a/libs/Tools.php b/libs/Tools.php
@@ -0,0 +1,55 @@
+<?php
+
+class Tools {
+
+    public static function arrayToXML($a)
+    {
+        if (! is_array($a)) {
+            return false;
+        }
+
+        $items = new SimpleXMLElement("<items></items>");
+
+        foreach($a as $b) {
+            $c = $items->addChild('item');
+            $c_keys = array_keys($b);
+            foreach($c_keys as $key) {
+                if ($key == 'uid') {
+                    $c->addAttribute('uid', $b[$key]);
+                }
+                elseif ($key == 'arg') {
+                    $c->addAttribute('arg', $b[$key]);
+                }
+                else {
+                    $c->addChild($key, $b[$key]);
+                }
+            }
+        }
+
+        return $items->asXML();
+    }
+
+    public static function fetch($url)
+    {
+        $ch = curl_init($url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+        curl_setopt($ch, CURLOPT_HTTPGET, 1);
+        curl_setopt($ch, CURLOPT_USERAGENT, 'Easy Fetch by Jeff Johns @phpfunk');
+        $page    = curl_exec($ch);
+        $info    = curl_getinfo($ch);
+        curl_close($ch);
+        return ($info['http_code'] == '200') ? $page : null;
+    }
+
+    public static function getTrackArtwork($type, $id)
+    {
+         $html = fetch('http://open.spotify.com/' . $type . '/' . $id);
+         if (! empty($html)) {
+             preg_match_all('/.*?og:image.*?content="(.*?)">.*?/is', $html, $m);
+             return (isset($m[1][0])) ? $m[1][0] : '';
+         }
+         return '';
+    }
+}
diff --git a/releases.php b/releases.php
@@ -0,0 +1,3 @@
+<?php
+include dirname(__FILE__) . '/autoload.php';
+Releases::get('alfred-spotify-controls', '2.2.2');
diff --git a/search.php b/search.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);
 }
diff --git a/update.php b/update.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';
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +<?php
++
 +function __autoload($class)
 +{
 +    require dirname(__FILE__) . '/libs/' . $class . '.php';
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?php`
	`2`	`+include dirname(__FILE__) . '/autoload.php';`
	`3`	`+Releases::get('alfred-spotify-controls', '2.2.2');`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`<?php`
`2`		`-include_once 'incl/functions.php';`
`3`		`-`
	`2`	`+include dirname(__FILE__) . '/autoload.php';`
`4`	`3`	`$query = $argv[2];`
`5`	`4`	`$show_images = (isset($argv[1]) && trim(strtolower($argv[1])) == 'yes') ? true : false;`
`6`	`5`	`$tmp = explode(' ', $query);`
`@@ -16,7 +15,7 @@`
`16`	`15`	`exit(1);`
`17`	`16`	`}`
`18`	`17`
`19`		`-$json = fetch('http://ws.spotify.com/search/1/' . $type . '.json?q=' . urlencode($query));`
	`18`	`+$json = Tools::fetch('http://ws.spotify.com/search/1/' . $type . '.json?q=' . urlencode($query));`
`20`	`19`	`$results = array();`
`21`	`20`
`22`	`21`	`if (! empty($json)) {`
`@@ -47,7 +46,7 @@`
`47`	`46`	`$thumb_path = $thumbs_path . '/' . $track_id . '.png';`
`48`	`47`
`49`	`48`	`if (! file_exists($thumb_path)) {`
`50`		`- $artwork = getTrackArtwork($type, $track_id);`
	`49`	`+ $artwork = Tools::getTrackArtwork($type, $track_id);`
`51`	`50`	`if (! empty($artwork)) {`
`52`	`51`	`shell_exec('curl -s ' . $artwork . ' -o ' . $thumb_path);`
`53`	`52`	`}`
`@@ -74,5 +73,5 @@`
`74`	`73`	`}`
`75`	`74`	`}`
`76`	`75`
`77`		`- print arrayToXML($results);`
	`76`	`+ print Tools::arrayToXML($results);`
`78`	`77`	`}`