Version number update.
[clinton/xbmc-groove.git] / default.py
index 2053c2a..9fd4167 100644 (file)
@@ -1,29 +1,45 @@
-import urllib, urllib2, re, xbmcplugin, xbmcgui, xbmc, sys, os, time, pprint, shutil, xbmcaddon
+import urllib, urllib2, re, xbmcplugin, xbmcgui, xbmc, sys, os, time, 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
+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
+MODE_ADD_PLAYLIST_SONG = 18
 
-lastID = 0
+ACTION_MOVE_LEFT = 1
+ACTION_MOVE_UP = 3
+ACTION_MOVE_DOWN = 4
+ACTION_PAGE_UP = 5
+ACTION_PAGE_DOWN = 6
+ACTION_SELECT_ITEM = 7
+ACTION_PREVIOUS_MENU = 10
 
 baseDir = os.getcwd()
 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('special://masterprofile/addon_data/', os.path.join(os.path.basename(os.getcwd()), 'favorites.dmp'))
+
+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')
+listBackground = os.path.join(imgDir, 'listbackground.png')
 
 sys.path.append (libDir)
 from GrooveAPI import *
@@ -33,15 +49,75 @@ class _Info:
     def __init__( self, *args, **kwargs ):
         self.__dict__.update( kwargs )
         
+class GroovesharkPlaylistSelect(xbmcgui.WindowDialog):
+    
+    def __init__(self, items=[]):
+        gap = int(self.getHeight()/100)
+        w = int(self.getWidth()*0.5)
+        h = self.getHeight()-30*gap
+        rw = self.getWidth()
+        rh = self.getHeight()
+        x = rw/2 - w/2
+        y = rh/2 -h/2
+        
+        self.imgBg = xbmcgui.ControlImage(x+gap, 5*gap+y, w-2*gap, h-5*gap, listBackground)
+        self.addControl(self.imgBg)
+
+        self.playlistControl = xbmcgui.ControlList(2*gap+x, y+3*gap+30, w-4*gap, h-10*gap, textColor='0xFFFFFFFF', selectedColor='0xFFFF4242', itemTextYOffset=0, itemHeight=50, alignmentY = 0)
+        self.addControl(self.playlistControl)
+
+        self.lastPos = 0
+        self.isSelecting = False
+        self.selected = -1
+        listitems = []
+        for playlist in items:
+            listitems.append(xbmcgui.ListItem(playlist[0]))
+        listitems.append(xbmcgui.ListItem('New...'))
+        self.playlistControl.addItems(listitems)
+        self.setFocus(self.playlistControl)
+        self.playlistControl.selectItem(0)
+        item = self.playlistControl.getListItem(self.lastPos)
+        item.select(True)
+
+    # Highlight selected item
+    def setHighlight(self):
+        if self.isSelecting:
+            return
+        else:
+            self.isSelecting = True
+        
+        pos = self.playlistControl.getSelectedPosition()
+        if pos >= 0:
+            item = self.playlistControl.getListItem(self.lastPos)
+            item.select(False)
+            item = self.playlistControl.getListItem(pos)
+            item.select(True)
+            self.lastPos = pos
+        self.isSelecting = False
+
+    # Control
+    def onControl(self, control):
+        if control == self.playlistControl:
+            self.selected = self.playlistControl.getSelectedPosition()
+            self.close()
+        
+    def onAction(self, action):
+        if action == ACTION_PREVIOUS_MENU:
+            self.selected = -1
+            self.close()
+        elif action == ACTION_MOVE_UP or action == ACTION_MOVE_DOWN or action == ACTION_PAGE_UP or action == ACTION_PAGE_DOWN == 6:
+            self.setFocus(self.playlistControl)
+            self.setHighlight()
+        
 class Groveshark:
     
-    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'))
-    songImg = xbmc.translatePath(os.path.join(imgDir,  'song.png'))
-    defImg = xbmc.translatePath(os.path.join(imgDir,  'default.tbn'))
+    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'))
+    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'))
 
     settings = xbmcaddon.Addon(id='plugin.audio.groove')
@@ -50,7 +126,8 @@ class Groveshark:
     artistsearchlimit = settings.getSetting('artistsearchlimit')
     username = settings.getSetting('username')
     password = settings.getSetting('password')
-
+    userid = 0
+    
     def __init__( self ):
         self._handle = int(sys.argv[1])
 
@@ -58,10 +135,9 @@ class Groveshark:
 
         xbmc.log(self.username + ", limits: " + str(self.songsearchlimit) + ", " + str(self.albumsearchlimit) + ", "  + str(self.artistsearchlimit))
         
