From 3d95dfcbec3ae55a873f541d768285dd707a7043 Mon Sep 17 00:00:00 2001 From: stephendenham Date: Wed, 26 Jan 2011 13:38:21 +0000 Subject: [PATCH] Fix artist's album bug. git-svn-id: svn://svn.code.sf.net/p/xbmc-groove/code@43 2dec19e3-eb1d-4749-8193-008c8bba0994 --- default.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/default.py b/default.py index 72de575..f07928a 100644 --- a/default.py +++ b/default.py @@ -40,6 +40,8 @@ playlistUrl = baseModeUrl + '?mode=' + str(MODE_PLAYLIST) playlistsUrl = baseModeUrl + '?mode=' + str(MODE_PLAYLISTS) favoritesUrl = baseModeUrl + '?mode=' + str(MODE_FAVORITES) +searchArtistsAlbumsName = "Search for artist's albums..." + thumbDef = os.path.join(imgDir, 'default.tbn') sys.path.append (libDir) @@ -104,7 +106,7 @@ class Groveshark: 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(searchArtistsAlbumsName, '', 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) @@ -169,8 +171,8 @@ class Groveshark: self.categories() # Search for artists albums - def searchArtistsAlbums(self, artistName = ""): - if artistName == "": + def searchArtistsAlbums(self, artistName = None): + if artistName == None or artistName == searchArtistsAlbumsName: query = self._get_keyboard(default="", heading="Search for artist's albums") else: query = artistName @@ -543,7 +545,7 @@ elif mode==MODE_SEARCH_ARTISTS: elif mode==MODE_SEARCH_ARTISTS_ALBUMS: try: name=urllib.unquote_plus(params["name"]) except: - name = "" + name = None pass grooveshark.searchArtistsAlbums(name) -- 2.20.1