Some playlist updates.
[clinton/xbmc-groove.git] / default.py
index 42fad28..06d8133 100644 (file)
@@ -1,27 +1,22 @@
 import urllib, urllib2, re, xbmcplugin, xbmcgui, xbmc, sys, os, time, pprint, shutil, xbmcaddon
 
-
 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
 MODE_ARTIST = 8
 MODE_PLAYLIST = 9
-MODE_SONG = 10
-MODE_FAVORITE = 11
-MODE_UNFAVORITE = 12
-MODE_SIMILAR_SONG = 13
-MODE_SIMILAR_ARTIST = 14
-MODE_FROWN = 15
-
-songsearchlimit = 0
-albumsearchlimit = 0
-artistsearchlimit = 0
-
-lastID = 0
+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
+MODE_REMOVE_PLAYLIST_SONG = 17
 
 baseDir = os.getcwd()
 resDir = xbmc.translatePath(os.path.join(baseDir, 'resources'))
@@ -29,6 +24,13 @@ 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'))
 
+baseModeUrl = 'plugin://plugin.audio.groove/'
+playlistUrl = baseModeUrl + '?url=&mode=' + str(MODE_PLAYLIST)
+playlistsUrl = baseModeUrl + '?mode=' + str(MODE_PLAYLISTS)
+favoritesUrl = baseModeUrl + '?mode=' + str(MODE_FAVORITES)
+
+thumbDef = os.path.join(os.path.basename(os.getcwd()), 'default.tbn')
+
 sys.path.append (libDir)
 from GrooveAPI import *
 groovesharkApi = GrooveAPI()
@@ -37,55 +39,34 @@ class _Info:
     def __init__( self, *args, **kwargs ):
         self.__dict__.update( kwargs )
         
-class GrovesharkPlayer(xbmc.Player):
-    # Player Class: calls function when song changes or playback ends
-    def __init__(self, *args, **kwargs):
-        xbmc.Player.__init__(self)
-        self.function = kwargs[ "function" ]
-
-    def onPlayBackStopped(self):
-        print "onPlayBackStopped"
-        xbmc.sleep(300)
-        if (not xbmc.Player().isPlayingAudio()):
-            self.function(0)
-    
-    def onPlayBackEnded(self):
-        print "onPlayBackEnded"
-        xbmc.sleep(300)
-        if (not xbmc.Player().isPlayingAudio()):
-            self.function(1)
-
-    def onPlayBackStarted(self):
-        print "onPlayBackStarted"
-        self.function(2)
-
 class Groveshark:
     
-    settings = xbmcaddon.Addon(id='plugin.audio.groove')
-
     albumImg = xbmc.translatePath(os.path.join(imgDir,  'album.png'))
     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.jpg'))
+    fanImg = xbmc.translatePath(os.path.join(baseDir, 'fanart.png'))
 
+    settings = xbmcaddon.Addon(id='plugin.audio.groove')
     songsearchlimit = settings.getSetting('songsearchlimit')
     albumsearchlimit = settings.getSetting('albumsearchlimit')
     artistsearchlimit = settings.getSetting('artistsearchlimit')
-
-
+    username = settings.getSetting('username')
+    password = settings.getSetting('password')
+    
     def __init__( self ):
         self._handle = int(sys.argv[1])
 
     def categories(self):
+
+        xbmc.log(self.username + ", limits: " + str(self.songsearchlimit) + ", " + str(self.albumsearchlimit) + ", "  + str(self.artistsearchlimit))
         
         userid = self._get_login()
         
         # Setup
-        groovesharkApi.setRemoveDuplicates(True)
         xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
         if os.path.isdir(thumbDir) == False:
             os.makedirs(thumbDir)
@@ -93,15 +74,16 @@ 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)
             
     def searchSongs(self):
         query = self._get_keyboard(default="", heading="Search songs")
-        if (query): 
-            songs = groovesharkApi.searchSongs(query, limit = self.settings.getSetting('songsearchlimit'))
+        if (query):
+            groovesharkApi.setRemoveDuplicates(True)
+            songs = groovesharkApi.searchSongs(query, limit = self.songsearchlimit)
             if (len(songs) > 0):
                 self._add_songs_directory(songs)
             else:
@@ -112,7 +94,7 @@ class Groveshark:
     def searchAlbums(self):
         query = self._get_keyboard(default="", heading="Search albums")
         if (query): 
-            albums = groovesharkApi.searchAlbums(query, limit = self.settings.getSetting('albumsearchlimit'))
+            albums = groovesharkApi.searchAlbums(query, limit = self.albumsearchlimit)
             if (len(albums) > 0):
                 self._add_albums_directory(albums)
             else:
@@ -123,7 +105,7 @@ class Groveshark:
     def searchArtists(self):
         query = self._get_keyboard(default="", heading="Search artists")
         if (query): 
-            artists = groovesharkApi.searchArtists(query, limit = self.settings.getSetting('artistsearchlimit'))
+            artists = groovesharkApi.searchArtists(query, limit = self.artistsearchlimit)
             if (len(artists) > 0):
                 self._add_artists_directory(artists)
             else:
@@ -136,20 +118,38 @@ class Groveshark:
         if (userid != 0):
             favorites = groovesharkApi.userGetFavoriteSongs(userid)
             if (len(favorites) > 0):
-                self._add_songs_directory(favorites)
+                self._add_songs_directory(favorites, isFavorites=True)
             else:
                 dialog = xbmcgui.Dialog()
                 dialog.ok('Grooveshark', 'You have no favorites.')
                 self.categories()
     
-    def popular(self):
-        popular = groovesharkApi.popularGetSongs(limit = self.settings.getSetting('songsearchlimit'))
+    def popularSongs(self):
+        popular = groovesharkApi.popularGetSongs(limit = self.songsearchlimit)
         if (len(popular) > 0):
             self._add_songs_directory(popular)
         else:
             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()
@@ -165,17 +165,21 @@ class Groveshark:
     def favorite(self, songid):
         userid = self._get_login()
         if (userid != 0):
-            xbmc.log("Favorite playSong: " + str(songid))
+            xbmc.log("Favorite song: " + str(songid))
             groovesharkApi.favoriteSong(songID = songid)
+            xbmc.executebuiltin('XBMC.Notification(Grooveshark, Added to favorites, 1000, ' + thumbDef + ')')
         else:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'You must be logged in', 'to add favorites.')
     
-    def unfavorite(self, songid):
+    def unfavorite(self, songid, prevMode):
         userid = self._get_login()
         if (userid != 0):
-            xbmc.log("Unfavorite playSong: " + str(songid))
+            xbmc.log("Unfavorite song: " + str(songid) + ', previous mode was ' + str(prevMode))
             groovesharkApi.unfavoriteSong(songID = songid)
+            xbmc.executebuiltin('XBMC.Notification(Grooveshark, Removed from favorites, 1000, ' + thumbDef + ')')
+            if (int(prevMode) == MODE_FAVORITES):
+                xbmc.executebuiltin("Container.Update(" + favoritesUrl + ",replace)")
         else:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'You must be logged in', 'to remove favorites.')
@@ -183,52 +187,100 @@ class Groveshark:
     def frown(self, songid):
         userid = self._get_login()
         if (userid != 0):
-            xbmc.log("Frown playSong: " + str(songid))
+            xbmc.log("Frown song: " + str(songid))
             if groovesharkApi.radioFrown(songId = songid) != True:
                 xbmc.log("Unable to frown song " + str(songid))
+            else:
+                xbmc.executebuiltin('XBMC.Notification(Grooveshark, Frowned, 1000, ' + thumbDef + ')')
         else:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'You must be logged in', 'to frown a song.')
 
-    def similarSong(self, songid):
+    def similarArtists(self, artistId):
+        similar = groovesharkApi.artistGetSimilar(artistId, limit = self.artistsearchlimit)
+        if (len(similar) > 0):
+            self._add_artists_directory(similar)
+        else:
+            dialog = xbmcgui.Dialog()
+            dialog.ok('Grooveshark', 'No similar artists.')
+            self.categories()
+            
+    def makePlaylist(self, albumid, name):
         userid = self._get_login()
         if (userid != 0):