-        userid = self._get_login()
+        self.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)
@@ -69,60 +145,87 @@ 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)
-        if (userid != 0):
+        self._add_dir('Popular songs', '', MODE_POPULAR_SONGS, self.popularSongsImg, 0)
+        if (self.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): 
+        if (query != ''):
+            groovesharkApi.setRemoveDuplicates(True)
             songs = groovesharkApi.searchSongs(query, limit = self.songsearchlimit)
             if (len(songs) > 0):
                 self._add_songs_directory(songs)
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok('Grooveshark', 'No matching songs.')
+                dialog.ok('Grooveshark XBMC', 'No matching songs.')
                 self.categories()
+        else:
+            self.categories()
     
     def searchAlbums(self):
         query = self._get_keyboard(default="", heading="Search albums")
-        if (query): 
+        if (query != ''): 
             albums = groovesharkApi.searchAlbums(query, limit = self.albumsearchlimit)
             if (len(albums) > 0):
                 self._add_albums_directory(albums)
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok('Grooveshark', 'No matching albums.')
+                dialog.ok('Grooveshark XBMC', 'No matching albums.')
                 self.categories()
+        else:
+            self.categories()
     
     def searchArtists(self):
         query = self._get_keyboard(default="", heading="Search artists")
-        if (query): 
+        if (query != ''): 
             artists = groovesharkApi.searchArtists(query, limit = self.artistsearchlimit)
             if (len(artists) > 0):
                 self._add_artists_directory(artists)
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok('Grooveshark', 'No matching artists.')
+                dialog.ok('Grooveshark XBMC', 'No matching artists.')
                 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()
+                    
+    def favorites(self):
+        userid = self._get_login()
+        if (userid != 0):
+            favorites = groovesharkApi.userGetFavoriteSongs(userid)
+            if (len(favorites) > 0):
+                self._add_songs_directory(favorites, isFavorites=True)
+            else:
+                dialog = xbmcgui.Dialog()
+                dialog.ok('Grooveshark XBMC', '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)
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok('Grooveshark', 'No popular songs.')
+            dialog.ok('Grooveshark XBMC', '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 XBMC', '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 XBMC', 'No popular artists.')
             self.categories()
                  
     def playlists(self):
@@ -133,95 +236,191 @@ class Groveshark:
                 self._add_playlists_directory(playlists)
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok('Grooveshark', 'You have no playlists.')
+                dialog.ok('Grooveshark XBMC', 'You have no Grooveshark playlists.')
                 self.categories()
+        else:
+            dialog = xbmcgui.Dialog()
+            dialog.ok('Grooveshark XBMC', 'You must be logged in ', ' to see your Grooveshark playlists.')
+                
                 
     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)
-            os.remove(favoritesCache)
+            xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Added to favorites, 1000, ' + thumbDef + ')')
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok('Grooveshark', 'You must be logged in', 'to add favorites.')
+            dialog.ok('Grooveshark XBMC', '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)
-            os.remove(favoritesCache)
+            xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Removed from Grooveshark favorites, 1000, ' + thumbDef + ')')
+            if (int(prevMode) == MODE_FAVORITES):
+                xbmc.executebuiltin("Container.Refresh(" + favoritesUrl + ")")
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok('Grooveshark', 'You must be logged in', 'to remove favorites.')
+            dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to remove Grooveshark favorites.')
 
     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 XBMC, Frowned, 1000, ' + thumbDef + ')')
+        else:
+            dialog = xbmcgui.Dialog()
+            dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to frown a Grooveshark song.')
+
+    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', 'You must be logged in', 'to frown a song.')
+            dialog.ok('Grooveshark XBMC', 'No similar artists.')
+            self.categories()
+            
+    def makePlaylist(self, albumid, name):
+        userid = self._get_login()
+        if (userid != 0):
+            re.split(' - ',name,1)
+            nameTokens = re.split(' - ',name,1)
+            name = self._get_keyboard(default=nameTokens[0], heading="Grooveshark playlist name")
+            if name != '':
+                groovesharkApi.setRemoveDuplicates(True)
+                album = groovesharkApi.albumGetSongs(albumid, self.songsearchlimit)
+                songids = []
+                for song in album:
+                    songids.append(song[1])
+                if groovesharkApi.playlistCreateUnique(name, songids) == 0:
+                    dialog = xbmcgui.Dialog()
+                    dialog.ok('Grooveshark XBMC', 'Cannot create Grooveshark playlist ', name)
+                else:
+                    xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Grooveshark playlist created, 1000, ' + thumbDef + ')')
+        else:
+            dialog = xbmcgui.Dialog()
+            dialog.ok('Grooveshark XBMC', 'You must be logged in ', ' to create a Grooveshark playlist.')
+            
+    def removePlaylist(self, playlistid, name):
+        dialog = xbmcgui.Dialog()
+        if dialog.yesno('Grooveshark XBMC', name, 'Delete this Grooveshark playlist?') == True:
+            userid = self._get_login()
+            if (userid != 0):
+                groovesharkApi.playlistDelete(playlistid)
+                xbmc.executebuiltin("Container.Refresh(" + playlistsUrl + ")")
+            else:
+                dialog = xbmcgui.Dialog()
+                dialog.ok('Grooveshark XBMC', 'You must be logged in ', ' to delete a Grooveshark playlist.')
+
+    def removePlaylistSong(self, playlistid, playlistname, songpos):
+        dialog = xbmcgui.Dialog()
+        if dialog.yesno('Grooveshark XBMC', 'Delete this song from the Grooveshark playlist?') == True:
+            userid = self._get_login()
+            if (userid != 0):
+                if groovesharkApi.playlistDeleteSong(playlistid, songpos) == 0:
+                    dialog = xbmcgui.Dialog()
+                    dialog.ok('Grooveshark XBMC', 'Failed to remove ', ' song from Grooveshark playlist.')
+                else:
+                    xbmc.executebuiltin("Container.Refresh(" + playlistUrl + "&id="+str(playlistid) + "&name=" + playlistname + ",replace)")
+            else:
+                dialog = xbmcgui.Dialog()
+                dialog.ok('Grooveshark XBMC', 'You must be logged in ', ' to delete a song from a Grooveshark playlist.')
 
