X-Git-Url: https://git.hcoop.net/clinton/xbmc-groove.git/blobdiff_plain/e6ccfeca53fe3df107378e3c7747a351049c7806..36cc00d74fe199a00a95a2940a5989b48a33930f:/default.py?ds=sidebyside diff --git a/default.py b/default.py index cf909a9..6688267 100644 --- a/default.py +++ b/default.py @@ -3,18 +3,19 @@ import urllib, urllib2, re, xbmcplugin, xbmcgui, xbmc, sys, os, time, pprint, sh MODE_SEARCH_SONGS = 1 MODE_SEARCH_ALBUMS = 2 MODE_SEARCH_ARTISTS = 3 -MODE_POPULAR = 4 +MODE_POPULAR_SONGS = 4 MODE_FAVORITES = 5 MODE_PLAYLISTS = 6 MODE_ALBUM = 7 MODE_ARTIST = 8 MODE_PLAYLIST = 9 -MODE_SONG = 10 -MODE_FAVORITE = 11 -MODE_UNFAVORITE = 12 -MODE_SIMILAR_SONG = 13 -MODE_SIMILAR_ARTIST = 14 -MODE_FROWN = 15 +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 lastID = 0 @@ -23,7 +24,6 @@ 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')) -favoritesCache = xbmc.translatePath(os.path.join('special://masterprofile/addon_data/', os.path.join(os.path.basename(os.getcwd()), 'favorites.dmp'))) sys.path.append (libDir) from GrooveAPI import * @@ -39,7 +39,7 @@ class Groveshark: artistImg = xbmc.translatePath(os.path.join(imgDir, 'artist.png')) favoritesImg = xbmc.translatePath(os.path.join(imgDir, 'favorites.png')) playlistImg = xbmc.translatePath(os.path.join(imgDir, 'playlist.png')) - popularImg = xbmc.translatePath(os.path.join(imgDir, 'popular.png')) + popularSongsImg = xbmc.translatePath(os.path.join(imgDir, 'popularSongs.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')) @@ -69,7 +69,7 @@ class Groveshark: 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', '', MODE_POPULAR, self.popularImg, 0) + self._add_dir('Popular songs', '', MODE_POPULAR_SONGS, self.popularSongsImg, 0) if (userid != 0): self._add_dir('Favorites', '', MODE_FAVORITES, self.favoritesImg, 0) self._add_dir('Playlists', '', MODE_PLAYLISTS, self.playlistImg, 0) @@ -108,15 +108,17 @@ class Groveshark: self.categories() def favorites(self): - favorites = self._get_favorites() - if (len(favorites) > 0): - self._add_songs_directory(favorites) - else: - dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark', 'You have no favorites.') - self.categories() + userid = self._get_login() + if (userid != 0): + favorites = groovesharkApi.userGetFavoriteSongs(userid) + if (len(favorites) > 0): + self._add_songs_directory(favorites) + else: + dialog = xbmcgui.Dialog() + dialog.ok('Grooveshark', 'You have no favorites.') + self.categories() - def popular(self): + def popularSongs(self): popular = groovesharkApi.popularGetSongs(limit = self.songsearchlimit) if (len(popular) > 0): self._add_songs_directory(popular) @@ -124,6 +126,24 @@ class Groveshark: dialog = xbmcgui.Dialog() dialog.ok('Grooveshark', 'No popular songs.') self.categories() + + def popularAlbums(self): + popular = groovesharkApi.popularGetAlbums(limit = self.albumsearchlimit) + if (len(popular) > 0): + self._add_albums_directory(popular) + else: + dialog = xbmcgui.Dialog() + dialog.ok('Grooveshark', 'No popular albums.') + self.categories() + + def popularArtists(self): + popular = groovesharkApi.popularGetArtists(limit = self.artistsearchlimit) + if (len(popular) > 0): + self._add_artists_directory(popular) + else: + dialog = xbmcgui.Dialog() + dialog.ok('Grooveshark', 'No popular artists.') + self.categories() def playlists(self): userid = self._get_login() @@ -139,9 +159,8 @@ class Groveshark: def favorite(self, songid): userid = self._get_login() if (userid != 0): - xbmc.log("Favorite playSong: " + str(songid)) + xbmc.log("Favorite song: " + str(songid)) groovesharkApi.favoriteSong(songID = songid) - os.remove(favoritesCache) else: dialog = xbmcgui.Dialog() dialog.ok('Grooveshark', 'You must be logged in', 'to add favorites.') @@ -149,9 +168,8 @@ class Groveshark: def unfavorite(self, songid): userid = self._get_login() if (userid != 0): - xbmc.log("Unfavorite playSong: " + str(songid)) + xbmc.log("Unfavorite song: " + str(songid)) groovesharkApi.unfavoriteSong(songID = songid) - os.remove(favoritesCache) else: dialog = xbmcgui.Dialog() dialog.ok('Grooveshark', 'You must be logged in', 'to remove favorites.') @@ -159,46 +177,71 @@ class Groveshark: def frown(self, songid): userid = self._get_login() if (userid != 0): - xbmc.log("Frown playSong: " + str(songid)) + xbmc.log("Frown song: " + str(songid)) if groovesharkApi.radioFrown(songId = songid) != True: xbmc.log("Unable to frown song " + str(songid)) else: dialog = xbmcgui.Dialog() dialog.ok('Grooveshark', 'You must be logged in', 'to frown a song.') - def similarSong(self, songid): + def similarArtists(self, artistId): + similar = groovesharkApi.artistGetSimilar(artistId, limit = self.artistsearchlimit) + if (len(similar) > 0): + self._add_artists_directory(similar) + else: + dialog = xbmcgui.Dialog() + dialog.ok('Grooveshark', 'No similar artists.') + self.categories() + + def makePlaylist(self, albumid, name): userid = self._get_login() if (userid != 0): - xbmc.log("Add song: " + str(songid)) - if groovesharkApi.radioSong(songId = songid) != False and groovesharkApi.radioStartSongs() == True: - self.playNext() - else: + name_re = re.compile(r'[- ]') + nameTokens = name_re.split("- ") + name = self._get_keyboard(default=nameTokens[1], heading="Playlist name") + album = groovesharkApi.albumGetSongs(albumid, self.songsearchlimit) + songids = [] + for song in album: + songids.append(song[1]) + id = groovesharkApi.playlistCreateUnique(name, songids) + if id == 0: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark', 'Cannot start radio') + dialog.ok('Grooveshark', 'Cannot create playlist ', name) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark', 'You must be logged in', 'to update radio song.') + dialog.ok('Grooveshark', 'You must be logged in ', ' to create a playlist.') + + def removePlaylist(self, playlistid, name): + dialog = xbmcgui.Dialog() + if dialog.yesno('Grooveshark', name, 'Delete this playlist?') == True: + userid = self._get_login() + if (userid != 0): + groovesharkApi.playlistDelete(playlistid) + xbmc.executebuiltin("Container.Refresh") + else: + dialog = xbmcgui.Dialog() + dialog.ok('Grooveshark', 'You must be logged in ', ' to delete a playlist.') - def similarArtist(self, artistId): + def renamePlaylist(self, playlistid, name): userid = self._get_login() if (userid != 0): - xbmc.log("Add radio artist: " + str(artistId)) - if groovesharkApi.radioArtist(artistId = artistId) != False and groovesharkApi.radioStartArtists() == True: - self.playNext() - else: + newname = self._get_keyboard(default=name, heading="Playlist name") + if groovesharkApi.playlistRename(playlistid, newname) == 0: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark', 'Cannot start radio') + dialog.ok('Grooveshark', 'Cannot rename playlist ', name) + else: + xbmc.executebuiltin("Container.Refresh") else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark', 'You must be logged in', 'to update radio artists.') + dialog.ok('Grooveshark', 'You must be logged in ', ' to rename a playlist.') - def album(self,albumid): + def album(self, albumid): album = groovesharkApi.albumGetSongs(albumId = albumid, limit = self.songsearchlimit) self._add_songs_directory(album) def artist(self, artistid): albums = groovesharkApi.artistGetAlbums(artistId = artistid, limit = self.albumsearchlimit) - self._add_albums_directory(albums) + self._add_albums_directory(albums, artistid) def playlist(self, playlistid): userid = self._get_login() @@ -214,10 +257,6 @@ class Groveshark: xbmc.log("Playing: " + url) xbmcplugin.setResolvedUrl(handle=int(sys.argv[1]), succeeded=True, listitem=item) - def playNext(self): - item = self._get_song_item(groovesharkApi.radioNextSong()[0]) - self.playSong(item) - def songItem(self, id, name, album, artist, duration, thumb, image): url = groovesharkApi.getStreamURL(id) # Only try to get the image @@ -237,27 +276,6 @@ class Groveshark: return item - def _get_favorites(self): - favorites = [] - # if the cache does not exist or is older than x hours then reload - if (os.path.isfile(favoritesCache) == False) or (time.time() - os.path.getmtime(favoritesCache) > 3*60*60): - xbmc.log("Refresh favorites cache") - userid = self._get_login() - if (userid != 0): - favorites = groovesharkApi.userGetFavoriteSongs(userid) - f = open(favoritesCache, 'wb') - pickle.dump(favorites, f, protocol=pickle.HIGHEST_PROTOCOL) - f.close() - xbmc.log("Refreshed favorites cache") - # if not old then read from cache - elif os.path.isfile(favoritesCache): - xbmc.log("Existing favorites cache") - f = open(favoritesCache, 'rb') - favorites = pickle.load(f) - f.close() - - return favorites - def _get_keyboard(self, default="", heading="", hidden=False): kb = xbmc.Keyboard(default, heading, hidden) kb.doModal() @@ -321,7 +339,6 @@ class Groveshark: songduration = song[2] songalbum = song[3] songartist = song[6] - songartistid = song[7] u=sys.argv[0]+"?url="+urllib.quote_plus(songurl) \ +"&mode="+str(MODE_SONG)+"&name="+urllib.quote_plus(songname)+"&id=" \ +str(songid) \ @@ -332,67 +349,78 @@ class Groveshark: +"&image="+urllib.quote_plus(songimage) fav=sys.argv[0]+"?url="+urllib.quote_plus(songurl)+"&mode="+str(MODE_FAVORITE)+"&name="+urllib.quote_plus(songname)+"&id="+str(songid) unfav=sys.argv[0]+"?url="+urllib.quote_plus(songurl)+"&mode="+str(MODE_UNFAVORITE)+"&name="+urllib.quote_plus(songname)+"&id="+str(songid) - #similarArtist=sys.argv[0]+"?mode="+str(MODE_SIMILAR_ARTIST)+"&id="+str(songartistid) - #similarSong=sys.argv[0]+"?mode="+str(MODE_SIMILAR_SONG)+"&id="+str(songid) - #frown=sys.argv[0]+"?mode="+str(MODE_FROWN)+"&id="+str(songid) menuItems = [] menuItems.append(("Grooveshark Favorite", "XBMC.RunPlugin("+fav+")")) menuItems.append(("Not Grooveshark Favorite", "XBMC.RunPlugin("+unfav+")")) - #menuItems.append(("Listen to similar artist", "XBMC.RunPlugin("+similarArtist+")")) - #menuItems.append(("Listen to similar song", "XBMC.RunPlugin("+similarSong+")")) - #menuItems.append(("No thanks!", "XBMC.RunPlugin("+frown+")")) item.addContextMenuItems(menuItems, replaceItems=False) - xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False) + xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False,totalItems=n) i = i + 1 xbmcplugin.setContent(self._handle, 'songs') + xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg) - def _add_albums_directory(self, albums): - xbmc.log("Found " + str(len(albums)) + " albums...") + def _add_albums_directory(self, albums, artistid=0): + n = len(albums) + xbmc.log("Found " + str(n) + " albums...") i = 0 - while i < len(albums): + while i < n: album = albums[i] albumArtistName = album[0] albumName = album[2] albumID = album[3] albumImage = self._get_icon(album[4], 'album-' + str(albumID)) - self._add_dir(albumName + " - " + albumArtistName, '', MODE_ALBUM, albumImage, 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) xbmcplugin.setContent(self._handle, 'albums') xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_ALBUM_IGNORE_THE) + xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg) def _add_artists_directory(self, artists): - xbmc.log("Found " + str(len(artists)) + " artists...") + n = len(artists) + xbmc.log("Found " + str(n) + " artists...") i = 0 - while i < len(artists): + while i < n: artist = artists[i] artistName = artist[0] artistID = artist[1] - self._add_dir(artistName, '', MODE_ARTIST, self.artistImg, artistID) + self._add_dir(artistName, '', MODE_ARTIST, self.artistImg, artistID, n) i = i + 1 xbmcplugin.setContent(self._handle, 'artists') xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_ARTIST_IGNORE_THE) + xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg) def _add_playlists_directory(self, playlists): - xbmc.log("Found " + str(len(playlists)) + " playlists...") + n = len(playlists) + xbmc.log("Found " + str(n) + " playlists...") i = 0 - while i < len(playlists): + while i < n: playlist = playlists[i] playlistName = playlist[0] playlistID = playlist[1] - self._add_dir(playlistName, '', MODE_PLAYLIST, self.playlistImg, playlistID) + 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.setPluginFanart(int(sys.argv[1]), self.fanImg) - def _add_dir(self, name, url, mode, iconimage, id): + def _add_dir(self, name, url, mode, iconimage, id, items=1): u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&name="+urllib.quote_plus(name)+"&id="+str(id) dir=xbmcgui.ListItem(name, iconImage=iconimage, thumbnailImage=iconimage) dir.setInfo( type="Music", infoLabels={ "title": name } ) # Codes from http://xbmc-scripting.googlecode.com/svn/trunk/Script%20Templates/common/gui/codes.py menuItems = [] menuItems.append(("Select", "XBMC.executebuiltin(Action(7))")) + 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+")")) + if mode == MODE_PLAYLIST: + rmplaylst=sys.argv[0]+"?mode="+str(MODE_REMOVE_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id) + menuItems.append(("Delete playlist", "XBMC.RunPlugin("+rmplaylst+")")) + mvplaylst=sys.argv[0]+"?mode="+str(MODE_RENAME_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id) + menuItems.append(("Rename playlist", "XBMC.RunPlugin("+mvplaylst+")")) dir.addContextMenuItems(menuItems, replaceItems=True) - return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True) + return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True, totalItems=items) def get_params(): @@ -445,8 +473,8 @@ elif mode==MODE_SEARCH_ALBUMS: elif mode==MODE_SEARCH_ARTISTS: grooveshark.searchArtists() -elif mode==MODE_POPULAR: - grooveshark.popular() +elif mode==MODE_POPULAR_SONGS: + grooveshark.popularSongs() elif mode==MODE_PLAYLISTS: grooveshark.playlists() @@ -485,14 +513,18 @@ elif mode==MODE_FAVORITE: elif mode==MODE_UNFAVORITE: grooveshark.unfavorite(lastID) -elif mode==MODE_SIMILAR_ARTIST: - grooveshark.similarArtist(lastID) - -elif mode==MODE_SIMILAR_SONG: - grooveshark.similarSong(lastID) +elif mode==MODE_SIMILAR_ARTISTS: + grooveshark.similarArtists(lastID) -elif mode==MODE_FROWN: - grooveshark.frown(lastID) +elif mode==MODE_MAKE_PLAYLIST: + grooveshark.makePlaylist(lastID, name) +elif mode==MODE_REMOVE_PLAYLIST: + grooveshark.removePlaylist(lastID, name) + +elif mode==MODE_RENAME_PLAYLIST: + grooveshark.renamePlaylist(lastID, name) + + if (mode < MODE_SONG): xbmcplugin.endOfDirectory(int(sys.argv[1]))