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_POPULAR_SONGS = 6
+MODE_FAVORITES = 7
+MODE_PLAYLISTS = 8
+MODE_ALBUM = 9
+MODE_ARTIST = 10
+MODE_PLAYLIST = 11
+MODE_SONG = 12
+MODE_FAVORITE = 13
ACTION_MOVE_LEFT = 1
ACTION_MOVE_UP = 3
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'))
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'))
songImg = xbmc.translatePath(os.path.join(imgDir, 'song.png'))
defImg = xbmc.translatePath(os.path.join(imgDir, 'default.tbn'))
if os.path.isdir(cacheDir) == False:
os.makedirs(cacheDir)
xbmc.log("Made " + cacheDir)
- if os.path.isdir(thumbDir) == False:
- arttDir = os.path.join(cacheDir, thumbDirName)
- os.makedirs(arttDir)
- xbmc.log("Made " + arttDir)
+ artDir = xbmc.translatePath(thumbDir)
+ if os.path.isdir(artDir) == False:
+ os.makedirs(artDir)
+ xbmc.log("Made " + artDir)
# Top-level menu
def categories(self):
# 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', '', 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):
# 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):
# 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):
self.categories()
else:
self.categories()
-
+
+ # Search for playlists
+ def searchPlaylists(self):
+ query = self._get_keyboard(default="", heading="Search for user's playlists")
+ 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):
+ query = self._get_keyboard(default="", heading="Search for artist's albums")
+ 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()
# 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):
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.')
def playSong(self, item):
songid = item.getProperty('songid')
song = groovesharkApi.getSongURLFromSongID(songid)
- if os.path.isfile(song):
+ if song != '':
item.setPath(song)
xbmc.log("Playing: " + song)
xbmcplugin.setResolvedUrl(handle=int(sys.argv[1]), succeeded=True, listitem=item)
else:
- xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Cannot play song, 1000, ' + thumbDef + ')')
+ 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")
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):
return thumbDef
# Add songs to directory
- def _add_songs_directory(self, songs):
+ def _add_songs_directory(self, songs, trackLabelFormat=ARTIST_ALBUM_NAME_LABEL):
n = len(songs)
xbmc.log("Found " + str(n) + " songs...")
i = 0
while i < n:
song = songs[i]
- item = self._get_song_item(song)
+ item = self._get_song_item(song, trackLabelFormat)
coverart = item.getProperty('coverart')
songname = song[0]
songid = song[1]
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
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()