-    def similarSong(self, songid):
+    def addPlaylistSong(self, songid):
         userid = self._get_login()
         if (userid != 0):
-            xbmc.log("Frown playSong: " + str(songid))
-            if groovesharkApi.radioSong(songId = songid) and groovesharkApi.radioStartSongs() == True:
-                self.playNext()
+            playlists = groovesharkApi.userGetPlaylists()
+            if (len(playlists) > 0):
+                ret = 0
+                playlistSelect = GroovesharkPlaylistSelect(items=playlists)
+                playlistSelect.setFocus(playlistSelect.playlistControl)
+                playlistSelect.doModal()
+                i = playlistSelect.selected
+                del playlistSelect
+                if i > -1:
+                    # New playlist
+                    if i >= len(playlists):
+                        name = self._get_keyboard(default='', heading="Grooveshark playlist name")
+                        if name != '':
+                            songIds = []
+                            songIds.append(songid)
+                            if groovesharkApi.playlistCreateUnique(name, songIds) == 0:
+                                dialog = xbmcgui.Dialog()
+                                dialog.ok('Grooveshark XBMC', 'Cannot create Grooveshark playlist ', name)
+                            else:
+                                xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Grooveshark playlist created, 1000, ' + thumbDef + ')')
+                    # Existing playlist
+                    else:
+                        playlist = playlists[i]
+                        playlistid = playlist[1]
+                        xbmc.log("Add song " + str(songid) + " to playlist " + str(playlistid))
+                        ret = groovesharkApi.playlistAddSong(playlistid, songid, 0)
+                        if ret == 0:
+                            dialog = xbmcgui.Dialog()
+                            dialog.ok('Grooveshark XBMC', 'Cannot add to playlist ')
+                        else:    
+                            xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Added song to Grooveshark playlist, 1000, ' + thumbDef + ')')
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok('Grooveshark', 'Cannot start radio')
+                dialog.ok('Grooveshark XBMC', 'You have no Grooveshark playlists.')
+                self.categories()
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok('Grooveshark', 'You must be logged in', 'to update radio song.')
+            dialog.ok('Grooveshark XBMC', 'You must be logged in ', ' to add a song to a Grooveshark playlist.')
 
-    def similarArtist(self, artistId):
+    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="Grooveshark playlist name")
+            if newname == '':
+                return
+            elif groovesharkApi.playlistRename(playlistid, newname) == 0:
                 dialog = xbmcgui.Dialog()
-                dialog.ok('Grooveshark', 'Cannot start radio')
+                dialog.ok('Grooveshark XBMC', 'Cannot rename Grooveshark 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 XBMC', 'You must be logged in ', ' to rename a Grooveshark playlist.')
     
-    def album(self,albumid):
+    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.albumsearchlimit)
-        self._add_albums_directory(albums)
+        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.songsearchlimit)
-            self._add_songs_directory(songs)
+            self._add_songs_directory(songs, playlistid, playlistname)
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok('Grooveshark', 'You must be logged in', 'to get playlists.')
+            dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to get Grooveshark playlists.')
             
     def playSong(self, item):
         url = item.getProperty('url')
         xbmc.log("Playing: " + url)
         xbmcplugin.setResolvedUrl(handle=int(sys.argv[1]), succeeded=True, listitem=item)
     
