__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
# Timeout
STREAM_TIMEOUT = 30
-# Retry URL
-STREAM_RETRY = 15
-
songMarkTime = 0
player = xbmc.Player()
playTimer = None
imgDir = xbmc.translatePath(os.path.join(resDir, 'img'))
cacheDir = os.path.join(xbmc.translatePath('special://masterprofile/addon_data/'), os.path.basename(baseDir))
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)
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__)
if groovesharkApi.pingService() != True:
raise StandardError(__language__(30007))
except:
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'))
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
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:
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 + ')')
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 + ')')
# 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):
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):
def playSong(self, item):
global playTimer
global player
+ player.stop()
if item != None:
- songid = item.getProperty('songid')
- duration = self._getSongDuration(songid)
url = ''
+ songid = item.getProperty('songid')
+ duration = int(self._getSongDuration(songid))
stream = groovesharkApi.getSubscriberStreamKey(songid)
if stream != False:
url = stream['url']
+ key = stream['StreamKey']
+ server = stream['StreamServerID']
+ duration = self._setDuration(stream['uSecs'])
if url != '':
item.setPath(url)
xbmcplugin.setResolvedUrl(handle=int(sys.argv[1]), succeeded=True, listitem=item)
- if __debuggui__ == True:
+ if __debugging__ :
xbmc.log("Grooveshark playing: " + url)
# Wait for play then start timer
seconds = 0
if playTimer != None:
playTimer.cancel()
songMarkTime = 0
- playTimer = PlayTimer(1, markSong, duration, [songid, duration, stream['streamKey'], stream['streamServerID']])
+ playTimer = PlayTimer(1, markSong, duration, [songid, duration, key, server])
playTimer.start()
break
except: pass
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)
# No pages needed
if offset == 0 and totalSongs <= self.songspagelimit:
- if __debuggui__ == True:
+ if __debugging__ :
xbmc.log("Found " + str(totalSongs) + " songs...")
# Pages
else:
id = id + 1
else:
end = min(end + 1,totalSongs)
- if __debuggui__ == True:
+ if __debugging__ :
xbmc.log(song[0] + " does not exist.")
n = n + 1
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))
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:
# 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:
id = int(songid)
duration = -1
durations = []
- path = os.path.join(cacheDir, 'durations.dmp')
+ path = os.path.join(cacheDir, 'duration.dmp')
try:
f = open(path, 'rb')
durations = pickle.load(f)
except:
pass
- # Not in cache but exists
- if duration < 0 and groovesharkApi.getDoesSongExist(songid):
+ # Not in cache
+ if duration < 0:
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'])
+ song = [id, duration]
+ self._setSongDuration(song, durations)
return duration
- def _setSongDuration(self, durations):
+ def _setSongDuration(self, song, durations):
try:
+ durations.append(song)
# 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')
+ path = os.path.join(cacheDir, 'duration.dmp')
f = open(path, 'wb')
pickle.dump(durations, f, protocol=pickle.HIGHEST_PROTOCOL)
f.close()
xbmc.log("An error occurred saving duration")
pass
+ # Duration to seconds
def _setDuration(self, usecs):
if usecs < 60000000:
usecs = usecs * 10 # Some durations are 10x to small
def get_params():
param=[]
paramstring=sys.argv[2]
- if __debuggui__ == True:
+ if __debugging__ :
xbmc.log(paramstring)
if len(paramstring)>=2:
params=sys.argv[2]
HCoop / clinton / xbmc-groove.git / blobdiff