More dharma stuff.
[clinton/xbmc-groove.git] / default.py
index 2faa23b..2053c2a 100644 (file)
@@ -1,13 +1,4 @@
-import urllib, urllib2, re, xbmcplugin, xbmcgui, xbmc, sys, os
-
-# plugin constants
-__plugin__ = "Grooveshark"
-__author__ = "Stephen Denham"
-__url__ = ""
-__svn_url__ = ""
-__version__ = "0.0.1"
-__svn_revision__ = ""
-__XBMC_Revision__ = ""
+import urllib, urllib2, re, xbmcplugin, xbmcgui, xbmc, sys, os, time, pprint, shutil, xbmcaddon
 
 MODE_SEARCH_SONGS = 1
 MODE_SEARCH_ALBUMS = 2
@@ -21,17 +12,18 @@ MODE_PLAYLIST = 9
 MODE_SONG = 10
 MODE_FAVORITE = 11
 MODE_UNFAVORITE = 12
-
-songsearchlimit = 0
-albumsearchlimit = 0
-artistsearchlimit = 0
+MODE_SIMILAR_SONG = 13
+MODE_SIMILAR_ARTIST = 14
+MODE_FROWN = 15
 
 lastID = 0
 
-resDir = xbmc.translatePath(os.path.join(os.getcwd(), 'resources'))
+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/plugin_data/music', os.path.basename(os.getcwd()))
+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'))
 
 sys.path.append (libDir)
 from GrooveAPI import *
@@ -40,45 +32,54 @@ groovesharkApi = GrooveAPI()
 class _Info:
     def __init__( self, *args, **kwargs ):
         self.__dict__.update( kwargs )
-
+        
 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'))
+    fanImg = xbmc.translatePath(os.path.join(baseDir, 'fanart.png'))
 
-    songsearchlimit = xbmcplugin.getSetting('songsearchlimit')
-    albumsearchlimit = xbmcplugin.getSetting('albumsearchlimit')
-    artistsearchlimit = xbmcplugin.getSetting('artistsearchlimit')
+    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)
-
-        self._addDir('Search songs', '', MODE_SEARCH_SONGS, self.songImg, 0)
-        self._addDir('Search albums', '', MODE_SEARCH_ALBUMS, self.albumImg, 0)
-        self._addDir('Search artists', '', MODE_SEARCH_ARTISTS, self.artistImg, 0)
-        self._addDir('Popular', '', MODE_POPULAR, self.popularImg, 0)
+        xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
+        if os.path.isdir(thumbDir) == False:
+            os.makedirs(thumbDir)
+        
+        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._addDir('Favorites', '', MODE_FAVORITES, self.favoritesImg, 0)
-            self._addDir('Playlists', '', MODE_PLAYLISTS, self.playlistImg, 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 = xbmcplugin.getSetting('songsearchlimit'))
+            songs = groovesharkApi.searchSongs(query, limit = self.songsearchlimit)
             if (len(songs) > 0):
-                self._get_songs(songs)
+                self._add_songs_directory(songs)
             else:
                 dialog = xbmcgui.Dialog()
                 dialog.ok('Grooveshark', 'No matching songs.')
@@ -87,9 +88,9 @@ class Groveshark:
     def searchAlbums(self):
         query = self._get_keyboard(default="", heading="Search albums")
         if (query): 
-            albums = groovesharkApi.searchAlbums(query, limit = xbmcplugin.getSetting('albumsearchlimit'))
+            albums = groovesharkApi.searchAlbums(query, limit = self.albumsearchlimit)
             if (len(albums) > 0):
-                self._get_albums(albums)
+                self._add_albums_directory(albums)
             else:
                 dialog = xbmcgui.Dialog()
                 dialog.ok('Grooveshark', 'No matching albums.')
@@ -98,29 +99,27 @@ class Groveshark:
     def searchArtists(self):
         query = self._get_keyboard(default="", heading="Search artists")
         if (query): 
-            artists = groovesharkApi.searchArtists(query, limit = xbmcplugin.getSetting('artistsearchlimit'))
+            artists = groovesharkApi.searchArtists(query, limit = self.artistsearchlimit)
             if (len(artists) > 0):
