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
-
-lastID = 0
+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
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'))
-favoritesCache = xbmc.translatePath(os.path.join('special://masterprofile/addon_data/', os.path.join(os.path.basename(os.getcwd()), 'favorites.dmp')))
+
+baseModeUrl = 'plugin://plugin.audio.groove/'
+playlistUrl = baseModeUrl + '?url=&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')
sys.path.append (libDir)
from GrooveAPI import *
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'))
artistsearchlimit = settings.getSetting('artistsearchlimit')
username = settings.getSetting('username')
password = settings.getSetting('password')
-
+
def __init__( self ):
self._handle = int(sys.argv[1])
userid = self._get_login()
# Setup
- groovesharkApi.setRemoveDuplicates(True)
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', '', 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)
def searchSongs(self):
query = self._get_keyboard(default="", heading="Search songs")
- if (query):
+ if (query):
+ groovesharkApi.setRemoveDuplicates(True)
songs = groovesharkApi.searchSongs(query, limit = self.songsearchlimit)
if (len(songs) > 0):
self._add_songs_directory(songs)
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, isFavorites=True)
+ 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)
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()
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)
+ xbmc.executebuiltin('XBMC.Notification(Grooveshark, Added to favorites, 1000, ' + thumbDef + ')')
else:
dialog = xbmcgui.Dialog()
dialog.ok('Grooveshark', 'You must be logged in', 'to add favorites.')
- def unfavorite(self, songid):
+ def unfavorite(self, songid, prevMode):
userid = self._get_login()
if (userid != 0):
- xbmc.log("Unfavorite playSong: " + str(songid))
+ xbmc.log("Unfavorite song: " + str(songid) + ', previous mode was ' + str(prevMode))
groovesharkApi.unfavoriteSong(songID = songid)
- os.remove(favoritesCache)
+ xbmc.executebuiltin('XBMC.Notification(Grooveshark, Removed from favorites, 1000, ' + thumbDef + ')')
+ if (int(prevMode) == MODE_FAVORITES):
+ xbmc.executebuiltin("Container.Update(" + favoritesUrl + ",replace)")
else:
dialog = xbmcgui.Dialog()
dialog.ok('Grooveshark', 'You must be logged in', 'to remove favorites.')
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:
+ xbmc.executebuiltin('XBMC.Notification(Grooveshark, Frowned, 1000, ' + thumbDef + ')')
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:
- dialog = xbmcgui.Dialog()
- dialog.ok('Grooveshark', 'Cannot start radio')
+ re.split(' - ',name,1)
+ nameTokens = re.split(' - ',name,1)
+ name = self._get_keyboard(default=nameTokens[0], heading="Playlist name")
+ if name != '':
+ groovesharkApi.setRemoveDuplicates(True)
+ 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 create playlist ', name)
+ else:
+ xbmc.executebuiltin('XBMC.Notification(Grooveshark, Playlist created, 1000, ' + thumbDef + ')')
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.Update(" + playlistsUrl + ",replace)")
+ else:
+ dialog = xbmcgui.Dialog()
+ dialog.ok('Grooveshark', 'You must be logged in ', ' to delete a playlist.')
- def similarArtist(self, artistId):
+ def removePlaylistSong(self, playlistid, playlistname, songpos):
+ dialog = xbmcgui.Dialog()
+ if dialog.yesno('Grooveshark', 'Delete this song from the playlist?') == True:
+ userid = self._get_login()
+ if (userid != 0):
+ if groovesharkApi.playlistDeleteSong(playlistid, songpos) == 0:
+ dialog = xbmcgui.Dialog()
+ dialog.ok('Grooveshark', 'Failed to remove ', ' song from playlist.')
+ else:
+ xbmc.executebuiltin("Container.Update(" + playlistUrl + "&id="+str(playlistid) + "&name=" + playlistname + ",replace)")
+ else:
+ dialog = xbmcgui.Dialog()
+ dialog.ok('Grooveshark', 'You must be logged in ', ' to delete a song from a playlist.')
+
+ 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 newname == '':
+ return
+ elif 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):
+ groovesharkApi.setRemoveDuplicates(True)
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):
+ 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)
+ self._add_songs_directory(songs, playlistid, playlistname)
else:
dialog = xbmcgui.Dialog()
dialog.ok('Grooveshark', 'You must be logged in', 'to get playlists.')
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
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()
- if (kb.isConfirmed()):
- return unicode(kb.getText(), "utf-8")
- return ''
+ kb = xbmc.Keyboard(default, heading, hidden)
+ kb.doModal()
+ if (kb.isConfirmed()):
+ return unicode(kb.getText(), "utf-8")
+ return ''
def _get_login(self):
if (self.username == "" or self.password == ""):
return os.path.join(os.path.join(thumbDir, str(id))) + '.tbn'
- def _add_songs_directory(self, songs):
+ def _add_songs_directory(self, songs, playlistid=0, playlistname='', isFavorites=False):
n = len(songs)
xbmc.log("Found " + str(n) + " songs...")
i = 0
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) \
+"&thumb="+urllib.quote_plus(songthumb) \
+"&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)
+ unfav=sys.argv[0]+"?url="+urllib.quote_plus(songurl)+"&mode="+str(MODE_UNFAVORITE)+"&name="+urllib.quote_plus(songname)+"&id="+str(songid)+"&prevmode="
menuItems = []
- menuItems.append(("Grooveshark Favorite", "XBMC.RunPlugin("+fav+")"))
+ if isFavorites == True:
+ unfav = unfav +str(MODE_FAVORITES)
+ else:
+ 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+")"))
+ if playlistid > 0:
+ rmplaylstsong=sys.argv[0]+"?playlistid="+str(playlistid)+"&id="+str(i+1)+"&mode="+str(MODE_REMOVE_PLAYLIST_SONG)+"&name="+playlistname
+ menuItems.append(("Remove from playlist", "XBMC.RunPlugin("+rmplaylstsong+")"))
item.addContextMenuItems(menuItems, replaceItems=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):
+ def _add_albums_directory(self, albums, artistid=0):
n = len(albums)
xbmc.log("Found " + str(n) + " albums...")
i = 0
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)
xbmcplugin.setContent(self._handle, 'albums')
xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_ALBUM_IGNORE_THE)
xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
# 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, totalItems=items)
try: id=int(params["id"])
except: pass
-if (id > 0):
- lastID = id
-
if mode==None:
grooveshark.categories()
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()
grooveshark.favorites()
elif mode==MODE_SONG:
- try: name=urllib.unquote_plus(params["name"])
- except: pass
try: album=urllib.unquote_plus(params["album"])
except: pass
try: artist=urllib.unquote_plus(params["artist"])
grooveshark.playSong(song)
elif mode==MODE_ARTIST:
- grooveshark.artist(lastID)
+ grooveshark.artist(id)
elif mode==MODE_ALBUM:
- grooveshark.album(lastID)
+ grooveshark.album(id)
elif mode==MODE_PLAYLIST:
- grooveshark.playlist(lastID)
+ grooveshark.playlist(id, name)
elif mode==MODE_FAVORITE:
- grooveshark.favorite(lastID)
+ grooveshark.favorite(id)
elif mode==MODE_UNFAVORITE:
- grooveshark.unfavorite(lastID)
-
-elif mode==MODE_SIMILAR_ARTIST:
- grooveshark.similarArtist(lastID)
+ try: prevMode=urllib.unquote_plus(params["prevmode"])
+ except: pass
+ grooveshark.unfavorite(id, prevMode)
-elif mode==MODE_SIMILAR_SONG:
- grooveshark.similarSong(lastID)
+elif mode==MODE_SIMILAR_ARTISTS:
+ grooveshark.similarArtists(id)
-elif mode==MODE_FROWN:
- grooveshark.frown(lastID)
+elif mode==MODE_MAKE_PLAYLIST:
+ grooveshark.makePlaylist(id, name)
+elif mode==MODE_REMOVE_PLAYLIST:
+ grooveshark.removePlaylist(id, name)
+
+elif mode==MODE_RENAME_PLAYLIST:
+ grooveshark.renamePlaylist(id, name)
+
+elif mode==MODE_REMOVE_PLAYLIST_SONG:
+ try: playlistID=urllib.unquote_plus(params["playlistid"])
+ except: pass
+ grooveshark.removePlaylistSong(playlistID, name, id)
+
if (mode < MODE_SONG):
xbmcplugin.endOfDirectory(int(sys.argv[1]))
HCoop / clinton / xbmc-groove.git / blobdiff