Merge branch '2.2.6'

Author: phpfunk

Spotify.alfredworkflow

@@ -1,11 +1,12 @@
 <?php
-include dirname(__FILE__) . '/autoload.php';
-include dirname(__FILE__) . '/shared/commands.php';
-include dirname(__FILE__) . '/shared/query.php';
+$dirname = dirname(__FILE__);
+include $dirname . '/autoload.php';
+include $dirname . '/shared/commands.php';
+include $dirname . '/shared/query.php';
 
 $results = array();
 foreach ($commands as $k => $arr) {
-    if (empty($query) || substr($k, 0, $len) == $key) {
+    if (! empty($query) && substr($k, 0, $len) == $key) {
         $query = ($space === false) ? $k : $query;
         array_push($results, array(
             'uid'             => $k,

autocomplete.php

@@ -1,5 +1,4 @@
 <?php
-
 function __autoload($class)
 {
     require dirname(__FILE__) . '/libs/' . $class . '.php';

autoload.php

@@ -1,9 +1,10 @@
 <?php
-include dirname(__FILE__) . '/autoload.php';
-include dirname(__FILE__) . '/shared/commands.php';
-include dirname(__FILE__) . '/shared/query.php';
+$dirname = dirname(__FILE__);
+include $dirname . '/autoload.php';
+include $dirname . '/shared/commands.php';
+include $dirname . '/shared/query.php';
 
-$app_dir = dirname(__FILE__) . '/applescripts/';
+$app_dir = $dirname . '/applescripts/';
 $query   = trim(str_replace($key, '', $query));
 
 if (array_key_exists($key, $commands)) {

execute.php

@@ -16,6 +16,7 @@ public static function get($repo, $release, $user='phpfunk', $max_releases=5)
                     $arr[$version] = $obj->name;
                 }
             }
+            
             krsort($arr);
 
             $releases = array();
@@ -38,7 +39,6 @@ public static function get($repo, $release, $user='phpfunk', $max_releases=5)
                     }
 
                     array_push($releases, array(
-                        'uid'             => $release,
                         'arg'             => $release,
                         'title'           => $title,
                         'subtitle'        => $subtitle,
@@ -55,7 +55,6 @@ 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.',

libs/Releases.php

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

releases.php

@@ -134,6 +134,16 @@
         'title'    => 'Get Help',
         'subtitle' => 'Read the help file for this workflow',
         'bash'     => 'open "https://github.com/phpfunk/alfred-spotify-controls/wiki"'
+    ),
+    'bug' => array(
+        'title'    => 'Submit a Bug',
+        'subtitle' => 'Submit a bug report about this workflow',
+        'bash'     => 'open "https://github.com/phpfunk/alfred-spotify-controls/issues/new"'
+    ),
+    'feature' => array(
+        'title'    => 'Submit a Feature Request',
+        'subtitle' => 'Submit a feature request for this workflow',
+        'bash'     => 'open "https://github.com/phpfunk/alfred-spotify-controls/issues/new"'
     )
 );