-                self._get_artists(artists)
+                self._add_artists_directory(artists)
             else:
                 dialog = xbmcgui.Dialog()
                 dialog.ok('Grooveshark', 'No matching artists.')
                 self.categories()
                     
     def favorites(self):
-        userid = self._get_login()
-        if (userid != 0):
-            favorites = groovesharkApi.userGetFavoriteSongs(userid)
-            if (len(favorites) > 0):
-                self._get_songs(favorites)
-            else:
-                dialog = xbmcgui.Dialog()
-                dialog.ok('Grooveshark', 'You have no favorites.')
-                self.categories()
+        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 popular(self):
-        popular = groovesharkApi.popularGetSongs(limit = xbmcplugin.getSetting('songsearchlimit'))
+        popular = groovesharkApi.popularGetSongs(limit = self.songsearchlimit)
         if (len(popular) > 0):
-            self._get_songs(popular)
+            self._add_songs_directory(popular)
         else:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'No popular songs.')
@@ -131,7 +130,7 @@ class Groveshark:
         if (userid != 0):
             playlists = groovesharkApi.userGetPlaylists()
             if (len(playlists) > 0):
-                self._get_playlists(playlists)
+                self._add_playlists_directory(playlists)
             else:
                 dialog = xbmcgui.Dialog()
                 dialog.ok('Grooveshark', 'You have no playlists.')
@@ -142,6 +141,7 @@ class Groveshark:
         if (userid != 0):
             xbmc.log("Favorite playSong: " + str(songid))
             groovesharkApi.favoriteSong(songID = songid)
+            os.remove(favoritesCache)
         else:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'You must be logged in', 'to add favorites.')
@@ -151,34 +151,107 @@ class Groveshark:
         if (userid != 0):
             xbmc.log("Unfavorite playSong: " + str(songid))
             groovesharkApi.unfavoriteSong(songID = songid)
+            os.remove(favoritesCache)
         else:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'You must be logged in', 'to remove favorites.')
+
+    def frown(self, songid):
+        userid = self._get_login()
+        if (userid != 0):
+            xbmc.log("Frown playSong: " + str(songid))
+            if groovesharkApi.radioFrown(songId = songid) != True:
+                xbmc.log("Unable to frown song " + str(songid))
+        else:
+            dialog = xbmcgui.Dialog()
+            dialog.ok('Grooveshark', 'You must be logged in', 'to frown a song.')
+
+    def similarSong(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()
+            else:
+                dialog = xbmcgui.Dialog()
+                dialog.ok('Grooveshark', 'Cannot start radio')
+        else:
+            dialog = xbmcgui.Dialog()
+            dialog.ok('Grooveshark', 'You must be logged in', 'to update radio song.')
+
+    def similarArtist(self, artistId):
+        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:
+                dialog = xbmcgui.Dialog()
+                dialog.ok('Grooveshark', 'Cannot start radio')
+        else:
+            dialog = xbmcgui.Dialog()
+            dialog.ok('Grooveshark', 'You must be logged in', 'to update radio artists.')
     
     def album(self,albumid):
-        album = groovesharkApi.albumGetSongs(albumId = albumid, limit = xbmcplugin.getSetting('songsearchlimit'))
-        self._get_songs(album)
+        album = groovesharkApi.albumGetSongs(albumId = albumid, limit = self.songsearchlimit)
+        self._add_songs_directory(album)
     
     def artist(self, artistid):
-        albums = groovesharkApi.artistGetAlbums(artistId = artistid, limit = xbmcplugin.getSetting('albumsearchlimit'))
-        self._get_albums(albums)
+        albums = groovesharkApi.artistGetAlbums(artistId = artistid, limit = self.albumsearchlimit)
+        self._add_albums_directory(albums)
     
     def playlist(self, playlistid):
         userid = self._get_login()
         if (userid != 0):
-            songs = groovesharkApi.playlistGetSongs(playlistId = playlistid, limit = xbmcplugin.getSetting('songsearchlimit'))
-            self._get_songs(songs)
+            songs = groovesharkApi.playlistGetSongs(playlistId = playlistid, limit = self.songsearchlimit)
+            self._add_songs_directory(songs)
         else:
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'You must be logged in', 'to get playlists.')
             