-            xbmc.log("Frown playSong: " + str(songid))
-            if groovesharkApi.radioSong(songId = songid) and groovesharkApi.radioStartSongs() == True:
-                self.playNext()
-            else:
-                dialog = xbmcgui.Dialog()
-                dialog.ok('Grooveshark', 'Cannot start radio')
+            re.split(' - ',name,1)
+            nameTokens = re.split(' - ',name,1)
+            name = self._get_keyboard(default=nameTokens[0], heading="Playlist name")
+            if name != '':
+                groovesharkApi.setRemoveDuplicates(True)
+                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:
+                    xbmc.executebuiltin('XBMC.Notification(Grooveshark, Playlist created, 1000, ' + thumbDef + ')')
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok('Grooveshark', 'You must be logged in', 'to update radio song.')
+            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.Update(" + playlistsUrl + ",replace)")
+            else:
+                dialog = xbmcgui.Dialog()
+                dialog.ok('Grooveshark', 'You must be logged in ', ' to delete a playlist.')
 
-    def similarArtist(self, artistId):
+    def removePlaylistSong(self, playlistid, playlistname, songpos):
+        dialog = xbmcgui.Dialog()
+        if dialog.yesno('Grooveshark', 'Delete this song from the playlist?') == True:
+            userid = self._get_login()
+            if (userid != 0):
+                if groovesharkApi.playlistDeleteSong(playlistid, songpos) == 0:
+                    dialog = xbmcgui.Dialog()
+                    dialog.ok('Grooveshark', 'Failed to remove ', ' song from playlist.')
+                else:
+                    xbmc.executebuiltin("Container.Update(" + playlistUrl + "&id="+str(playlistid) + "&name=" + playlistname + ",replace)")
+            else:
+                dialog = xbmcgui.Dialog()
+                dialog.ok('Grooveshark', 'You must be logged in ', ' to delete a song from a playlist.')
+
+    def renamePlaylist(self, playlistid, name):
         userid = self._get_login()
         if (userid != 0):
-            xbmc.log("Add radio artist of playSong: " + str(artistId))
-            if groovesharkApi.radioArtist(artistId = artistId) and groovesharkApi.radioStartArtists() == True:
-                self.playNext()
-            else:
+            newname = self._get_keyboard(default=name, heading="Playlist name")
+            if newname == '':
+                return
+            elif groovesharkApi.playlistRename(playlistid, newname) == 0:
                 dialog = xbmcgui.Dialog()
-                dialog.ok('Grooveshark', 'Cannot start radio')
+                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 update radio artists.')
+            dialog.ok('Grooveshark', 'You must be logged in ', ' to rename a playlist.')
     
-    def album(self,albumid):
-        album = groovesharkApi.albumGetSongs(albumId = albumid, limit = self.settings.getSetting('songsearchlimit'))
+    def album(self, albumid):
+        groovesharkApi.setRemoveDuplicates(True)
+        album = groovesharkApi.albumGetSongs(albumId = albumid, limit = self.songsearchlimit)
         self._add_songs_directory(album)
     
     def artist(self, artistid):
-        albums = groovesharkApi.artistGetAlbums(artistId = artistid, limit = self.settings.getSetting('albumsearchlimit'))
-        self._add_albums_directory(albums)
+        albums = groovesharkApi.artistGetAlbums(artistId = artistid, limit = self.albumsearchlimit)
+        self._add_albums_directory(albums, artistid)
     
-    def playlist(self, playlistid):
+    def playlist(self, playlistid, playlistname):
         userid = self._get_login()
         if (userid != 0):
-            songs = groovesharkApi.playlistGetSongs(playlistId = playlistid, limit = self.settings.getSetting('songsearchlimit'))
-            self._add_songs_directory(songs)
+            songs = groovesharkApi.playlistGetSongs(playlistId = playlistid, limit = self.songsearchlimit)
+            self._add_songs_directory(songs, playlistid, playlistname)
         else:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'You must be logged in', 'to get playlists.')
@@ -236,50 +288,43 @@ class Groveshark:
     def playSong(self, item):
         url = item.getProperty('url')
         xbmc.log("Playing: " + url)
-        xbmc.Player( xbmc.PLAYER_CORE_PAPLAYER ).play(url, item)
+        xbmcplugin.setResolvedUrl(handle=int(sys.argv[1]), succeeded=True, listitem=item)
     