-    def playNext(self):
-        item = self._get_song_item(groovesharkApi.radioNextSong()[0])
-        self.playSong(item)
-
     def songItem(self, id, name, album, artist, duration, thumb, image):
         url = groovesharkApi.getStreamURL(id)
-        songImg = self._get_icon(image, 'song-' + str(id) + "-image")
-        songThm = self._get_icon(thumb, 'song-' + str(id) + "-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.setProperty('mimetype', 'audio/mpeg')
@@ -232,49 +431,27 @@ 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.gmtime() - os.path.gmtime(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()
-            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):
         if (self.username == "" or self.password == ""):
             dialog = xbmcgui.Dialog()
-            dialog.ok('Grooveshark', 'Unable to login.', 'Check username and password in settings.')
+            dialog.ok('Grooveshark XBMC', 'Unable to login.', 'Check username and password in settings.')
             return 0
         else:
-            if groovesharkApi.loggedInStatus() == 1:
-                groovesharkApi.logout()
-            userid = groovesharkApi.loginExt(self.username, self.password)
-            if (userid != 0):
+            if self.userid == 0:
+                uid = groovesharkApi.loginExt(self.username, self.password)
+            if (uid != 0):
                 xbmc.log("Logged in")
-                return userid
+                return uid
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok('Grooveshark', 'Unable to login.', 'Check username and password in settings.')
+                dialog.ok('Grooveshark XBMC', 'Unable to login.', 'Check username and password in settings.')
                 return 0
     
     def _get_song_item(self, song):
@@ -290,9 +467,9 @@ class Groveshark:
     # File download            
     def _get_icon(self, url, id):
         localThumb = os.path.join(xbmc.translatePath(os.path.join(thumbDir, str(id)))) + '.tbn'
-        xbmc.log('Downloading ' + url + ' to ' + localThumb)
         try:
             if os.path.isfile(localThumb) == False:
+                xbmc.log('Downloading ' + url + ' to ' + localThumb)
                 loc = urllib.URLopener()
                 loc.retrieve(url, localThumb)
         except:
@@ -301,9 +478,12 @@ class Groveshark:
 
         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...")
+        progressDialog = xbmcgui.DialogProgress()
+        progressDialog.create('Grooveshark XBMC', 'Fetching songs')
+        dirItems = []
         i = 0
         while i < n:
             song = songs[i]
@@ -316,7 +496,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) \
@@ -326,68 +505,93 @@ 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+")"))
-            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 isFavorites == True:
+                unfav = unfav +str(MODE_FAVORITES)
+            else:
+                menuItems.append(("Grooveshark favorite", "XBMC.RunPlugin("+fav+")"))
+            menuItems.append(("Not Grooveshark favorite", "XBMC.RunPlugin("+unfav+")"))
+            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 Grooveshark playlist", "XBMC.RunPlugin("+rmplaylstsong+")"))
+            else:
+                addplaylstsong=sys.argv[0]+"?id="+str(songid)+"&mode="+str(MODE_ADD_PLAYLIST_SONG)
+                menuItems.append(("Add to Grooveshark playlist", "XBMC.RunPlugin("+addplaylstsong+")"))
             item.addContextMenuItems(menuItems, replaceItems=False)
-            xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False)
+            dirItem = (u, item, False)
+            dirItems.append(dirItem)
             i = i + 1
+            progressDialog.update(int((i*100)/n))
+            if progressDialog.iscanceled():
+                break
+
+        progressDialog.close()
+        xbmcplugin.addDirectoryItems(int(sys.argv[1]), dirItems ,n)
         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 = self._get_icon(album[4], 'album-' + str(albumID))
-            self._add_dir(albumName + " - " + albumArtistName, '', MODE_ALBUM, albumImage, 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))"))
-        dir.addContextMenuItems(menuItems, replaceItems=True)
-        return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True)
+        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 Grooveshark playlist", "XBMC.RunPlugin("+rmplaylst+")"))
+            mvplaylst=sys.argv[0]+"?mode="+str(MODE_RENAME_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id)
+            menuItems.append(("Rename Grooveshark playlist", "XBMC.RunPlugin("+mvplaylst+")"))
+        dir.addContextMenuItems(menuItems, replaceItems=False)
+        return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True, totalItems=items)
 
    
 def get_params():
@@ -425,9 +629,6 @@ except: pass
 try: id=int(params["id"])
 except: pass
 
-if (id > 0):
-    lastID = id
-
 if mode==None:
     grooveshark.categories()
        
@@ -440,8 +641,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()
@@ -450,8 +651,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"])
@@ -466,28 +665,41 @@ 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)
+
+elif mode==MODE_ADD_PLAYLIST_SONG:
+    grooveshark.addPlaylistSong(id)    
+
 if (mode < MODE_SONG):    
     xbmcplugin.endOfDirectory(int(sys.argv[1]))