Add Grooveshark playlist support.

git-svn-id: svn://svn.code.sf.net/p/xbmc-groove/code@12 2dec19e3-eb1d-4749-8193-008c8bba0994

diff --git a/addon.xml b/addon.xml
index 02eae09..4792124 100644 (file)
--- a/addon.xml
+++ b/addon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.audio.groove" name="Grooveshark for XBMC"
-       version="0.0.2" provider-name="Stephen Denham">
+       version="0.1.0" provider-name="Stephen Denham">
        <requires>
                <import addon="xbmc.python" version="1.0" />
        </requires>

diff --git a/changelog.txt b/changelog.txt
index 1c91c09..c30d1db 100644 (file)
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+0.1.0:
+
+Grooveshark playlist support.
+
 0.0.2:
 
 Add similar artists function.

diff --git a/default.py b/default.py
index 0e0261e..6688267 100644 (file)
--- a/default.py
+++ b/default.py
@@ -3,7 +3,7 @@ import urllib, urllib2, re, xbmcplugin, xbmcgui, xbmc, sys, os, time, pprint, sh
 MODE_SEARCH_SONGS = 1
 MODE_SEARCH_ALBUMS = 2
 MODE_SEARCH_ARTISTS = 3
-MODE_POPULAR = 4
+MODE_POPULAR_SONGS = 4
 MODE_FAVORITES = 5
 MODE_PLAYLISTS = 6
 MODE_ALBUM = 7
@@ -13,6 +13,9 @@ MODE_SIMILAR_ARTISTS = 10
 MODE_SONG = 11
 MODE_FAVORITE = 12
 MODE_UNFAVORITE = 13
+MODE_MAKE_PLAYLIST = 14
+MODE_REMOVE_PLAYLIST = 15
+MODE_RENAME_PLAYLIST = 16
 
 lastID = 0
 
@@ -21,7 +24,6 @@ resDir = xbmc.translatePath(os.path.join(baseDir, 'resources'))
 libDir = xbmc.translatePath(os.path.join(resDir,  'lib'))
 imgDir = xbmc.translatePath(os.path.join(resDir,  'img'))
 thumbDir = os.path.join('special://masterprofile/addon_data/', os.path.join(os.path.basename(os.getcwd()), 'thumb'))
-favoritesCache = xbmc.translatePath(os.path.join('special://masterprofile/addon_data/', os.path.join(os.path.basename(os.getcwd()), 'favorites.dmp')))
 
 sys.path.append (libDir)
 from GrooveAPI import *
@@ -37,7 +39,7 @@ class Groveshark:
     artistImg = xbmc.translatePath(os.path.join(imgDir,  'artist.png'))
     favoritesImg = xbmc.translatePath(os.path.join(imgDir,  'favorites.png'))
     playlistImg = xbmc.translatePath(os.path.join(imgDir,  'playlist.png'))
-    popularImg = xbmc.translatePath(os.path.join(imgDir,  'popular.png'))
+    popularSongsImg = xbmc.translatePath(os.path.join(imgDir,  'popularSongs.png'))
     songImg = xbmc.translatePath(os.path.join(imgDir,  'song.png'))
     defImg = xbmc.translatePath(os.path.join(imgDir,  'default.tbn'))
     fanImg = xbmc.translatePath(os.path.join(baseDir, 'fanart.png'))
@@ -67,7 +69,7 @@ class Groveshark:
         self._add_dir('Search songs', '', MODE_SEARCH_SONGS, self.songImg, 0)
         self._add_dir('Search albums', '', MODE_SEARCH_ALBUMS, self.albumImg, 0)
         self._add_dir('Search artists', '', MODE_SEARCH_ARTISTS, self.artistImg, 0)
-        self._add_dir('Popular', '', MODE_POPULAR, self.popularImg, 0)
+        self._add_dir('Popular songs', '', MODE_POPULAR_SONGS, self.popularSongsImg, 0)
         if (userid != 0):
             self._add_dir('Favorites', '', MODE_FAVORITES, self.favoritesImg, 0)
             self._add_dir('Playlists', '', MODE_PLAYLISTS, self.playlistImg, 0)
@@ -106,15 +108,17 @@ class Groveshark:
                 self.categories()
                     
     def favorites(self):
-        favorites = self._get_favorites()
-        if (len(favorites) > 0):
-            self._add_songs_directory(favorites)
-        else:
-            dialog = xbmcgui.Dialog()
-            dialog.ok('Grooveshark', 'You have no favorites.')
-            self.categories()
+        userid = self._get_login()
+        if (userid != 0):
+            favorites = groovesharkApi.userGetFavoriteSongs(userid)
+            if (len(favorites) > 0):
+                self._add_songs_directory(favorites)
+            else:
+                dialog = xbmcgui.Dialog()
+                dialog.ok('Grooveshark', 'You have no favorites.')
+                self.categories()
     
