X-Git-Url: https://git.hcoop.net/clinton/xbmc-groove.git/blobdiff_plain/a3ad8f73acc52ca3b1605660f1d15c42c2106b15..c52e3923fe2ee6f795c93d73d6f7aaba805ef9a7:/default.py diff --git a/default.py b/default.py index 5c98792..ff6d2bd 100644 --- a/default.py +++ b/default.py @@ -1,23 +1,26 @@ -import urllib, sys, os, shutil, re, xbmcaddon, xbmcplugin, xbmcgui, xbmc - +import urllib, sys, os, shutil, re, pickle, time, tempfile, xbmcaddon, xbmcplugin, xbmcgui, xbmc MODE_SEARCH_SONGS = 1 MODE_SEARCH_ALBUMS = 2 MODE_SEARCH_ARTISTS = 3 -MODE_POPULAR_SONGS = 4 -MODE_FAVORITES = 5 -MODE_PLAYLISTS = 6 -MODE_ALBUM = 7 -MODE_ARTIST = 8 -MODE_PLAYLIST = 9 -MODE_SIMILAR_ARTISTS = 10 -MODE_SONG = 11 -MODE_FAVORITE = 12 -MODE_UNFAVORITE = 13 -MODE_MAKE_PLAYLIST = 14 -MODE_REMOVE_PLAYLIST = 15 -MODE_RENAME_PLAYLIST = 16 -MODE_REMOVE_PLAYLIST_SONG = 17 -MODE_ADD_PLAYLIST_SONG = 18 +MODE_SEARCH_ARTISTS_ALBUMS = 4 +MODE_SEARCH_PLAYLISTS = 5 +MODE_ARTIST_POPULAR = 6 +MODE_POPULAR_SONGS = 7 +MODE_FAVORITES = 8 +MODE_PLAYLISTS = 9 +MODE_ALBUM = 10 +MODE_ARTIST = 11 +MODE_PLAYLIST = 12 +MODE_SONG_PAGE = 13 +MODE_SIMILAR_ARTISTS = 14 +MODE_SONG = 15 +MODE_FAVORITE = 16 +MODE_UNFAVORITE = 17 +MODE_MAKE_PLAYLIST = 18 +MODE_REMOVE_PLAYLIST = 19 +MODE_RENAME_PLAYLIST = 20 +MODE_REMOVE_PLAYLIST_SONG = 21 +MODE_ADD_PLAYLIST_SONG = 22 ACTION_MOVE_LEFT = 1 ACTION_MOVE_UP = 3 @@ -27,30 +30,66 @@ ACTION_PAGE_DOWN = 6 ACTION_SELECT_ITEM = 7 ACTION_PREVIOUS_MENU = 10 +# Formats for track labels +ARTIST_ALBUM_NAME_LABEL = 0 +NAME_ALBUM_ARTIST_LABEL = 1 + +# Stream marking time (seconds) +STREAM_MARKING_TIME = 30 + +songMarkTime = 0 +player = xbmc.Player() +playTimer = None + 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/addon_data/', os.path.join(os.path.basename(os.getcwd()), 'thumb')) +cacheDir = os.path.join(xbmc.translatePath('special://masterprofile/addon_data/'), os.path.basename(os.getcwd())) +thumbDirName = 'thumb' +thumbDir = os.path.join('special://masterprofile/addon_data/', os.path.basename(os.getcwd()), thumbDirName) baseModeUrl = 'plugin://plugin.audio.groove/' playlistUrl = baseModeUrl + '?mode=' + str(MODE_PLAYLIST) playlistsUrl = baseModeUrl + '?mode=' + str(MODE_PLAYLISTS) favoritesUrl = baseModeUrl + '?mode=' + str(MODE_FAVORITES) -thumbDef = os.path.join(os.path.basename(os.getcwd()), 'default.tbn') +searchArtistsAlbumsName = "Search for artist's albums..." + +thumbDef = os.path.join(imgDir, 'default.tbn') listBackground = os.path.join(imgDir, 'listbackground.png') sys.path.append (libDir) -from GrooveAPI import GrooveAPI +from GroovesharkAPI import GrooveAPI +from threading import Event, Thread + try: groovesharkApi = GrooveAPI() + if groovesharkApi.pingService() != True: + raise StandardError('No Grooveshark service') except: dialog = xbmcgui.Dialog() dialog.ok('Grooveshark XBMC', 'Unable to connect with Grooveshark.', 'Please try again later') sys.exit(-1) - +# Mark song as playing or played +def markSong(songid, duration): + global songMarkTime + global playTimer + global player + if player.isPlayingAudio(): + tNow = player.getTime() + if tNow >= STREAM_MARKING_TIME and songMarkTime == 0: + groovesharkApi.markStreamKeyOver30Secs() + songMarkTime = tNow + elif duration > tNow and duration - tNow < 2 and songMarkTime >= STREAM_MARKING_TIME: + playTimer.cancel() + songMarkTime = 0 + groovesharkApi.markSongComplete(songid) + else: + playTimer.cancel() + songMarkTime = 0 + class _Info: def __init__( self, *args, **kwargs ): self.__dict__.update( kwargs ) @@ -116,29 +155,77 @@ class GroovesharkPlaylistSelect(xbmcgui.WindowDialog): elif action == ACTION_MOVE_UP or action == ACTION_MOVE_DOWN or action == ACTION_PAGE_UP or action == ACTION_PAGE_DOWN == 6: self.setFocus(self.playlistControl) self.setHighlight() + + +class PlayTimer(Thread): + # interval -- floating point number specifying the number of seconds to wait before executing function + # function -- the function (or callable object) to be executed + + # iterations -- integer specifying the number of iterations to perform + # args -- list of positional arguments passed to function + # kwargs -- dictionary of keyword arguments passed to function + + def __init__(self, interval, function, iterations=0, args=[], kwargs={}): + Thread.__init__(self) + self.interval = interval + self.function = function + self.iterations = iterations + self.args = args + self.kwargs = kwargs + self.finished = Event() + + def run(self): + count = 0 + while not self.finished.isSet() and (self.iterations <= 0 or count < self.iterations): + self.finished.wait(self.interval) + if not self.finished.isSet(): + self.function(*self.args, **self.kwargs) + count += 1 + + def cancel(self): + self.finished.set() + + def setIterations(self, iterations): + self.iterations = iterations + + def getTime(self): + return self.iterations * self.interval + + class Groveshark: albumImg = xbmc.translatePath(os.path.join(imgDir, 'album.png')) artistImg = xbmc.translatePath(os.path.join(imgDir, 'artist.png')) + artistsAlbumsImg = xbmc.translatePath(os.path.join(imgDir, 'artistsalbums.png')) favoritesImg = xbmc.translatePath(os.path.join(imgDir, 'favorites.png')) playlistImg = xbmc.translatePath(os.path.join(imgDir, 'playlist.png')) + usersplaylistsImg = xbmc.translatePath(os.path.join(imgDir, 'usersplaylists.png')) popularSongsImg = xbmc.translatePath(os.path.join(imgDir, 'popularSongs.png')) + 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')) settings = xbmcaddon.Addon(id='plugin.audio.groove') - songsearchlimit = settings.getSetting('songsearchlimit') - albumsearchlimit = settings.getSetting('albumsearchlimit') - artistsearchlimit = settings.getSetting('artistsearchlimit') + songsearchlimit = int(settings.getSetting('songsearchlimit')) + albumsearchlimit = int(settings.getSetting('albumsearchlimit')) + artistsearchlimit = int(settings.getSetting('artistsearchlimit')) + songspagelimit = int(settings.getSetting('songspagelimit')) username = settings.getSetting('username') password = settings.getSetting('password') userid = 0 def __init__( self ): self._handle = int(sys.argv[1]) - + if os.path.isdir(cacheDir) == False: + os.makedirs(cacheDir) + xbmc.log("Made " + cacheDir) + artDir = xbmc.translatePath(thumbDir) + if os.path.isdir(artDir) == False: + os.makedirs(artDir) + xbmc.log("Made " + artDir) + # Top-level menu def categories(self): @@ -146,23 +233,24 @@ class Groveshark: # Setup 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 songs', '', MODE_POPULAR_SONGS, self.popularSongsImg, 0) + self._add_dir('Search for songs...', '', MODE_SEARCH_SONGS, self.songImg, 0) + self._add_dir('Search for albums...', '', MODE_SEARCH_ALBUMS, self.albumImg, 0) + self._add_dir('Search for artists...', '', MODE_SEARCH_ARTISTS, self.artistImg, 0) + self._add_dir(searchArtistsAlbumsName, '', MODE_SEARCH_ARTISTS_ALBUMS, self.artistsAlbumsImg, 0) + # Not supported by key + #self._add_dir("Search for user's playlists...", '', MODE_SEARCH_PLAYLISTS, self.usersplaylistsImg, 0) + self._add_dir('Popular Grooveshark songs for artist...', '', MODE_ARTIST_POPULAR, self.popularSongsArtistImg, 0) + self._add_dir('Popular Grooveshark songs', '', MODE_POPULAR_SONGS, self.popularSongsImg, 0) if (self.userid != 0): - self._add_dir('Favorites', '', MODE_FAVORITES, self.favoritesImg, 0) - self._add_dir('Playlists', '', MODE_PLAYLISTS, self.playlistImg, 0) + self._add_dir('My Grooveshark favorites', '', MODE_FAVORITES, self.favoritesImg, 0) + self._add_dir('My Grooveshark playlists', '', MODE_PLAYLISTS, self.playlistImg, 0) # Search for songs def searchSongs(self): - query = self._get_keyboard(default="", heading="Search songs") + query = self._get_keyboard(default="", heading='Search for songs powered by Grooveshark') if (query != ''): - groovesharkApi.setRemoveDuplicates(True) - songs = groovesharkApi.searchSongs(query, limit = self.songsearchlimit) + songs = groovesharkApi.getSongSearchResults(query, limit = self.songsearchlimit) if (len(songs) > 0): self._add_songs_directory(songs) else: @@ -174,9 +262,9 @@ class Groveshark: # Search for albums def searchAlbums(self): - query = self._get_keyboard(default="", heading="Search albums") + query = self._get_keyboard(default="", heading='Search for albums powered by Grooveshark') if (query != ''): - albums = groovesharkApi.searchAlbums(query, limit = self.albumsearchlimit) + albums = groovesharkApi.getAlbumSearchResults(query, limit = self.albumsearchlimit) if (len(albums) > 0): self._add_albums_directory(albums) else: @@ -188,9 +276,9 @@ class Groveshark: # Search for artists def searchArtists(self): - query = self._get_keyboard(default="", heading="Search artists") + query = self._get_keyboard(default="", heading='Search for artists powered by Grooveshark') if (query != ''): - artists = groovesharkApi.searchArtists(query, limit = self.artistsearchlimit) + artists = groovesharkApi.getArtistSearchResults(query, limit = self.artistsearchlimit) if (len(artists) > 0): self._add_artists_directory(artists) else: @@ -199,12 +287,52 @@ class Groveshark: self.categories() else: self.categories() - + + # Search for playlists + def searchPlaylists(self): + query = self._get_keyboard(default="", heading="Username") + if (query != ''): + playlists = groovesharkApi.getUserPlaylistsByUsername(query) + if (len(playlists) > 0): + self._add_playlists_directory(playlists) + else: + dialog = xbmcgui.Dialog() + dialog.ok('Grooveshark XBMC', 'No Grooveshark playlists found.') + self.categories() + else: + self.categories() + + # Search for artists albums + def searchArtistsAlbums(self, artistName = None): + if artistName == None or artistName == searchArtistsAlbumsName: + query = self._get_keyboard(default="", heading="Search for artist's albums powered by Grooveshark") + else: + query = artistName + if (query != ''): + artists = groovesharkApi.getArtistSearchResults(query, limit = self.artistsearchlimit) + if (len(artists) > 0): + artist = artists[0] + artistID = artist[1] + xbmc.log("Found " + artist[0] + "...") + albums = groovesharkApi.getArtistAlbums(artistID, limit = self.albumsearchlimit) + if (len(albums) > 0): + self._add_albums_directory(albums, artistID) + else: + dialog = xbmcgui.Dialog() + dialog.ok('Grooveshark XBMC', 'No matching albums.') + self.categories() + else: + dialog = xbmcgui.Dialog() + dialog.ok('Grooveshark XBMC', 'No matching artists.') + self.categories() + else: + self.categories() + # Get my favorites def favorites(self): userid = self._get_login() if (userid != 0): - favorites = groovesharkApi.userGetFavoriteSongs(userid) + favorites = groovesharkApi.getUserFavoriteSongs() if (len(favorites) > 0): self._add_songs_directory(favorites, isFavorites=True) else: @@ -214,7 +342,7 @@ class Groveshark: # Get popular songs def popularSongs(self): - popular = groovesharkApi.popularGetSongs(limit = self.songsearchlimit) + popular = groovesharkApi.getPopularSongsToday(limit = self.songsearchlimit) if (len(popular) > 0): self._add_songs_directory(popular) else: @@ -226,7 +354,7 @@ class Groveshark: def playlists(self): userid = self._get_login() if (userid != 0): - playlists = groovesharkApi.userGetPlaylists() + playlists = groovesharkApi.getUserPlaylists() if (len(playlists) > 0): self._add_playlists_directory(playlists) else: @@ -242,18 +370,18 @@ class Groveshark: userid = self._get_login() if (userid != 0): xbmc.log("Favorite song: " + str(songid)) - groovesharkApi.favoriteSong(songID = songid) + groovesharkApi.addUserFavoriteSong(songID = songid) xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Added to favorites, 1000, ' + thumbDef + ')') else: dialog = xbmcgui.Dialog() dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to add favorites.') - + # Remove song from favorites def unfavorite(self, songid, prevMode=0): userid = self._get_login() if (userid != 0): xbmc.log("Unfavorite song: " + str(songid) + ', previous mode was ' + str(prevMode)) - groovesharkApi.unfavoriteSong(songID = songid) + groovesharkApi.removeUserFavoriteSongs(songIDs = songid) xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Removed from Grooveshark favorites, 1000, ' + thumbDef + ')') # Refresh to remove item from directory if (int(prevMode) == MODE_FAVORITES): @@ -261,30 +389,105 @@ class Groveshark: else: dialog = xbmcgui.Dialog() dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to remove Grooveshark favorites.') + - # 'Frown' a song - def frown(self, songid): + # Show selected album + def album(self, albumid): + album = groovesharkApi.getAlbumSongs(albumid, limit = self.songsearchlimit) + self._add_songs_directory(album, trackLabelFormat=NAME_ALBUM_ARTIST_LABEL) + + # Show selected artist + def artist(self, artistid): + albums = groovesharkApi.getArtistAlbums(artistid, limit = self.albumsearchlimit) + self._add_albums_directory(albums, artistid) + + # Show selected playlist + def playlist(self, playlistid, playlistname): userid = self._get_login() if (userid != 0): - xbmc.log("Frown song: " + str(songid)) - if groovesharkApi.radioFrown(songId = songid) != True: - xbmc.log("Unable to frown song " + str(songid)) - else: - xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Frowned, 1000, ' + thumbDef + ')') + songs = groovesharkApi.getPlaylistSongs(playlistid) + self._add_songs_directory(songs, trackLabelFormat=NAME_ALBUM_ARTIST_LABEL, playlistid=playlistid, playlistname=playlistname) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to frown a Grooveshark song.') - - # Find similar artists to searched artist - def similarArtists(self, artistId): - similar = groovesharkApi.artistGetSimilar(artistId, limit = self.artistsearchlimit) - if (len(similar) > 0): - self._add_artists_directory(similar) + dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to get Grooveshark playlists.') + + # Show popular songs of the artist + def artistPopularSongs(self): + query = self._get_keyboard(default="", heading="Artist") + if (query != ''): + artists = groovesharkApi.getArtistSearchResults(query, limit = self.artistsearchlimit) + if (len(artists) > 0): + artist = artists[0] + artistID = artist[1] + xbmc.log("Found " + artist[0] + "...") + songs = groovesharkApi.getArtistPopularSongs(artistID, limit = self.songsearchlimit) + if (len(songs) > 0): + self._add_songs_directory(songs, trackLabelFormat=NAME_ALBUM_ARTIST_LABEL) + else: + dialog = xbmcgui.Dialog() + dialog.ok('Grooveshark XBMC', 'No popular songs.') + self.categories() + else: + dialog = xbmcgui.Dialog() + dialog.ok('Grooveshark XBMC', 'No matching artists.') + self.categories() else: - dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'No similar artists.') self.categories() + + # Play a song + def playSong(self, item): + global playTimer + global player + if item != None: + songid = item.getProperty('songid') + stream = groovesharkApi.getSubscriberStreamKey(songid) + url = stream['url'] + item.setPath(url) + xbmc.log("Grooveshark playing: " + url) + xbmcplugin.setResolvedUrl(handle=int(sys.argv[1]), succeeded=True, listitem=item) + # Wait for play then start time + seconds = 0 + while seconds < STREAM_MARKING_TIME: + try: + if player.isPlayingAudio() == True: + if playTimer != None: + playTimer.cancel() + songMarkTime = 0 + duration = int(item.getProperty('duration')) + playTimer = PlayTimer(1, markSong, duration, [songid, duration]) + playTimer.start() + break + except: pass + time.sleep(1) + seconds = seconds + 1 + else: + xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Unable to play song, 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)) + + return item + # Next page of songs + def songPage(self, page, trackLabelFormat, playlistid = 0, playlistname = ''): + self._add_songs_directory([], trackLabelFormat, page, playlistid = playlistid, playlistname = playlistname) + # Make a playlist from an album def makePlaylist(self, albumid, name): userid = self._get_login() @@ -293,12 +496,11 @@ class Groveshark: nameTokens = re.split(' - ',name,1) # suggested name name = self._get_keyboard(default=nameTokens[0], heading="Grooveshark playlist name") if name != '': - groovesharkApi.setRemoveDuplicates(True) - album = groovesharkApi.albumGetSongs(albumid, self.songsearchlimit) + album = groovesharkApi.getAlbumSongs(albumid, limit = self.songsearchlimit) songids = [] for song in album: songids.append(song[1]) - if groovesharkApi.playlistCreateUnique(name, songids) == 0: + if groovesharkApi.createPlaylist(name, songids) == 0: dialog = xbmcgui.Dialog() dialog.ok('Grooveshark XBMC', 'Cannot create Grooveshark playlist ', name) else: @@ -344,7 +546,7 @@ class Groveshark: def addPlaylistSong(self, songid): userid = self._get_login() if (userid != 0): - playlists = groovesharkApi.userGetPlaylists() + playlists = groovesharkApi.getUserPlaylists() if (len(playlists) > 0): ret = 0 # Select the playlist @@ -360,7 +562,7 @@ class Groveshark: if name != '': songIds = [] songIds.append(songid) - if groovesharkApi.playlistCreateUnique(name, songIds) == 0: + if groovesharkApi.createPlaylist(name, songIds) == 0: dialog = xbmcgui.Dialog() dialog.ok('Grooveshark XBMC', 'Cannot create Grooveshark playlist ', name) else: @@ -370,8 +572,13 @@ class Groveshark: playlist = playlists[i] playlistid = playlist[1] xbmc.log("Add song " + str(songid) + " to playlist " + str(playlistid)) - ret = groovesharkApi.playlistAddSong(playlistid, songid, 0) - if ret == 0: + songIDs=[] + songs = groovesharkApi.getPlaylistSongs(playlistid) + for song in songs: + songIDs.append(song[1]) + songIDs.append(songid) + ret = groovesharkApi.setPlaylistSongs(playlistid, songIDs) + if ret == False: dialog = xbmcgui.Dialog() dialog.ok('Grooveshark XBMC', 'Cannot add to playlist ') else: @@ -382,70 +589,41 @@ class Groveshark: self.categories() else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in ', ' to add a song to a Grooveshark playlist.') + dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to add a song to a Grooveshark playlist.') # Remove song from playlist - def removePlaylistSong(self, playlistid, playlistname, songpos): + def removePlaylistSong(self, playlistid, playlistname, songid): dialog = xbmcgui.Dialog() - if dialog.yesno('Grooveshark XBMC', 'Delete this song from the Grooveshark playlist?') == True: + if dialog.yesno('Grooveshark XBMC', 'Delete this song from', 'the Grooveshark playlist?') == True: userid = self._get_login() if (userid != 0): - if groovesharkApi.playlistDeleteSong(playlistid, songpos) == 0: + songs = groovesharkApi.getPlaylistSongs(playlistID) + songIDs=[] + for song in songs: + if (song[1] != songid): + songIDs.append(song[1]) + ret = groovesharkApi.setPlaylistSongs(playlistID, songIDs) + if ret == False: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'Failed to remove ', ' song from Grooveshark playlist.') + dialog.ok('Grooveshark XBMC', 'Failed to remove', 'song from Grooveshark playlist.') else: # Refresh to remove item from directory - xbmc.executebuiltin("Container.Refresh(" + playlistUrl + "&id="+str(playlistid) + "&name=" + playlistname + ")") + xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Removed song from Grooveshark playlist, 1000, ' + thumbDef + ')') + xbmc.executebuiltin("Container.Update(" + playlistUrl + "&id="+str(playlistid) + "&name=" + playlistname + ")") else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in ', ' to delete a song from a Grooveshark playlist.') - - # Show selected album - def album(self, albumid): - groovesharkApi.setRemoveDuplicates(True) - album = groovesharkApi.albumGetSongs(albumId = albumid, limit = self.songsearchlimit) - self._add_songs_directory(album) - - # Show selected artist - def artist(self, artistid): - albums = groovesharkApi.artistGetAlbums(artistId = artistid, limit = self.albumsearchlimit) - self._add_albums_directory(albums, artistid) - - # Show selected playlist - def playlist(self, playlistid, playlistname): - userid = self._get_login() - if (userid != 0): - songs = groovesharkApi.playlistGetSongs(playlistId = playlistid, limit = self.songsearchlimit) - self._add_songs_directory(songs, playlistid, playlistname) + dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to delete a song from a Grooveshark playlist.') + + # Find similar artists to searched artist + def similarArtists(self, artistId): + similar = groovesharkApi.getSimilarArtists(artistId, limit = self.artistsearchlimit) + if (len(similar) > 0): + self._add_artists_directory(similar) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to get Grooveshark playlists.') - - # Play a song - def playSong(self, item): - url = groovesharkApi.getStreamURL(item.getProperty('id')) - item.setPath(url) - xbmc.log("Playing: " + url) - xbmcplugin.setResolvedUrl(handle=int(sys.argv[1]), succeeded=True, listitem=item) - - # Make a song directory item - def songItem(self, id, name, album, artist, duration, thumb, image): - # Only try to get the image - if image != "": - songImg = self._get_icon(image, 'song-' + str(id) + "-image") - songThm = songImg - else: - songThm = self._get_icon(thumb, 'song-' + str(id) + "-thumb") - songImg = songThm - item = xbmcgui.ListItem(label = artist + " - " + album + " - " + name, 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('id', str(id)) - item.setProperty('thumb', songThm) - item.setProperty('image', songImg) - return item - + dialog.ok('Grooveshark XBMC', 'No similar artists.') + self.categories() + # Get keyboard input def _get_keyboard(self, default="", heading="", hidden=False): kb = xbmc.Keyboard(default, heading, hidden) @@ -462,7 +640,7 @@ class Groveshark: return 0 else: if self.userid == 0: - uid = groovesharkApi.loginExt(self.username, self.password) + uid = groovesharkApi.login(self.username, self.password) if (uid != 0): return uid else: @@ -471,50 +649,65 @@ class Groveshark: return 0 # Get a song directory item - def _get_song_item(self, song): + def _get_song_item(self, song, trackLabelFormat): 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) + 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, id): - localThumb = os.path.join(xbmc.translatePath(os.path.join(thumbDir, str(id)))) + '.tbn' - try: - if os.path.isfile(localThumb) == False: - xbmc.log('Downloading ' + url + ' to ' + localThumb) - loc = urllib.URLopener() - loc.retrieve(url, localThumb) - except: - shutil.copy2(self.defImg, localThumb) - - return os.path.join(os.path.join(thumbDir, str(id))) + '.tbn' + def _get_icon(self, url, songid): + if url != 'None': + localThumb = os.path.join(xbmc.translatePath(os.path.join(thumbDir, str(songid)))) + '.tbn' + try: + if os.path.isfile(localThumb) == False: + loc = urllib.URLopener() + loc.retrieve(url, localThumb) + except: + shutil.copy2(thumbDef, localThumb) + return os.path.join(os.path.join(thumbDir, str(songid))) + '.tbn' + else: + return thumbDef # Add songs to directory - def _add_songs_directory(self, songs, playlistid=0, playlistname='', isFavorites=False): - n = len(songs) - xbmc.log("Found " + str(n) + " songs...") - i = 0 - while i < n: - song = songs[i] - item = self._get_song_item(song) - songthumb = item.getProperty('thumb') - songimage = item.getProperty('image') + def _add_songs_directory(self, songs, trackLabelFormat=ARTIST_ALBUM_NAME_LABEL, page=0, playlistid=0, playlistname='', isFavorites=False): + + totalSongs = len(songs) + page = int(page) + + # No pages needed + if page == 0 and totalSongs <= self.songspagelimit: + xbmc.log("Found " + str(totalSongs) + " songs...") + # Pages + else: + # Cache all songs + if page == 0: + self._setSavedSongs(songs) + else: + songs = self._getSavedSongs() + totalSongs = len(songs) + + if totalSongs > 0: + start = page * self.songspagelimit + end = start + self.songspagelimit + songs = songs[start:end] + + id = 0 + for song in songs: + item = self._get_song_item(song, trackLabelFormat) + coverart = item.getProperty('coverart') songname = song[0] songid = song[1] - songduration = song[2] - songalbum = song[3] - songartist = song[6] + songalbum = song[2] + songartist = song[4] + + u=sys.argv[0]+"?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) + +"&coverart="+urllib.quote_plus(coverart) fav=sys.argv[0]+"?mode="+str(MODE_FAVORITE)+"&name="+urllib.quote_plus(songname)+"&id="+str(songid) unfav=sys.argv[0]+"?mode="+str(MODE_UNFAVORITE)+"&name="+urllib.quote_plus(songname)+"&id="+str(songid)+"&prevmode=" menuItems = [] @@ -524,14 +717,19 @@ class Groveshark: menuItems.append(("Grooveshark favorite", "XBMC.RunPlugin("+fav+")")) menuItems.append(("Not Grooveshark favorite", "XBMC.RunPlugin("+unfav+")")) if playlistid > 0: - rmplaylstsong=sys.argv[0]+"?playlistid="+str(playlistid)+"&id="+str(i+1)+"&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="+playlistname menuItems.append(("Remove from Grooveshark playlist", "XBMC.RunPlugin("+rmplaylstsong+")")) else: addplaylstsong=sys.argv[0]+"?id="+str(songid)+"&mode="+str(MODE_ADD_PLAYLIST_SONG) menuItems.append(("Add to Grooveshark playlist", "XBMC.RunPlugin("+addplaylstsong+")")) item.addContextMenuItems(menuItems, replaceItems=False) - xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False, totalItems=n) - i = i + 1 + xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False, totalItems=len(songs)) + id = id + 1 + + page = page + 1 + if totalSongs > page * self.songspagelimit: + u=sys.argv[0]+"?mode="+str(MODE_SONG_PAGE)+"&id=playlistid"+"&page="+str(page)+"&label="+str(trackLabelFormat)+"&name="+playlistname + self._add_dir('More songs...', u, MODE_SONG_PAGE, self.songImg, 0, totalSongs - (page * self.songspagelimit)) xbmcplugin.setContent(self._handle, 'songs') xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg) @@ -549,8 +747,9 @@ class Groveshark: albumImage = self._get_icon(album[4], 'album-' + str(albumID)) self._add_dir(albumName + " - " + albumArtistName, '', MODE_ALBUM, albumImage, albumID, n) i = i + 1 - if artistid > 0: - self._add_dir('Similar artists...', '', MODE_SIMILAR_ARTISTS, self.artistImg, artistid) + # Not supported by key + #if artistid > 0: + # self._add_dir('Similar artists...', '', MODE_SIMILAR_ARTISTS, self.artistImg, artistid) xbmcplugin.setContent(self._handle, 'albums') xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_ALBUM_IGNORE_THE) xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg) @@ -579,16 +778,19 @@ class Groveshark: playlist = playlists[i] playlistName = playlist[0] playlistID = playlist[1] - self._add_dir(playlistName, '', MODE_PLAYLIST, self.playlistImg, playlistID, n) + dir = 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_PLAYLIST_ORDER) + 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): - - u=sys.argv[0]+"?mode="+str(mode)+"&name="+urllib.quote_plus(name)+"&id="+str(id) + + if url == '': + u=sys.argv[0]+"?mode="+str(mode)+"&name="+urllib.quote_plus(name)+"&id="+str(id) + else: + u = url dir=xbmcgui.ListItem(name, iconImage=iconimage, thumbnailImage=iconimage) dir.setInfo( type="Music", infoLabels={ "title": name } ) @@ -597,16 +799,83 @@ class Groveshark: if mode == MODE_ALBUM: mkplaylst=sys.argv[0]+"?mode="+str(MODE_MAKE_PLAYLIST)+"&name="+name+"&id="+str(id) menuItems.append(("Make Grooveshark playlist", "XBMC.RunPlugin("+mkplaylst+")")) + # Broken rename/delete are broken in API if mode == MODE_PLAYLIST: rmplaylst=sys.argv[0]+"?mode="+str(MODE_REMOVE_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id) menuItems.append(("Delete Grooveshark playlist", "XBMC.RunPlugin("+rmplaylst+")")) mvplaylst=sys.argv[0]+"?mode="+str(MODE_RENAME_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id) menuItems.append(("Rename Grooveshark playlist", "XBMC.RunPlugin("+mvplaylst+")")) - dir.addContextMenuItems(menuItems, replaceItems=False) + return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True, totalItems=items) + + def _getSavedSongs(self): + path = os.path.join(cacheDir, 'songs.dmp') + try: + f = open(path, 'rb') + songs = pickle.load(f) + f.close() + except: + songs = [] + pass + return songs + + def _setSavedSongs(self, songs): + try: + # Create the 'data' directory if it doesn't exist. + if not os.path.exists(cacheDir): + os.makedirs(cacheDir) + path = os.path.join(cacheDir, 'songs.dmp') + f = open(path, 'wb') + pickle.dump(songs, f, protocol=pickle.HIGHEST_PROTOCOL) + f.close() + except: + xbmc.log("An error occurred saving songs") + pass + + def _getSongDuration(self, songid): + path = os.path.join(cacheDir, 'duration.dmp') + id = int(songid) + durations = [] + duration = -1 + + # Try cache first + try: + f = open(path, 'rb') + durations = pickle.load(f) + for song in durations: + if song[0] == id: + duration = song[1] + f.close() + except: + pass + + if duration < 0: + stream = groovesharkApi.getSubscriberStreamKey(songid) + usecs = stream['uSecs'] + if usecs < 60000000: + usecs = usecs * 10 # Some durations are 10x to small + duration = usecs / 1000000 + song = [id, duration] + durations.append(song) + self._setSongDuration(durations) + + return duration + def _setSongDuration(self, durations): + try: + # Create the 'data' directory if it doesn't exist. + if not os.path.exists(cacheDir): + os.makedirs(cacheDir) + path = os.path.join(cacheDir, 'duration.dmp') + f = open(path, 'wb') + pickle.dump(durations, f, protocol=pickle.HIGHEST_PROTOCOL) + f.close() + except: + xbmc.log("An error occurred saving durations") + pass + # Parse URL parameters def get_params(): param=[] @@ -633,14 +902,12 @@ params=get_params() mode=None try: mode=int(params["mode"]) except: pass - -if mode > MODE_FAVORITES: - name=None - id=None - try: name=urllib.unquote_plus(params["name"]) - except: pass - try: id=int(params["id"]) - except: pass +id=0 +try: id=int(params["id"]) +except: pass +name = None +try: name=urllib.unquote_plus(params["name"]) +except: pass # Call function for URL if mode==None: @@ -654,28 +921,40 @@ elif mode==MODE_SEARCH_ALBUMS: elif mode==MODE_SEARCH_ARTISTS: grooveshark.searchArtists() + +elif mode==MODE_SEARCH_ARTISTS_ALBUMS: + grooveshark.searchArtistsAlbums(name) + +elif mode==MODE_SEARCH_PLAYLISTS: + grooveshark.searchPlaylists() elif mode==MODE_POPULAR_SONGS: grooveshark.popularSongs() + +elif mode==MODE_ARTIST_POPULAR: + grooveshark.artistPopularSongs() elif mode==MODE_FAVORITES: grooveshark.favorites() elif mode==MODE_PLAYLISTS: grooveshark.playlists() + +elif mode==MODE_SONG_PAGE: + try: page=urllib.unquote_plus(params["page"]) + except: pass + try: label=urllib.unquote_plus(params["label"]) + except: pass + grooveshark.songPage(page, label, id, name) elif mode==MODE_SONG: try: album=urllib.unquote_plus(params["album"]) except: pass try: artist=urllib.unquote_plus(params["artist"]) except: pass - try: duration=int(params["duration"]) - except: pass - try: thumb=urllib.unquote_plus(params["thumb"]) + try: coverart=urllib.unquote_plus(params["coverart"]) except: pass - try: image=urllib.unquote_plus(params["image"]) - except: pass - song = grooveshark.songItem(id, name, album, artist, duration, thumb, image) + song = grooveshark.songItem(id, name, album, artist, coverart) grooveshark.playSong(song) elif mode==MODE_ARTIST: @@ -689,7 +968,7 @@ elif mode==MODE_PLAYLIST: elif mode==MODE_FAVORITE: grooveshark.favorite(id) - + elif mode==MODE_UNFAVORITE: try: prevMode=int(urllib.unquote_plus(params["prevmode"])) except: @@ -714,7 +993,7 @@ elif mode==MODE_REMOVE_PLAYLIST_SONG: grooveshark.removePlaylistSong(playlistID, name, id) elif mode==MODE_ADD_PLAYLIST_SONG: - grooveshark.addPlaylistSong(id) - + grooveshark.addPlaylistSong(id) + if mode < MODE_SONG: xbmcplugin.endOfDirectory(int(sys.argv[1]))