-    def playNext(self):
-        item = self._get_song_item(groovesharkApi.radioNextSong()[0])
-        url = item.getProperty('url')
-        self.player = GrovesharkPlayer(xbmc.PLAYER_CORE_PAPLAYER, function=self.onPlayBackChanged)
-        self.player.play(url, item)
-        self.onPlayBackChanged(2)
-
     def songItem(self, id, name, album, artist, duration, thumb, image):
         url = groovesharkApi.getStreamURL(id)
-        songImg = self._get_icon(image, str(id) + "-image")
-        print songImg
-        if songImg == "":
-            songImg = image
-        songThm = self._get_icon(thumb, str(id) + "-thumb")
-        if songThm == "":
-            songThm = thumb
+        # Only try to get the image
+        if image != "":
+            songImg = self._get_icon(image, 'song-' + str(id) + "-image")
+            songThm = songImg
+        else:
+            songThm = self._get_icon(thumb, 'song-' + str(id) + "-thumb")
+            songImg = songThm
         item = xbmcgui.ListItem(label = artist + " - " + album + " - " + name, path=url, thumbnailImage=songThm, iconImage=songImg)
-        item.setInfo( type="Music", infoLabels={ "title": name, "duration": duration, "album": album, "artist": artist} )
+        item.setInfo( type="music", infoLabels={ "title": name, "duration": duration, "album": album, "artist": artist} )
+        item.setProperty('mimetype', 'audio/mpeg')
+        item.setProperty("IsPlayable", "true")
         item.setProperty('url', url)
         item.setProperty('thumb', songThm)
         item.setProperty('image', songImg)
-        item.setProperty('mimetype', 'audio/mpeg')
-        return item
         
+        return item
+    
     def _get_keyboard(self, default="", heading="", hidden=False):
-            kb = xbmc.Keyboard(default, heading, hidden)
-            kb.doModal()
-            if (kb.isConfirmed()):
-                return unicode(kb.getText(), "utf-8")
-            return ''
+        kb = xbmc.Keyboard(default, heading, hidden)
+        kb.doModal()
+        if (kb.isConfirmed()):
+            return unicode(kb.getText(), "utf-8")
+        return ''
     
     def _get_login(self):
-        username = self.settings.getSetting('username')
-        password = self.settings.getSetting('password')
-        if (username == "" or password == ""):
+        if (self.username == "" or self.password == ""):
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'Unable to login.', 'Check username and password in settings.')
             return 0
         else:
             if groovesharkApi.loggedInStatus() == 1:
                 groovesharkApi.logout()
-            userid = groovesharkApi.loginExt(username, password)
+            userid = groovesharkApi.loginExt(self.username, self.password)
             if (userid != 0):
                 xbmc.log("Logged in")
                 return userid
@@ -300,22 +345,19 @@ class Groveshark:
         
     # File download            
     def _get_icon(self, url, id):
-        # Get the channel icon
         localThumb = os.path.join(xbmc.translatePath(os.path.join(thumbDir, str(id)))) + '.tbn'
         try:
             if os.path.isfile(localThumb) == False:
+                xbmc.log('Downloading ' + url + ' to ' + localThumb)
                 loc = urllib.URLopener()
                 loc.retrieve(url, localThumb)
         except:
             xbmc.log('URL download failed of ' + url + ' to ' + localThumb)
-            try:
-                shutil.copyfile(self.defImg, localThumb)
-            except: pass
-            return ""
+            return(self.defImg)
 
         return os.path.join(os.path.join(thumbDir, str(id))) + '.tbn'
         
-    def _add_songs_directory(self, songs):
+    def _add_songs_directory(self, songs, playlistid=0, playlistname='', isFavorites=False):
         n = len(songs)
         xbmc.log("Found " + str(n) + " songs...")
         i = 0
@@ -330,7 +372,6 @@ class Groveshark:
             songduration = song[2]
             songalbum = song[3]
             songartist = song[6]
-            songartistid = song[7]
             u=sys.argv[0]+"?url="+urllib.quote_plus(songurl) \
             +"&mode="+str(MODE_SONG)+"&name="+urllib.quote_plus(songname)+"&id=" \
             +str(songid) \
@@ -340,82 +381,85 @@ class Groveshark:
             +"&thumb="+urllib.quote_plus(songthumb) \
             +"&image="+urllib.quote_plus(songimage)
             fav=sys.argv[0]+"?url="+urllib.quote_plus(songurl)+"&mode="+str(MODE_FAVORITE)+"&name="+urllib.quote_plus(songname)+"&id="+str(songid)