-    def popular(self):
+    def popularSongs(self):
         popular = groovesharkApi.popularGetSongs(limit = self.songsearchlimit)
         if (len(popular) > 0):
             self._add_songs_directory(popular)
@@ -122,6 +126,24 @@ class Groveshark:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'No popular songs.')
             self.categories()
+
+    def popularAlbums(self):
+        popular = groovesharkApi.popularGetAlbums(limit = self.albumsearchlimit)
+        if (len(popular) > 0):
+            self._add_albums_directory(popular)
+        else:
+            dialog = xbmcgui.Dialog()
+            dialog.ok('Grooveshark', 'No popular albums.')
+            self.categories()
+
+    def popularArtists(self):
+        popular = groovesharkApi.popularGetArtists(limit = self.artistsearchlimit)
+        if (len(popular) > 0):
+            self._add_artists_directory(popular)
+        else:
+            dialog = xbmcgui.Dialog()
+            dialog.ok('Grooveshark', 'No popular artists.')
+            self.categories()
                  
     def playlists(self):
         userid = self._get_login()
@@ -139,7 +161,6 @@ class Groveshark:
         if (userid != 0):
             xbmc.log("Favorite song: " + str(songid))
             groovesharkApi.favoriteSong(songID = songid)
-            os.remove(favoritesCache)
         else:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'You must be logged in', 'to add favorites.')
@@ -149,7 +170,6 @@ class Groveshark:
         if (userid != 0):
             xbmc.log("Unfavorite song: " + str(songid))
             groovesharkApi.unfavoriteSong(songID = songid)
-            os.remove(favoritesCache)
         else:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'You must be logged in', 'to remove favorites.')
@@ -172,8 +192,50 @@ class Groveshark:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'No similar artists.')
             self.categories()
+            
+    def makePlaylist(self, albumid, name):
+        userid = self._get_login()
+        if (userid != 0):
+            name_re = re.compile(r'[- ]')
+            nameTokens = name_re.split("- ")
+            name = self._get_keyboard(default=nameTokens[1], heading="Playlist name")
+            album = groovesharkApi.albumGetSongs(albumid, self.songsearchlimit)
+            songids = []
+            for song in album:
+                songids.append(song[1])
+            id = groovesharkApi.playlistCreateUnique(name, songids)
+            if id == 0:
+                dialog = xbmcgui.Dialog()
+                dialog.ok('Grooveshark', 'Cannot create playlist ', name)
+        else:
+            dialog = xbmcgui.Dialog()
+            dialog.ok('Grooveshark', 'You must be logged in ', ' to create a playlist.')
+            
+    def removePlaylist(self, playlistid, name):
+        dialog = xbmcgui.Dialog()
+        if dialog.yesno('Grooveshark', name, 'Delete this playlist?') == True:
+            userid = self._get_login()
+            if (userid != 0):
+                groovesharkApi.playlistDelete(playlistid)
+                xbmc.executebuiltin("Container.Refresh")
+            else:
+                dialog = xbmcgui.Dialog()
+                dialog.ok('Grooveshark', 'You must be logged in ', ' to delete a playlist.')
+
+    def renamePlaylist(self, playlistid, name):
+        userid = self._get_login()
+        if (userid != 0):
+            newname = self._get_keyboard(default=name, heading="Playlist name")
+            if groovesharkApi.playlistRename(playlistid, newname) == 0:
+                dialog = xbmcgui.Dialog()
+                dialog.ok('Grooveshark', 'Cannot rename playlist ', name)
+            else:
+                xbmc.executebuiltin("Container.Refresh")
+        else:
+            dialog = xbmcgui.Dialog()
+            dialog.ok('Grooveshark', 'You must be logged in ', ' to rename a playlist.')
     
-    def album(self,albumid):
+    def album(self, albumid):
         album = groovesharkApi.albumGetSongs(albumId = albumid, limit = self.songsearchlimit)
         self._add_songs_directory(album)
     
@@ -214,27 +276,6 @@ class Groveshark:
         
         return item
     