-    def playSong(self, url, name, album, artist, duration, thumb, image):
+    def playSong(self, item):
+        url = item.getProperty('url')
         xbmc.log("Playing: " + url)
-        songItem = xbmcgui.ListItem(label = name, path=url, thumbnailImage=thumb, iconImage=image)
-        songItem.setInfo( type="Music", infoLabels={ "title": name, "duration": duration, "album": album, "artist": artist} )
-        songItem.setProperty('mimetype', 'audio/mpeg')
-        xbmc.Player().stop()
-        xbmc.Player(xbmc.PLAYER_CORE_PAPLAYER).play(url, songItem, False)
+        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")
+        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')
+        item.setProperty("IsPlayable", "true")
+        item.setProperty('url', url)
+        item.setProperty('thumb', songThm)
+        item.setProperty('image', songImg)
+        
+        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)
@@ -188,16 +261,14 @@ class Groveshark:
             return ''
     
     def _get_login(self):
-        username = xbmcplugin.getSetting('username')
-        password = xbmcplugin.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
@@ -206,24 +277,71 @@ class Groveshark:
                 dialog.ok('Grooveshark', 'Unable to login.', 'Check username and password in settings.')
                 return 0
     
-    def _get_songs(self, songs):
-        xbmc.log("Found " + str(len(songs)) + " songs...")
+    def _get_song_item(self, song):
+        name = song[0]
+        id = song[1]
+        duration = song[2]
+        album = song[3]
+        artist = song[6]
+        thumb = song[8]
+        image = song[9]
+        return self.songItem(id, name, album, artist, duration, thumb, image)            
+        
+    # 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:
+                loc = urllib.URLopener()
+                loc.retrieve(url, localThumb)
+        except:
+            xbmc.log('URL download failed of ' + url + ' to ' + localThumb)
+            return(self.defImg)
+
+        return os.path.join(os.path.join(thumbDir, str(id))) + '.tbn'
+        
+    def _add_songs_directory(self, songs):
+        n = len(songs)
+        xbmc.log("Found " + str(n) + " songs...")
         i = 0
-        while i < len(songs):
+        while i < n:
             song = songs[i]
-            songName = song[0]
-            songID = song[1]
-            songDuration = song[2]
-            songAlbum = song[3]
-            songArtist = song[6]
-            songThumb = song[8]
-            songImage = song[9]
-            songUrl = groovesharkApi.getStreamURL(songID)
-            self._addSong(songID, songName, songUrl, songDuration, songAlbum, songArtist, songThumb, songImage)
+            item = self._get_song_item(song)
+            songurl = item.getProperty('url')
+            songthumb = item.getProperty('thumb')
+            songimage = item.getProperty('image')
+            songname = song[0]
+            songid = song[1]
+            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) \
+            +"&album="+urllib.quote_plus(songalbum) \
+            +"&artist="+urllib.quote_plus(songartist) \
+            +"&duration="+str(songduration) \
+            +"&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)
+            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+")"))
+            item.addContextMenuItems(menuItems, replaceItems=False)
+            xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False)
             i = i + 1
         xbmcplugin.setContent(self._handle, 'songs')
             
-    def _get_albums(self, albums):
+    def _add_albums_directory(self, albums):
         xbmc.log("Found " + str(len(albums)) + " albums...")
         i = 0
         while i < len(albums):
@@ -231,61 +349,37 @@ class Groveshark:
             albumArtistName = album[0]
             albumName = album[2]
             albumID = album[3]
-            albumImage = album[4]
-            self._addDir(albumName + " - " + albumArtistName, '', MODE_ALBUM, albumImage, albumID)
+            albumImage = self._get_icon(album[4], 'album-' + str(albumID))
+            self._add_dir(albumName + " - " + albumArtistName, '', MODE_ALBUM, albumImage, albumID)
             i = i + 1
         xbmcplugin.setContent(self._handle, 'albums')
         xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_ALBUM_IGNORE_THE)
             
-    def _get_artists(self, artists):
+    def _add_artists_directory(self, artists):
         xbmc.log("Found " + str(len(artists)) + " artists...")
         i = 0
         while i < len(artists):
             artist = artists[i]
             artistName = artist[0]
             artistID = artist[1]
