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)
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)
+ stream = self._getSongStream(songid)
if stream != False:
- url = stream['url']
- key = stream['StreamKey']
- server = stream['StreamServerID']
- duration = self._setDuration(stream['uSecs'])
+ 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
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))
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:
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
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]
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):
+ id = 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] == id:
+ duration = song[1]
+ url = song[2]
+ key = song[3]
+ server = song[4]
+ stream = [id, duration, url, key, server]
+ if __debugging__ :
+ xbmc.log("Found " + str(id) + " 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 = [id, 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):
+ id = 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] == id:
+ streams[i] = stream
+ try:
+ f = open(path, 'wb')
+ pickle.dump(streams, f, protocol=pickle.HIGHEST_PROTOCOL)
+ f.close()
+ if __debugging__ :
+ xbmc.log("Updated " + str(id) + " 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():
HCoop / clinton / xbmc-groove.git / blobdiff