-    def _get_favorites(self):
-        favorites = []
-        # if the cache does not exist or is older than x hours then reload
-        if (os.path.isfile(favoritesCache) == False) or (time.time() - os.path.getmtime(favoritesCache) > 3*60*60):
-            xbmc.log("Refresh favorites cache")
-            userid = self._get_login()
-            if (userid != 0):
-                favorites = groovesharkApi.userGetFavoriteSongs(userid)
-                f = open(favoritesCache, 'wb')
-                pickle.dump(favorites, f, protocol=pickle.HIGHEST_PROTOCOL)
-                f.close()
-                xbmc.log("Refreshed favorites cache")
-        # if not old then read from cache
-        elif os.path.isfile(favoritesCache):
-            xbmc.log("Existing favorites cache")
-            f = open(favoritesCache, 'rb')
-            favorites = pickle.load(f)
-            f.close()
-            
-        return favorites
-        
     def _get_keyboard(self, default="", heading="", hidden=False):
             kb = xbmc.Keyboard(default, heading, hidden)
             kb.doModal()
@@ -370,6 +411,14 @@ class Groveshark:
         # Codes from http://xbmc-scripting.googlecode.com/svn/trunk/Script%20Templates/common/gui/codes.py
         menuItems = []
         menuItems.append(("Select", "XBMC.executebuiltin(Action(7))"))
+        if mode == MODE_ALBUM:
+            mkplaylst=sys.argv[0]+"?mode="+str(MODE_MAKE_PLAYLIST)+"&name="+name+"&id="+str(id)
+            menuItems.append(("Make Grooveshark playlist", "XBMC.RunPlugin("+mkplaylst+")"))
+        if mode == MODE_PLAYLIST:
+            rmplaylst=sys.argv[0]+"?mode="+str(MODE_REMOVE_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id)
+            menuItems.append(("Delete playlist", "XBMC.RunPlugin("+rmplaylst+")"))
+            mvplaylst=sys.argv[0]+"?mode="+str(MODE_RENAME_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id)
+            menuItems.append(("Rename playlist", "XBMC.RunPlugin("+mvplaylst+")"))
         dir.addContextMenuItems(menuItems, replaceItems=True)
         return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True, totalItems=items)
 
@@ -424,8 +473,8 @@ elif mode==MODE_SEARCH_ALBUMS:
 elif mode==MODE_SEARCH_ARTISTS:
     grooveshark.searchArtists()
 
-elif mode==MODE_POPULAR:
-    grooveshark.popular()
+elif mode==MODE_POPULAR_SONGS:
+    grooveshark.popularSongs()
 
 elif mode==MODE_PLAYLISTS:
     grooveshark.playlists()
@@ -467,5 +516,15 @@ elif mode==MODE_UNFAVORITE:
 elif mode==MODE_SIMILAR_ARTISTS:
     grooveshark.similarArtists(lastID)
 
+elif mode==MODE_MAKE_PLAYLIST:
+    grooveshark.makePlaylist(lastID, name)
+    
+elif mode==MODE_REMOVE_PLAYLIST:
+    grooveshark.removePlaylist(lastID, name)    
+
+elif mode==MODE_RENAME_PLAYLIST:
+    grooveshark.renamePlaylist(lastID, name)    
+
+
 if (mode < MODE_SONG):    
     xbmcplugin.endOfDirectory(int(sys.argv[1]))

diff --git a/description.xml b/description.xml
index 0bcdf20..ccb00b9 100644 (file)
--- a/description.xml
+++ b/description.xml
@@ -18,7 +18,7 @@
        <title>Grooveshark for XBMC.</title>
 
        <!-- (required) Major.minor.build -->
-       <version>0.0.2</version>
+       <version>0.1.0</version>
 
        <!--
                (required) author name & email. at least one author name is required

diff --git a/resources/img/popular.png b/resources/img/popular.png
deleted file mode 100644 (file)
index 148c986..0000000
Binary files a/resources/img/popular.png and /dev/null differ

diff --git a/resources/img/popularSongs.png b/resources/img/popularSongs.png
new file mode 100644 (file)
index 0000000..e2c18f3
Binary files /dev/null and b/resources/img/popularSongs.png differ

diff --git a/resources/lib/GrooveAPI.py b/resources/lib/GrooveAPI.py
index 8cfa941..b92247f 100644 (file)
--- a/resources/lib/GrooveAPI.py
+++ b/resources/lib/GrooveAPI.py
@@ -284,6 +284,16 @@ class GrooveAPI:
                                return 0
                else:
                        return 0
+
+       def playlistCreateUnique(self, name, songIds):
+               if self.loggedIn == 1:
+                       result = self.callRemote("playlist.createunique", {"name": name, "songIDs": songIds})
+                       if 'result' in result:
+                               return result['result']['playlistID']
+                       else:
+                               return 0
+               else:
+                       return 0
                        
        def playlistGetSongs(self, playlistId, limit=25):
                result = self.callRemote("playlist.getSongs", {"playlistID": playlistId})