X-Git-Url: http://git.hcoop.net/clinton/xbmc-groove.git/blobdiff_plain/f7eadea20b484447c752f649c9b0a269ec63f670..4d482bba2a6fd40adff24b8f28654303360e822e:/default.py diff --git a/default.py b/default.py index 73d6629..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') @@ -76,6 +76,7 @@ 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(xbmc.translatePath('special://masterprofile/addon_data/'), os.path.basename(baseDir), thumbDirName) @@ -99,10 +100,14 @@ else: __debugging__ = False try: - groovesharkApi = GrooveAPI(__debugging__) + 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(__language__(30008),__language__(30009)) sys.exit(-1) @@ -144,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 @@ -480,9 +486,9 @@ class Grooveshark: def playSong(self, item): global playTimer global player - player.stop() if item != None: # Get stream as it could have expired + item.select(True) url = '' songid = item.getProperty('songid') stream = groovesharkApi.getSubscriberStreamKey(songid) @@ -491,40 +497,43 @@ class Grooveshark: key = stream['StreamKey'] server = stream['StreamServerID'] duration = int(self._setDuration(stream['uSecs'])) - 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 - xbmcplugin.setResolvedUrl(handle=int(sys.argv[1]), succeeded=True, listitem=item) - 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, key, server]) - playTimer.start() - break - except: pass - time.sleep(1) - seconds = seconds + 1 + 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): + def songItem(self, songid, name, album, artist, coverart, trackLabelFormat=ARTIST_ALBUM_NAME_LABEL, tracknumber=1): - stream = groovesharkApi.getSubscriberStreamKey(songid) - if stream != False: - url = stream['url'] - key = stream['StreamKey'] - server = stream['StreamServerID'] - duration = self._setDuration(stream['uSecs']) + 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 @@ -532,7 +541,7 @@ class Grooveshark: 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} ) + 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)) @@ -543,9 +552,10 @@ class Grooveshark: 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 song URL") + xbmc.log("No access to song URL") return None # Next page of songs @@ -674,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)) @@ -701,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: @@ -710,7 +720,7 @@ 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 # File download @@ -752,7 +762,6 @@ class Grooveshark: start = offset end = min(start + self.songspagelimit,totalSongs) - id = 0 n = start items = end - start while n < end: @@ -762,7 +771,7 @@ class Grooveshark: album = song[2] artist = song[4] coverart = song[6] - item = self.songItem(songid, name, album, artist, coverart, trackLabelFormat) + item = self.songItem(songid, name, album, artist, coverart, trackLabelFormat, (n+1)) if item != None: coverart = item.getProperty('coverart') songname = song[0] @@ -781,14 +790,13 @@ 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 __debugging__ : @@ -796,7 +804,7 @@ class Grooveshark: 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') @@ -857,36 +865,37 @@ class Grooveshark: 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') @@ -916,7 +925,88 @@ class Grooveshark: def _setDuration(self, usecs): if usecs < 60000000: usecs = usecs * 10 # Some durations are 10x to small - return usecs / 1000000 + 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') + 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 + if stream == None: + stream = groovesharkApi.getSubscriberStreamKey(songid) + 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 stream + + def _addSongStream(self, stream): + streams = self._getStreams() + streams.append(stream) + path = os.path.join(cacheDir, 'streams.dmp') + try: + f = open(path, 'wb') + 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 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 + # Parse URL parameters def get_params(): @@ -945,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"]) @@ -988,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"]) @@ -997,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]))