-            self._addDir(artistName, '', MODE_ARTIST, self.artistImg, artistID)
+            self._add_dir(artistName, '', MODE_ARTIST, self.artistImg, artistID)
             i = i + 1
         xbmcplugin.setContent(self._handle, 'artists')
         xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_ARTIST_IGNORE_THE)
             
-    def _get_playlists(self, playlists):
+    def _add_playlists_directory(self, playlists):
         xbmc.log("Found " + str(len(playlists)) + " playlists...")
         i = 0
         while i < len(playlists):
             playlist = playlists[i]
             playlistName = playlist[0]
             playlistID = playlist[1]
-            self._addDir(playlistName, '', MODE_PLAYLIST, self.playlistImg, playlistID, )
+            self._add_dir(playlistName, '', MODE_PLAYLIST, self.playlistImg, playlistID)
             i = i + 1  
         xbmcplugin.setContent(self._handle, 'files')
         xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_PLAYLIST_ORDER)
-        
-    def _addSong(self, songid, songname, songurl, songduration, songalbum, songartist, songthumb, songimage):
-        songImg = self._getThumb(songimage, str(songid) + "-image")
-        if songImg == "":
-            songImg = songimage
-        songThm = self._getThumb(songthumb, str(songid) + "-thumb")
-        if songThm == "":
-            songThm = songthumb
-        u=sys.argv[0]+"?url="+urllib.quote_plus(songurl)+"&mode="+str(MODE_SONG)+"&name="+urllib.quote_plus(songname)+"&id="+str(songid) \
-        +"&album="+urllib.quote_plus(songalbum) \
-        +"&artist="+urllib.quote_plus(songartist) \
-        +"&duration="+str(songduration) \
-        +"&thumb="+urllib.quote_plus(songThm) \
-        +"&image="+urllib.quote_plus(songImg)
-        songItem = xbmcgui.ListItem(label = songartist + " - " + songalbum + " - " + songname, iconImage=songImg, thumbnailImage=songThm, path=songurl)
-        songItem.setInfo( type="Music", infoLabels={ "title": songname, "duration": songduration, "album": songalbum, "artist": songartist} )
-        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)
-        menuItems = []
-        menuItems.append(("Grooveshark Favorite",      "XBMC.RunPlugin("+fav+")"))
-        menuItems.append(("Not Grooveshark Favorite", "XBMC.RunPlugin("+unfav+")"))
-        songItem.addContextMenuItems(menuItems, replaceItems=False)
-        xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=songItem,isFolder=False)
-        return songItem
       
-    def _addDir(self, name, url, mode, iconimage, id):
+    def _add_dir(self, name, url, mode, iconimage, id):
         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 } )
@@ -294,22 +388,7 @@ class Groveshark:
         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)
-    
-    # File download            
-    def _getThumb(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:
-                loc = urllib.URLopener()
-                loc.retrieve(url, localThumb)
-        except:
-            xbmc.log('URL download failed of ' + url + ' to ' + localThumb)
-            return ""
 
-        return os.path.join(os.path.join(thumbDir, str(id))) + '.tbn'
-     
-        
    
 def get_params():
     param=[]
@@ -383,7 +462,8 @@ elif mode==MODE_SONG:
     except: pass
     try: image=urllib.unquote_plus(params["image"])
     except: pass
-    grooveshark.playSong(url, name, album, artist, duration, thumb, image)
+    song = grooveshark.songItem(id, name, album, artist, duration, thumb, image)
+    grooveshark.playSong(song)
 
 elif mode==MODE_ARTIST:
     grooveshark.artist(lastID)
@@ -399,6 +479,15 @@ elif mode==MODE_FAVORITE:
 
 elif mode==MODE_UNFAVORITE:
     grooveshark.unfavorite(lastID)
+
+elif mode==MODE_SIMILAR_ARTIST:
+    grooveshark.similarArtist(lastID)
+
+elif mode==MODE_SIMILAR_SONG:
+    grooveshark.similarSong(lastID)
+
+elif mode==MODE_FROWN:
+    grooveshark.frown(lastID)
     
 if (mode < MODE_SONG):    
     xbmcplugin.endOfDirectory(int(sys.argv[1]))