-            unfav=sys.argv[0]+"?url="+urllib.quote_plus(songurl)+"&mode="+str(MODE_UNFAVORITE)+"&name="+urllib.quote_plus(songname)+"&id="+str(songid)
-            similarArtist=sys.argv[0]+"?mode="+str(MODE_SIMILAR_ARTIST)+"&id="+str(songartistid)
-            similarSong=sys.argv[0]+"?mode="+str(MODE_SIMILAR_SONG)+"&id="+str(songid)
-            #frown=sys.argv[0]+"?mode="+str(MODE_FROWN)+"&id="+str(songid)
+            unfav=sys.argv[0]+"?url="+urllib.quote_plus(songurl)+"&mode="+str(MODE_UNFAVORITE)+"&name="+urllib.quote_plus(songname)+"&id="+str(songid)+"&prevmode="
             menuItems = []
-            menuItems.append(("Grooveshark Favorite", "XBMC.RunPlugin("+fav+")"))
+            if isFavorites == True:
+                unfav = unfav +str(MODE_FAVORITES)
+            else:
+                menuItems.append(("Grooveshark Favorite", "XBMC.RunPlugin("+fav+")"))
             menuItems.append(("Not Grooveshark Favorite", "XBMC.RunPlugin("+unfav+")"))
-            menuItems.append(("Listen to similar artist", "XBMC.RunPlugin("+similarArtist+")"))
-            menuItems.append(("Listen to similar song", "XBMC.RunPlugin("+similarSong+")"))
-            # menuItems.append(("No thanks!", "XBMC.RunPlugin("+frown+")"))
+            if playlistid > 0:
+                rmplaylstsong=sys.argv[0]+"?playlistid="+str(playlistid)+"&id="+str(i+1)+"&mode="+str(MODE_REMOVE_PLAYLIST_SONG)+"&name="+playlistname
+                menuItems.append(("Remove from playlist", "XBMC.RunPlugin("+rmplaylstsong+")"))
             item.addContextMenuItems(menuItems, replaceItems=False)
-            xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False)
+            xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False,totalItems=n)
             i = i + 1
         xbmcplugin.setContent(self._handle, 'songs')
+        xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
             
-    def _add_albums_directory(self, albums):
-        xbmc.log("Found " + str(len(albums)) + " albums...")
+    def _add_albums_directory(self, albums, artistid=0):
+        n = len(albums)
+        xbmc.log("Found " + str(n) + " albums...")
         i = 0
-        while i < len(albums):
+        while i < n:
             album = albums[i]
             albumArtistName = album[0]
             albumName = album[2]
             albumID = album[3]
-            albumImage = album[4]
-            self._add_dir(albumName + " - " + albumArtistName, '', MODE_ALBUM, albumImage, albumID)
+            albumImage = self._get_icon(album[4], 'album-' + str(albumID))
+            self._add_dir(albumName + " - " + albumArtistName, '', MODE_ALBUM, albumImage, albumID, n)
             i = i + 1
+        if artistid > 0:
+            self._add_dir('Similar artists...', '', MODE_SIMILAR_ARTISTS, self.artistImg, artistid)
         xbmcplugin.setContent(self._handle, 'albums')
         xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_ALBUM_IGNORE_THE)
+        xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
             
     def _add_artists_directory(self, artists):
-        xbmc.log("Found " + str(len(artists)) + " artists...")
+        n = len(artists)
+        xbmc.log("Found " + str(n) + " artists...")
         i = 0
-        while i < len(artists):
+        while i < n:
             artist = artists[i]
             artistName = artist[0]
             artistID = artist[1]
-            self._add_dir(artistName, '', MODE_ARTIST, self.artistImg, artistID)
+            self._add_dir(artistName, '', MODE_ARTIST, self.artistImg, artistID, n)
             i = i + 1
         xbmcplugin.setContent(self._handle, 'artists')
         xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_ARTIST_IGNORE_THE)
+        xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
             
     def _add_playlists_directory(self, playlists):
-        xbmc.log("Found " + str(len(playlists)) + " playlists...")
+        n = len(playlists)
+        xbmc.log("Found " + str(n) + " playlists...")
         i = 0
