Merge remote-tracking branch 'origin/boom' into boom

tidalf · Jan 5, 2012 · 9b84856 · 9b84856
2 parents c092e71 + 74167e6
commit 9b84856
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/default.py b/default.py
@@ -1112,8 +1112,8 @@ def _add_dir(self, name, url, mode, iconimage, id, items=1):
 qob._handle = grooveshark._handle
 
 
-id=0
-try: id=int(params["id"])
+id=''
+try: id=params["id"]
 except: pass
 name = None
 try: name=urllib.unquote_plus(params["name"])
@@ -1183,7 +1183,7 @@ def _add_dir(self, name, url, mode, iconimage, id, items=1):
 #     
 elif mode==MODE_ALBUM:
      print "Product ID: " + str(id) + "\n"
-     grooveshark.product(id)
+     grooveshark.product(str(id))
 
 
 elif mode==MODE_PLAYLIST:

diff --git a/resources/lib/qobuz/product.py b/resources/lib/qobuz/product.py
@@ -29,7 +29,7 @@ def __init__(self,qob,id):
 
     def _fetch_data(self):
         #ea = self.Qob.getEncounteredAlbum()
-        data = self.Qob.Api.get_product(self.id)['product']
+        data = self.Qob.Api.get_product(str(self.id))['product']
         pprint.pprint(data)
         #for a in data['tracks']:
         #    ea.add(a)