X-Git-Url: http://git.hcoop.net/clinton/xbmc-groove.git/blobdiff_plain/3a79469346bc8577703728eecf0f10897717117f..99f72740161d15018a0784933ef0276d2c10c2a8:/default.py diff --git a/default.py b/default.py index 4d51d47..a4609db 100644 --- a/default.py +++ b/default.py @@ -1,15 +1,19 @@ -import urllib, sys, os, shutil, re, time, xbmcaddon, xbmcplugin, xbmcgui, xbmc +import urllib, sys, os, shutil, re, time, xbmcaddon, xbmcplugin, xbmcgui, xbmc, pickle 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_SONG = 11 -MODE_FAVORITE = 12 +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_SONG = 14 +MODE_FAVORITE = 15 ACTION_MOVE_LEFT = 1 ACTION_MOVE_UP = 3 @@ -19,6 +23,10 @@ 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 + baseDir = os.getcwd() resDir = xbmc.translatePath(os.path.join(baseDir, 'resources')) libDir = xbmc.translatePath(os.path.join(resDir, 'lib')) @@ -56,9 +64,12 @@ 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')) @@ -67,6 +78,7 @@ class Groveshark: 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 @@ -76,8 +88,8 @@ class Groveshark: if os.path.isdir(cacheDir) == False: os.makedirs(cacheDir) xbmc.log("Made " + cacheDir) - if os.path.isdir(thumbDir) == False: - artDir = xbmc.translatePath(thumbDir) + artDir = xbmc.translatePath(thumbDir) + if os.path.isdir(artDir) == False: os.makedirs(artDir) xbmc.log("Made " + artDir) @@ -89,17 +101,20 @@ class Groveshark: # Setup xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg) - 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('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("Search for artist's albums...", '', MODE_SEARCH_ARTISTS_ALBUMS, self.artistsAlbumsImg, 0) + self._add_dir("Search for user's playlists...", '', MODE_SEARCH_PLAYLISTS, self.usersplaylistsImg, 0) + self._add_dir('Popular songs for artist...', '', MODE_ARTIST_POPULAR, self.popularSongsArtistImg, 0) self._add_dir('Popular 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 favorites', '', MODE_FAVORITES, self.favoritesImg, 0) + self._add_dir('My 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") if (query != ''): songs = groovesharkApi.getSongSearchResults(query, limit = self.songsearchlimit) if (len(songs) > 0): @@ -113,7 +128,7 @@ 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") if (query != ''): albums = groovesharkApi.getAlbumSearchResults(query, limit = self.albumsearchlimit) if (len(albums) > 0): @@ -127,7 +142,7 @@ 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") if (query != ''): artists = groovesharkApi.getArtistSearchResults(query, limit = self.artistsearchlimit) if (len(artists) > 0): @@ -138,7 +153,47 @@ class Groveshark: self.categories() else: self.categories() - + + # Search for playlists + def searchPlaylists(self): + query = self._get_keyboard(default="", heading="Username") + if (query != ''): + playlists = groovesharkApi.getUserPlaylistsEx(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 = ""): + if artistName == "": + query = self._get_keyboard(default="", heading="Search for artist's albums") + 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) + 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() @@ -190,7 +245,7 @@ class Groveshark: # Show selected album def album(self, albumid): album = groovesharkApi.getAlbumSongs(albumid, limit = self.songsearchlimit) - self._add_songs_directory(album) + self._add_songs_directory(album, trackLabelFormat=NAME_ALBUM_ARTIST_LABEL) # Show selected artist def artist(self, artistid): @@ -202,11 +257,34 @@ class Groveshark: userid = self._get_login() if (userid != 0): songs = groovesharkApi.getPlaylistSongs(playlistid) - self._add_songs_directory(songs) + self._add_songs_directory(songs, trackLabelFormat=NAME_ALBUM_ARTIST_LABEL) else: dialog = xbmcgui.Dialog() 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: + self.categories() + # Play a song def playSong(self, item): songid = item.getProperty('songid') @@ -219,9 +297,13 @@ class Groveshark: 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): + def songItem(self, songid, name, album, artist, coverart, trackLabelFormat=ARTIST_ALBUM_NAME_LABEL): songImg = self._get_icon(coverart, 'song-' + str(songid) + "-image") - item = xbmcgui.ListItem(label = artist + " - " + album + " - " + name, thumbnailImage=songImg, iconImage=songImg) + if trackLabelFormat == NAME_ALBUM_ARTIST_LABEL: + trackLabel = name + " - " + album + " - " + artist + else: + trackLabel = artist + " - " + album + " - " + name + item = xbmcgui.ListItem(label = trackLabel, thumbnailImage=songImg, iconImage=songImg) item.setInfo( type="music", infoLabels={ "title": name, "album": album, "artist": artist} ) item.setProperty('mimetype', 'audio/mpeg') item.setProperty("IsPlayable", "true") @@ -233,6 +315,10 @@ class Groveshark: return item + # Next page of songs + def songPage(self, page, trackLabelFormat): + self._add_songs_directory([], trackLabelFormat, page) + # Get keyboard input def _get_keyboard(self, default="", heading="", hidden=False): kb = xbmc.Keyboard(default, heading, hidden) @@ -258,13 +344,13 @@ 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] songid = song[1] album = song[2] artist = song[4] coverart = song[6] - return self.songItem(songid, name, album, artist, coverart) + return self.songItem(songid, name, album, artist, coverart, trackLabelFormat) # File download def _get_icon(self, url, songid): @@ -281,13 +367,30 @@ class Groveshark: return thumbDef # Add songs to directory - def _add_songs_directory(self, songs): - n = len(songs) - xbmc.log("Found " + str(n) + " songs...") - i = 0 - while i < n: - song = songs[i] - item = self._get_song_item(song) + def _add_songs_directory(self, songs, trackLabelFormat=ARTIST_ALBUM_NAME_LABEL, page=0): + + 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] + + for song in songs: + item = self._get_song_item(song, trackLabelFormat) coverart = item.getProperty('coverart') songname = song[0] songid = song[1] @@ -301,8 +404,12 @@ class Groveshark: menuItems = [] menuItems.append(("Grooveshark favorite", "XBMC.RunPlugin("+fav+")")) 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)) + + page = page + 1 + if totalSongs > page * self.songspagelimit: + u=sys.argv[0]+"?mode="+str(MODE_SONG_PAGE)+"&id=0"+"&page="+str(page)+"&label="+str(trackLabelFormat) + 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) @@ -348,19 +455,46 @@ 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 } ) 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 + # Parse URL parameters @@ -405,15 +539,35 @@ elif mode==MODE_SEARCH_ALBUMS: elif mode==MODE_SEARCH_ARTISTS: grooveshark.searchArtists() + +elif mode==MODE_SEARCH_ARTISTS_ALBUMS: + grooveshark.searchArtistsAlbums() + +elif mode==MODE_SEARCH_PLAYLISTS: + grooveshark.searchPlaylists() elif mode==MODE_POPULAR_SONGS: grooveshark.popularSongs() + +elif mode==MODE_ARTIST_POPULAR: + try: name=urllib.unquote_plus(params["name"]) + except: + name = "" + pass + grooveshark.artistPopularSongs(name) 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) elif mode==MODE_SONG: try: name=urllib.unquote_plus(params["name"]) @@ -438,6 +592,6 @@ elif mode==MODE_PLAYLIST: elif mode==MODE_FAVORITE: grooveshark.favorite(id) - + if mode < MODE_SONG: xbmcplugin.endOfDirectory(int(sys.argv[1]))