From: stephendenham <stephendenham@2dec19e3-eb1d-4749-8193-008c8bba0994>
Date: Wed, 26 Jan 2011 10:59:21 +0000 (+0000)
Subject: All XBMC Music Library integration.
X-Git-Url: https://git.hcoop.net/clinton/xbmc-groove.git/commitdiff_plain/99f72740161d15018a0784933ef0276d2c10c2a8

All XBMC Music Library integration.

git-svn-id: svn://svn.code.sf.net/p/xbmc-groove/code@40 2dec19e3-eb1d-4749-8193-008c8bba0994
---

diff --git a/changelog.txt b/changelog.txt
index c7d5e5b..32ace45 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -7,6 +7,7 @@ Get other user's playlists.
 Sort playlists directory by name.
 Put track name first in the album and playlist directory item labels.
 Allow multiple pages in the songs directory (help prevent slow retrieval of very big lists).
+Allow integration with XBMC Music Libary. See http://sourceforge.net/apps/trac/xbmc-groove/wiki/WikiStart
 
 0.2.3:
 
diff --git a/default.py b/default.py
index f515407..a4609db 100644
--- a/default.py
+++ b/default.py
@@ -169,8 +169,11 @@ class Groveshark:
             self.categories()
 
     # Search for artists albums
-    def searchArtistsAlbums(self):
-        query = self._get_keyboard(default="", heading="Search for artist's 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):
@@ -547,7 +550,11 @@ elif mode==MODE_POPULAR_SONGS:
     grooveshark.popularSongs()
     
 elif mode==MODE_ARTIST_POPULAR:
-    grooveshark.artistPopularSongs()
+    try: name=urllib.unquote_plus(params["name"])
+    except: 
+        name = ""
+        pass
+    grooveshark.artistPopularSongs(name)
 
 elif mode==MODE_FAVORITES:
     grooveshark.favorites()