X-Git-Url: http://git.hcoop.net/clinton/xbmc-groove.git/blobdiff_plain/48e0c13869ef6c64f4e4dbf926a6de040b6a4e8a..4d482bba2a6fd40adff24b8f28654303360e822e:/default.py diff --git a/default.py b/default.py index 4e898ca..3ae1e04 100644 --- a/default.py +++ b/default.py @@ -16,7 +16,7 @@ # along with xbmc-groove. If not, see . -import urllib, sys, os, shutil, re, pickle, time, tempfile, xbmcaddon, xbmcplugin, xbmcgui, xbmc +import urllib, sys, os, shutil, re, pickle, time, traceback, xbmcaddon, xbmcplugin, xbmcgui, xbmc __addon__ = xbmcaddon.Addon('plugin.audio.groove') __addonname__ = __addon__.getAddonInfo('name') @@ -24,7 +24,7 @@ __cwd__ = __addon__.getAddonInfo('path') __author__ = __addon__.getAddonInfo('author') __version__ = __addon__.getAddonInfo('version') __language__ = __addon__.getLocalizedString -__debuggui__ = __addon__.getSetting('debug') +__debugging__ = __addon__.getSetting('debug') MODE_SEARCH_SONGS = 1 MODE_SEARCH_ALBUMS = 2 @@ -67,9 +67,6 @@ STREAM_MARKING_TIME = 30 # Timeout STREAM_TIMEOUT = 30 -# Retry URL -STREAM_RETRY = 15 - songMarkTime = 0 player = xbmc.Player() playTimer = None @@ -79,8 +76,9 @@ resDir = xbmc.translatePath(os.path.join(baseDir, 'resources')) libDir = xbmc.translatePath(os.path.join(resDir, 'lib')) imgDir = xbmc.translatePath(os.path.join(resDir, 'img')) cacheDir = os.path.join(xbmc.translatePath('special://masterprofile/addon_data/'), os.path.basename(baseDir)) +tempDir = xbmc.translatePath('special://temp') thumbDirName = 'thumb' -thumbDir = os.path.join('special://masterprofile/addon_data/', os.path.basename(baseDir), thumbDirName) +thumbDir = os.path.join(xbmc.translatePath('special://masterprofile/addon_data/'), os.path.basename(baseDir), thumbDirName) baseModeUrl = 'plugin://plugin.audio.groove/' playlistUrl = baseModeUrl + '?mode=' + str(MODE_PLAYLIST) @@ -96,14 +94,22 @@ sys.path.append (libDir) from GroovesharkAPI import GrooveAPI from threading import Event, Thread +if __debugging__ == 'true': + __debugging__ = True +else: + __debugging__ = False + try: - groovesharkApi = GrooveAPI() - groovesharkApi.setDebug(__debuggui__) + groovesharkApi = GrooveAPI(__debugging__, tempDir) if groovesharkApi.pingService() != True: raise StandardError(__language__(30007)) except: + print "Exception on initialisation" + print '-'*60 + traceback.print_exc() + print '-'*60 dialog = xbmcgui.Dialog(__language__(30008),__language__(30009),__language__(30010)) - dialog.ok() + dialog.ok(__language__(30008),__language__(30009)) sys.exit(-1) # Mark song as playing or played @@ -143,7 +149,8 @@ class GroovesharkPlaylistSelect(xbmcgui.WindowDialog): 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.playlistControl = xbmcgui.ControlList(2*gap+x, y+3*gap+30, w-4*gap, h-10*gap, textColor='0xFFFFFFFF', selectedColor='0xFFFF4242') + self.playlistControl.setItemHeight(50) self.addControl(self.playlistControl) self.lastPos = 0 @@ -239,7 +246,7 @@ class Grooveshark: popularSongsArtistImg = xbmc.translatePath(os.path.join(imgDir, 'popularSongsArtist.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')) + fanImg = xbmc.translatePath(os.path.join(baseDir, 'fanart.jpg')) settings = xbmcaddon.Addon(id='plugin.audio.groove') songsearchlimit = int(settings.getSetting('songsearchlimit')) @@ -255,12 +262,12 @@ class Grooveshark: self._handle = int(sys.argv[1]) if os.path.isdir(cacheDir) == False: os.makedirs(cacheDir) - if __debuggui__ == True: + if __debugging__ : xbmc.log(__language__(30012) + " " + cacheDir) artDir = xbmc.translatePath(thumbDir) if os.path.isdir(artDir) == False: os.makedirs(artDir) - if __debuggui__ == True: + if __debugging__ : xbmc.log(__language__(30012) + " " + artDir) # Top-level menu @@ -350,9 +357,9 @@ class Grooveshark: if (len(artists) > 0): artist = artists[0] artistID = artist[1] - if __debuggui__ == True: + if __debugging__ : xbmc.log("Found " + artist[0] + "...") - albums = groovesharkApi.getArtistAlbums(artistID, limit = self.albumsearchlimit) + albums = groovesharkApi.getArtistAlbums(artistID, self.albumsearchlimit) if (len(albums) > 0): self._add_albums_directory(albums, artistID) else: @@ -407,7 +414,7 @@ class Grooveshark: def favorite(self, songid): userid = self._get_login() if (userid != 0): - if __debuggui__ == True: + if __debugging__ : xbmc.log("Favorite song: " + str(songid)) groovesharkApi.addUserFavoriteSong(songID = songid) xbmc.executebuiltin('XBMC.Notification(' + __language__(30008) + ', ' + __language__(30036) + ', 1000, ' + thumbDef + ')') @@ -419,7 +426,7 @@ class Grooveshark: def unfavorite(self, songid, prevMode=0): userid = self._get_login() if (userid != 0): - if __debuggui__ == True: + if __debugging__ : xbmc.log("Unfavorite song: " + str(songid) + ', previous mode was ' + str(prevMode)) groovesharkApi.removeUserFavoriteSongs(songIDs = songid) xbmc.executebuiltin('XBMC.Notification(' + __language__(30008) + ', ' + __language__(30038) + ', 1000, ' + thumbDef + ')') @@ -439,7 +446,7 @@ class Grooveshark: # Show selected artist def artist(self, artistid): albums = groovesharkApi.getArtistAlbums(artistid, limit = self.albumsearchlimit) - self._add_albums_directory(albums, artistid) + self._add_albums_directory(albums, artistid, True) # Show selected playlist def playlist(self, playlistid, playlistname): @@ -459,7 +466,7 @@ class Grooveshark: if (len(artists) > 0): artist = artists[0] artistID = artist[1] - if __debuggui__ == True: + if __debugging__ : xbmc.log("Found " + artist[0] + "...") songs = groovesharkApi.getArtistPopularSongs(artistID, limit = self.songsearchlimit) if (len(songs) > 0): @@ -480,56 +487,76 @@ class Grooveshark: global playTimer global player if item != None: - songid = item.getProperty('songid') - duration = self._getSongDuration(songid) + # Get stream as it could have expired + item.select(True) url = '' + songid = item.getProperty('songid') stream = groovesharkApi.getSubscriberStreamKey(songid) if stream != False: url = stream['url'] - if url != '': - item.setPath(url) - xbmcplugin.setResolvedUrl(handle=int(sys.argv[1]), succeeded=True, listitem=item) - if __debuggui__ == True: - xbmc.log("Grooveshark playing: " + url) - # Wait for play then start timer - seconds = 0 - while seconds < STREAM_TIMEOUT: - try: - if player.isPlayingAudio() == True: - if playTimer != None: - playTimer.cancel() - songMarkTime = 0 - playTimer = PlayTimer(1, markSong, duration, [songid, duration, stream['streamKey'], stream['streamServerID']]) - playTimer.start() - break - except: pass - time.sleep(1) - seconds = seconds + 1 + key = stream['StreamKey'] + server = stream['StreamServerID'] + duration = int(self._setDuration(stream['uSecs'])) + stream = [songid, duration, url, key, server] + self._setSongStream(stream) + if url != '': + item.setPath(url) + xbmcplugin.setResolvedUrl(handle=int(sys.argv[1]), succeeded=True, listitem=item) + if __debugging__ : + xbmc.log("Grooveshark playing: " + url) + # Wait for play then start timer + seconds = 0 + while seconds < STREAM_TIMEOUT: + try: + if player.isPlayingAudio() == True: + if playTimer != None: + playTimer.cancel() + songMarkTime = 0 + playTimer = PlayTimer(1, markSong, self._setDuration(duration), [songid, duration, key, server]) + playTimer.start() + break + except: pass + time.sleep(1) + seconds = seconds + 1 + else: + xbmc.log("No song URL") else: - xbmc.log("No song URL") + xbmc.log("No song stream") else: xbmc.executebuiltin('XBMC.Notification(' + __language__(30008) + ', ' + __language__(30044) + ', 1000, ' + thumbDef + ')') # Make a song directory item - def songItem(self, songid, name, album, artist, coverart, trackLabelFormat=ARTIST_ALBUM_NAME_LABEL): - songImg = self._get_icon(coverart, 'song-' + str(songid) + "-image") - if int(trackLabelFormat) == NAME_ALBUM_ARTIST_LABEL: - trackLabel = name + " - " + album + " - " + artist - else: - trackLabel = artist + " - " + album + " - " + name - duration = self._getSongDuration(songid) - item = xbmcgui.ListItem(label = trackLabel, thumbnailImage=songImg, iconImage=songImg) - item.setInfo( type="music", infoLabels={ "title": name, "album": album, "artist": artist, "duration": duration} ) - item.setProperty('mimetype', 'audio/mpeg') - item.setProperty("IsPlayable", "true") - item.setProperty('songid', str(songid)) - item.setProperty('coverart', songImg) - item.setProperty('title', name) - item.setProperty('album', album) - item.setProperty('artist', artist) - item.setProperty('duration', str(duration)) + def songItem(self, songid, name, album, artist, coverart, trackLabelFormat=ARTIST_ALBUM_NAME_LABEL, tracknumber=1): - return item + stream = self._getSongStream(songid) + if stream != None: + duration = stream[1] + url = stream[2] + key = stream[3] + server = stream[4] + songImg = self._get_icon(coverart, 'song-' + str(songid) + "-image") + if int(trackLabelFormat) == NAME_ALBUM_ARTIST_LABEL: + trackLabel = name + " - " + album + " - " + artist + else: + trackLabel = artist + " - " + album + " - " + name + item = xbmcgui.ListItem(label = trackLabel, thumbnailImage=songImg, iconImage=songImg) + item.setPath(url) + item.setInfo( type="music", infoLabels={ "title": name, "album": album, "artist": artist, "duration": duration, "tracknumber" : tracknumber} ) + item.setProperty('mimetype', 'audio/mpeg') + item.setProperty("IsPlayable", "true") + item.setProperty('songid', str(songid)) + item.setProperty('coverart', songImg) + item.setProperty('title', name) + item.setProperty('album', album) + item.setProperty('artist', artist) + item.setProperty('duration', str(duration)) + item.setProperty('key', str(key)) + item.setProperty('server', str(server)) + item.setProperty('fanart_image', self.fanImg) + return item + else: + xbmc.log("No access to song URL") + return None # Next page of songs def songPage(self, offset, trackLabelFormat, playlistid = 0, playlistname = ''): @@ -618,7 +645,7 @@ class Grooveshark: else: playlist = playlists[i] playlistid = playlist[1] - if __debuggui__ == True: + if __debugging__ : xbmc.log("Add song " + str(songid) + " to playlist " + str(playlistid)) songIDs=[] songs = groovesharkApi.getPlaylistSongs(playlistid) @@ -657,7 +684,7 @@ class Grooveshark: else: # Refresh to remove item from directory xbmc.executebuiltin('XBMC.Notification(' + __language__(30008) + ',' + __language__(30066)+ ', 1000, ' + thumbDef + ')') - xbmc.executebuiltin("Container.Update(" + playlistUrl + "&id="+str(playlistid) + "&name=" + playlistname + ")") + xbmc.executebuiltin("Container.Update(" + playlistUrl + "&id="+str(playlistid) + "&name=" + str(playlistname) + ")") else: dialog = xbmcgui.Dialog() dialog.ok(__language__(30008), __language__(30034), __language__(30067)) @@ -684,7 +711,7 @@ class Grooveshark: def _get_login(self): if (self.username == "" or self.password == ""): dialog = xbmcgui.Dialog() - dialog.ok(__language__(30008), __language__(30069), __language__(30070)) + dialog.ok(__language__(30008), __language__(30069), __language__(30070), __language__(30082)) return 0 else: if self.userid == 0: @@ -693,18 +720,9 @@ class Grooveshark: return uid else: dialog = xbmcgui.Dialog() - dialog.ok(__language__(30008), __language__(30069), __language__(30070)) + dialog.ok(__language__(30008), __language__(30069), __language__(30070), __language__(30082)) return 0 - # Get a song directory item - def _get_song_item(self, song, trackLabelFormat): - name = song[0] - songid = song[1] - album = song[2] - artist = song[4] - coverart = song[6] - return self.songItem(songid, name, album, artist, coverart, trackLabelFormat) - # File download def _get_icon(self, url, songid): if url != 'None': @@ -729,7 +747,7 @@ class Grooveshark: # No pages needed if offset == 0 and totalSongs <= self.songspagelimit: - if __debuggui__ == True: + if __debugging__ : xbmc.log("Found " + str(totalSongs) + " songs...") # Pages else: @@ -744,15 +762,17 @@ class Grooveshark: start = offset end = min(start + self.songspagelimit,totalSongs) - id = 0 n = start items = end - start while n < end: song = songs[n] + name = song[0] songid = song[1] - duration = self._getSongDuration(songid) - if duration != -1: - item = self._get_song_item(song, trackLabelFormat) + album = song[2] + artist = song[4] + coverart = song[6] + item = self.songItem(songid, name, album, artist, coverart, trackLabelFormat, (n+1)) + if item != None: coverart = item.getProperty('coverart') songname = song[0] songalbum = song[2] @@ -770,38 +790,37 @@ class Grooveshark: menuItems.append((__language__(30071), "XBMC.RunPlugin("+fav+")")) menuItems.append((__language__(30072), "XBMC.RunPlugin("+unfav+")")) if playlistid > 0: - rmplaylstsong=sys.argv[0]+"?playlistid="+str(playlistid)+"&id="+str(songid)+"&mode="+str(MODE_REMOVE_PLAYLIST_SONG)+"&name="+playlistname + rmplaylstsong=sys.argv[0]+"?playlistid="+str(playlistid)+"&id="+str(songid)+"&mode="+str(MODE_REMOVE_PLAYLIST_SONG)+"&name="+str(playlistname) menuItems.append((__language__(30073), "XBMC.RunPlugin("+rmplaylstsong+")")) else: addplaylstsong=sys.argv[0]+"?id="+str(songid)+"&mode="+str(MODE_ADD_PLAYLIST_SONG) menuItems.append((__language__(30074), "XBMC.RunPlugin("+addplaylstsong+")")) item.addContextMenuItems(menuItems, replaceItems=False) xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False, totalItems=items) - id = id + 1 else: end = min(end + 1,totalSongs) - if __debuggui__ == True: + if __debugging__ : xbmc.log(song[0] + " does not exist.") n = n + 1 if totalSongs > end: - u=sys.argv[0]+"?mode="+str(MODE_SONG_PAGE)+"&id=playlistid"+"&offset="+str(end)+"&label="+str(trackLabelFormat)+"&name="+playlistname + u=sys.argv[0]+"?mode="+str(MODE_SONG_PAGE)+"&id=playlistid"+"&offset="+str(end)+"&label="+str(trackLabelFormat)+"&name="+str(playlistname) self._add_dir(__language__(30075) + '...', u, MODE_SONG_PAGE, self.songImg, 0, totalSongs - end) xbmcplugin.setContent(self._handle, 'songs') xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg) # Add albums to directory - def _add_albums_directory(self, albums, artistid=0): + def _add_albums_directory(self, albums, artistid=0, isverified=False): n = len(albums) itemsExisting = n - if __debuggui__ == True: + if __debugging__ : xbmc.log("Found " + str(n) + " albums...") i = 0 while i < n: album = albums[i] albumID = album[3] - if groovesharkApi.getDoesAlbumExist(albumID): + if isverified or groovesharkApi.getDoesAlbumExist(albumID): albumArtistName = album[0] albumName = album[2] albumImage = self._get_icon(album[4], 'album-' + str(albumID)) @@ -820,7 +839,7 @@ class Grooveshark: def _add_artists_directory(self, artists): n = len(artists) itemsExisting = n - if __debuggui__ == True: + if __debugging__ : xbmc.log("Found " + str(n) + " artists...") i = 0 while i < n: @@ -839,43 +858,44 @@ class Grooveshark: # Add playlists to directory def _add_playlists_directory(self, playlists): n = len(playlists) - if __debuggui__ == True: + if __debugging__ : xbmc.log("Found " + str(n) + " playlists...") i = 0 while i < n: playlist = playlists[i] playlistName = playlist[0] playlistID = playlist[1] - dir = self._add_dir(playlistName, '', MODE_PLAYLIST, self.playlistImg, playlistID, n) + 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_LABEL) xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg) # Add whatever directory - def _add_dir(self, name, url, mode, iconimage, id, items=1): + def _add_dir(self, name, url, mode, iconimage, itemId, items=1): if url == '': - u=sys.argv[0]+"?mode="+str(mode)+"&name="+urllib.quote_plus(name)+"&id="+str(id) + u=sys.argv[0]+"?mode="+str(mode)+"&name="+urllib.quote_plus(name)+"&id="+str(itemId) else: u = url - dir=xbmcgui.ListItem(name, iconImage=iconimage, thumbnailImage=iconimage) - dir.setInfo( type="Music", infoLabels={ "title": name } ) + directory=xbmcgui.ListItem(name, iconImage=iconimage, thumbnailImage=iconimage) + directory.setInfo( type="Music", infoLabels={ "title": name } ) + directory.setProperty('fanart_image', self.fanImg) # Custom menu items menuItems = [] if mode == MODE_ALBUM: - mkplaylst=sys.argv[0]+"?mode="+str(MODE_MAKE_PLAYLIST)+"&name="+name+"&id="+str(id) + mkplaylst=sys.argv[0]+"?mode="+str(MODE_MAKE_PLAYLIST)+"&name="+name+"&id="+str(itemId) menuItems.append((__language__(30076), "XBMC.RunPlugin("+mkplaylst+")")) if mode == MODE_PLAYLIST: - rmplaylst=sys.argv[0]+"?mode="+str(MODE_REMOVE_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id) + rmplaylst=sys.argv[0]+"?mode="+str(MODE_REMOVE_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(itemId) menuItems.append((__language__(30077), "XBMC.RunPlugin("+rmplaylst+")")) - mvplaylst=sys.argv[0]+"?mode="+str(MODE_RENAME_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id) + mvplaylst=sys.argv[0]+"?mode="+str(MODE_RENAME_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(itemId) menuItems.append((__language__(30078), "XBMC.RunPlugin("+mvplaylst+")")) - dir.addContextMenuItems(menuItems, replaceItems=False) + directory.addContextMenuItems(menuItems, replaceItems=False) - return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True, totalItems=items) + return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=directory,isFolder=True, totalItems=items) def _getSavedSongs(self): path = os.path.join(cacheDir, 'songs.dmp') @@ -901,57 +921,98 @@ class Grooveshark: xbmc.log("An error occurred saving songs") pass - def _getSongDuration(self, songid): - id = int(songid) - duration = -1 - durations = [] - path = os.path.join(cacheDir, 'durations.dmp') + # Duration to seconds + def _setDuration(self, usecs): + if usecs < 60000000: + usecs = usecs * 10 # Some durations are 10x to small + return int(usecs / 1000000) + + def _getSongStream(self, songid): + idSong = int(songid) + stream = None + streams = [] + path = os.path.join(cacheDir, 'streams.dmp') try: f = open(path, 'rb') - durations = pickle.load(f) - for song in durations: - if song[0] == id: + streams = pickle.load(f) + for song in streams: + if song[0] == idSong: duration = song[1] + url = song[2] + key = song[3] + server = song[4] + stream = [idSong, duration, url, key, server] + if __debugging__ : + xbmc.log("Found " + str(idSong) + " in stream cache") break; f.close() except: pass - # Not in cache but exists - if duration < 0 and groovesharkApi.getDoesSongExist(songid): + # Not in cache + if stream == None: stream = groovesharkApi.getSubscriberStreamKey(songid) - usecs = stream['uSecs'] - - duration = self._setDuration(usecs) - song = [id, duration] - durations.append(song) - self._setSongDuration(durations) + if stream != False and stream['url'] != '': + duration = self._setDuration(stream['uSecs']) + url = stream['url'] + key = stream['StreamKey'] + server = stream['StreamServerID'] + stream = [idSong, duration, url, key, server] + self._addSongStream(stream) - return duration + return stream - def _setSongDuration(self, durations): + def _addSongStream(self, stream): + streams = self._getStreams() + streams.append(stream) + path = os.path.join(cacheDir, 'streams.dmp') try: - # Create the cache directory if it doesn't exist. - if not os.path.exists(cacheDir): - os.makedirs(cacheDir) - path = os.path.join(cacheDir, 'durations.dmp') f = open(path, 'wb') - pickle.dump(durations, f, protocol=pickle.HIGHEST_PROTOCOL) + pickle.dump(streams, f, protocol=pickle.HIGHEST_PROTOCOL) f.close() + if __debugging__ : + xbmc.log("Added " + str(stream[0]) + " to stream cache") except: - xbmc.log("An error occurred saving duration") + xbmc.log("An error occurred adding to stream") + + def _setSongStream(self, stream): + idStream = int(stream[0]) + stream[1] = self._setDuration(stream[1]) + streams = self._getStreams() + path = os.path.join(cacheDir, 'streams.dmp') + i = 0 + + for song in streams: + if song[0] == idStream: + streams[i] = stream + try: + f = open(path, 'wb') + pickle.dump(streams, f, protocol=pickle.HIGHEST_PROTOCOL) + f.close() + if __debugging__ : + xbmc.log("Updated " + str(idStream) + " in stream cache") + break; + except: + xbmc.log("An error occurred setting stream") + i = i + 1 + + def _getStreams(self): + path = os.path.join(cacheDir, 'streams.dmp') + try: + f = open(path, 'rb') + streams = pickle.load(f) + f.close() + except: + streams = [] pass + return streams - def _setDuration(self, usecs): - if usecs < 60000000: - usecs = usecs * 10 # Some durations are 10x to small - return usecs / 1000000 # Parse URL parameters def get_params(): param=[] paramstring=sys.argv[2] - if __debuggui__ == True: + if __debugging__ : xbmc.log(paramstring) if len(paramstring)>=2: params=sys.argv[2] @@ -974,8 +1035,8 @@ params=get_params() mode=None try: mode=int(params["mode"]) except: pass -id=0 -try: id=int(params["id"]) +itemId=0 +try: itemId=int(params["id"]) except: pass name = None try: name=urllib.unquote_plus(params["name"]) @@ -1017,7 +1078,7 @@ elif mode==MODE_SONG_PAGE: except: pass try: label=urllib.unquote_plus(params["label"]) except: pass - grooveshark.songPage(offset, label, id, name) + grooveshark.songPage(offset, label, itemId, name) elif mode==MODE_SONG: try: album=urllib.unquote_plus(params["album"]) @@ -1026,46 +1087,46 @@ elif mode==MODE_SONG: except: pass try: coverart=urllib.unquote_plus(params["coverart"]) except: pass - song = grooveshark.songItem(id, name, album, artist, coverart) + song = grooveshark.songItem(itemId, name, album, artist, coverart) grooveshark.playSong(song) elif mode==MODE_ARTIST: - grooveshark.artist(id) + grooveshark.artist(itemId) elif mode==MODE_ALBUM: - grooveshark.album(id) + grooveshark.album(itemId) elif mode==MODE_PLAYLIST: - grooveshark.playlist(id, name) + grooveshark.playlist(itemId, name) elif mode==MODE_FAVORITE: - grooveshark.favorite(id) + grooveshark.favorite(itemId) elif mode==MODE_UNFAVORITE: try: prevMode=int(urllib.unquote_plus(params["prevmode"])) except: prevMode = 0 - grooveshark.unfavorite(id, prevMode) + grooveshark.unfavorite(itemId, prevMode) elif mode==MODE_SIMILAR_ARTISTS: - grooveshark.similarArtists(id) + grooveshark.similarArtists(itemId) elif mode==MODE_MAKE_PLAYLIST: - grooveshark.makePlaylist(id, name) + grooveshark.makePlaylist(itemId, name) elif mode==MODE_REMOVE_PLAYLIST: - grooveshark.removePlaylist(id, name) + grooveshark.removePlaylist(itemId, name) elif mode==MODE_RENAME_PLAYLIST: - grooveshark.renamePlaylist(id, name) + grooveshark.renamePlaylist(itemId, name) elif mode==MODE_REMOVE_PLAYLIST_SONG: try: playlistID=urllib.unquote_plus(params["playlistid"]) except: pass - grooveshark.removePlaylistSong(playlistID, name, id) + grooveshark.removePlaylistSong(playlistID, name, itemId) elif mode==MODE_ADD_PLAYLIST_SONG: - grooveshark.addPlaylistSong(id) + grooveshark.addPlaylistSong(itemId) if mode < MODE_SONG: xbmcplugin.endOfDirectory(int(sys.argv[1]))