-        while i < len(playlists):
+        while i < n:
             playlist = playlists[i]
             playlistName = playlist[0]
             playlistID = playlist[1]
-            self._add_dir(playlistName, '', MODE_PLAYLIST, self.playlistImg, playlistID)
+            self._add_dir(playlistName, '', MODE_PLAYLIST, self.playlistImg, playlistID, n)
             i = i + 1  
         xbmcplugin.setContent(self._handle, 'files')
         xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_PLAYLIST_ORDER)
+        xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
       
-    def _add_dir(self, name, url, mode, iconimage, id):
+    def _add_dir(self, name, url, mode, iconimage, id, items=1):
         u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&name="+urllib.quote_plus(name)+"&id="+str(id)
         dir=xbmcgui.ListItem(name, iconImage=iconimage, thumbnailImage=iconimage)
         dir.setInfo( type="Music", infoLabels={ "title": name } )
         # 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)
-
-    def onPlayBackChanged(self, change):
-        xbmc.log("onPlayBackChanged " + str(change))
-        if change == 0:
-            groovesharkApi.radioEnabled = False
-        if change == 1 and groovesharkApi.radioTurnedOn() == True:
-            xbmc.log("playnext")
-            self.player.playNext()
-        if change == 2:
-            xbmc.log("playback started")
-            xbmc.sleep(7500)
-            while self.player.isPlaying() or xbmc.Player(xbmc.PLAYER_CORE_PAPLAYER).isPlaying():
-                xbmc.sleep(1000)
-            xbmc.log("stopped playing")
+        return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True, totalItems=items)
 
    
 def get_params():
@@ -453,9 +497,6 @@ except: pass
 try: id=int(params["id"])
 except: pass
 
-if (id > 0):
-    lastID = id
-
 if mode==None:
     grooveshark.categories()
        
@@ -468,8 +509,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()
@@ -478,8 +519,6 @@ elif mode==MODE_FAVORITES:
     grooveshark.favorites()
 
 elif mode==MODE_SONG:
-    try: name=urllib.unquote_plus(params["name"])
-    except: pass
     try: album=urllib.unquote_plus(params["album"])
     except: pass
     try: artist=urllib.unquote_plus(params["artist"])
@@ -494,28 +533,38 @@ elif mode==MODE_SONG:
     grooveshark.playSong(song)
 
 elif mode==MODE_ARTIST:
-    grooveshark.artist(lastID)
+    grooveshark.artist(id)
     
 elif mode==MODE_ALBUM:
-    grooveshark.album(lastID)
+    grooveshark.album(id)
     
 elif mode==MODE_PLAYLIST:
-    grooveshark.playlist(lastID)
+    grooveshark.playlist(id, name)
     
 elif mode==MODE_FAVORITE:
-    grooveshark.favorite(lastID)
+    grooveshark.favorite(id)
 
 elif mode==MODE_UNFAVORITE:
-    grooveshark.unfavorite(lastID)
-
-elif mode==MODE_SIMILAR_ARTIST:
-    grooveshark.similarArtist(lastID)
+    try: prevMode=urllib.unquote_plus(params["prevmode"])
+    except: pass
+    grooveshark.unfavorite(id, prevMode)
 
-elif mode==MODE_SIMILAR_SONG:
-    grooveshark.similarSong(lastID)
+elif mode==MODE_SIMILAR_ARTISTS:
+    grooveshark.similarArtists(id)
 
-elif mode==MODE_FROWN:
-    grooveshark.frown(lastID)
+elif mode==MODE_MAKE_PLAYLIST:
+    grooveshark.makePlaylist(id, name)
     
+elif mode==MODE_REMOVE_PLAYLIST:
+    grooveshark.removePlaylist(id, name)    
+
+elif mode==MODE_RENAME_PLAYLIST:
+    grooveshark.renamePlaylist(id, name)    
+
+elif mode==MODE_REMOVE_PLAYLIST_SONG:
+    try: playlistID=urllib.unquote_plus(params["playlistid"])
+    except: pass
+    grooveshark.removePlaylistSong(playlistID, name, id)
+
 if (mode < MODE_SONG):    
     xbmcplugin.endOfDirectory(int(sys.argv[1]))