Adding some spotify (at the moment - may change to separate views for local/spotify/radio)

Author: David Norman

web/src/html/playlist.html

@@ -16,7 +16,7 @@
   </thead>
   <tbody>
     <tr ng-class="($index==data.playlist_cur_index)?'success':''" ng-repeat="r in data.playlist_loop">
-      <td><a href="javascript:;" ng-click="playlist_remove(r.id)"><span class="glyphicon glyphicon-remove-circle"></span></a></td>
+      <td><a href="javascript:;" ng-click="playlist_remove($index)"><span class="glyphicon glyphicon-remove-circle"></span></a></td>
       <td>{{r.tracknum}}</td>
       <td><a href="#/local/track/{{r.id}}">{{r.title}}</a></td>
       <td><a href="#/local/album/{{r.album_id}}">{{r.album}}</a></td>

web/src/html/search.html

@@ -24,6 +24,13 @@
       <td><a href="#/local/album/{{r.album_id}}">{{r.album}}</a></td>
       <td><a href="#/local/artist/{{r.artist_id}}">{{r.artist}}</a></td>
     </tr>
+    <tr ng-repeat="r in spotify_tracks">
+      <td><a href="javascript:;" ng-click="add_spotify_track(r.id)"><span class="glyphicon glyphicon-plus-sign" /></a></td>
+      <td>{{r.tracknum}}</td>
+      <td><a href="#/local/track/{{r.id}}">{{r.name}}</a></td>
+      <td><a href="#/local/album/{{r.album_id}}">{{r.album}}</a></td>
+      <td><a href="#/local/artist/{{r.artist_id}}">{{r.artist}}</a></td>
+    </tr>
   </tbody>
 </table>
 <table class="table table-striped">
@@ -40,6 +47,11 @@
       <td><a href="#/local/album/{{r.id}}">{{r.album}}</a></td>
       <td><a href="#/local/artist/{{r.artist_id}}">{{r.artist}}</a></td>
     </tr>
+    <tr ng-repeat="r in spotify_albums">
+      <td><a href="javascript:;" ng-click="add_spotify_album(r.id)"><span class="glyphicon glyphicon-plus-sign" /></a></td>
+      <td><a href="#/local/album/{{r.id}}">{{r.name}}</a></td>
+      <td><a href="#/local/artist/{{r.artist_id}}">{{r.artist}}</a></td>
+    </tr>
   </tbody>
 </table>
 <table class="table table-striped">
@@ -54,5 +66,9 @@
       <td><a href="javascript:;" ng-click="add_artist(r.id)"><span class="glyphicon glyphicon-plus-sign" /></a></td>
       <td><a href="#/local/artist/{{r.id}}">{{r.artist}}</a></td>
     </tr>
+    <tr ng-repeat="r in spotify_artists">
+      <td><a href="javascript:;" ng-click="add_spotify_artist(r.id)"><span class="glyphicon glyphicon-plus-sign" /></a></td>
+      <td><a href="#/local/artist/{{r.id}}">{{r.name}}</a></td>
+    </tr>
   </tbody>
 </table>

web/src/js/search.js

@@ -5,10 +5,16 @@ function SearchController($scope, $location, slimClient) {
   $scope.albums = [];
   $scope.artists = [];
   $scope.tracks = [];
+  $scope.spotify_artists = [];
+  $scope.spotify_albums = [];
+  $scope.spotify_tracks = [];
 
   $scope.add_track = slimClient.add_track;
   $scope.add_album = slimClient.add_album;
   $scope.add_artist = slimClient.add_artist;
+  $scope.add_spotify_track = slimClient.add_spotify_track;
+  $scope.add_spotify_album = slimClient.add_spotify_album;
+  $scope.add_spotify_artist = slimClient.add_spotify_artist;
 
   $scope.submitSearch = function() {
     if ($scope.searchText != "") {
@@ -24,6 +30,29 @@ function SearchController($scope, $location, slimClient) {
         success(function(result) {
           $scope.artists = result['artists_loop'];
         });
+      slimClient.spotify_search( "search:" + $scope.searchText ).
+        success(function(result) {
+          result['loop_loop'].forEach(function(e, i) {
+            if (e.name.startsWith("Album")) {
+              slimClient.spotify_fetch(e.id).
+                success(function(result) {
+                  $scope.spotify_albums = result['loop_loop'];
+                });
+            }
+            if (e.name.startsWith("Artist")) {
+              slimClient.spotify_fetch(e.id).
+                success(function(result) {
+                  $scope.spotify_artists = result['loop_loop'];
+                });
+            }
+            if (e.name.startsWith("Track")) {
+              slimClient.spotify_fetch(e.id).
+                success(function(result) {
+                  $scope.spotify_tracks = result['loop_loop'];
+                });
+            }
+          });
+        });
     }
   };
 

web/src/js/slim-client.js

@@ -51,8 +51,8 @@ function SlimClient($http, $location, serverStatus) {
       return slimRequest(data);
     };
 
-    this.playlist_remove = function(track_id) {
-      data = ["playlistcontrol", "cmd:delete", "track_id:"+track_id];
+    this.playlist_remove = function(track_num) {
+      data = ["playlist", "delete", track_num];
       return slimRequest(data);
     };
 
@@ -81,5 +81,30 @@ function SlimClient($http, $location, serverStatus) {
       return slimRequest(data);
     };
 
+    this.spotify_search = function(search) {
+      data = ["spotify", "items", 0, 100, "item_id:8", search];
+      return slimRequest(data);
+    };
+
+    this.spotify_fetch = function(id) {
+      data = ["spotify", "items", 0, 100, "item_id:"+id];
+      return slimRequest(data);
+    };
+
+    this.add_spotify_track = function(item) {
+      data = ["spotify", "playlist", "add", "item_id:"+item];
+      return slimRequest(data);
+    };
+
+    this.add_spotify_album = function(item) {
+      data = ["spotify", "playlist", "add", "item_id:"+item];
+      return slimRequest(data);
+    };
+
+    this.add_spotify_artist = function(item) {
+      data = ["spotify", "playlist", "add", "item_id:"+item];
+      return slimRequest(data);
+    };
+
 };