Merge lp:~motoster/onehundredscopes/grooveshark-precise-double_queries into lp:~davidc3/onehundredscopes/grooveshark-precise

[Welton Rodrigo Torres Nascimento]

Get both track and album results from one API call.

This change get track and album information from only one API call.

[David Callé (davidc3)]

That looks good, thanks!

[Welton Rodrigo Torres Nascimento (motoster)]

Please mark with an Approve Review.

[David Callé (davidc3)]

Approving.

review: Approve

=== modified file 'src/unity-scope-grooveshark'
--- src/unity-scope-grooveshark	2012-01-30 12:24:47 +0000
+++ src/unity-scope-grooveshark	2012-10-26 04:52:19 +0000
@@ -48,20 +48,28 @@
 			search.finished()
 
 	def update_results_model(self, search, model):
-		album_list = []
-		for i in self.grooveshark(search):
-			title = i[0]
-			comment = i[1]
-			uri = i[2]
-			icon_hint = i[3]
-			model.append (uri, icon_hint, 0,"text/html", title, comment, uri)
-			
-		for i in self.grooveshark_album(search):
-			title = i[0]
-			comment = i[1]
-			uri = i[2]
-			icon_hint = i[3]
-			model.append (uri, icon_hint, 1,"text/html", title, comment, uri)
+		data_list = self.grooveshark(search)
+		if data_list:
+			for i in data_list:
+				model.append (
+						str(i['uri']),
+						str(i['icon_hint']),
+						0,
+						"text/html",
+						i['title'],
+						i['artistName'] + "\n" + i['album'],	#comment
+						i['uri'])
+
+				#Show this title's album on the album section
+				if 'album_uri' in i:
+					model.append (
+							i['album_uri'],
+							i['icon_hint'], 
+							1,
+							"text/html", 
+							i['album'], 
+							i['artistName'] + i['album'], #comment
+							i['album_uri'])
 
 	def grooveshark_search(self, q, key):
 		import urllib, urllib2, simplejson
@@ -89,26 +97,31 @@
 		    return
 
 	def grooveshark(self, search):
+		import urllib
 		if search:
 			data_grooveshark = self.grooveshark_search("%s" % search, 1)
 			data_list = []
+			albums_seen = {}
+
 			if data_grooveshark:
 				for i in data_grooveshark:
-					item_list = []
-
-					uri = str(i['Url'])
-					title = i['SongName']
-					comment = i['ArtistName']+'\n'+i['AlbumName']
-					icon_hint = 'http://beta.grooveshark.com/static/amazonart/m'+ str(i['AlbumID']) +'.jpg'
-					albumID = i['AlbumID']
-					album = i['AlbumName']
-
-					item_list.append(title)
-					item_list.append(comment)
-					item_list.append(uri)
-					item_list.append(icon_hint)
-					item_list.append(album)
-					item_list.append(albumID)
+					item_list = {}
+
+					item_list['uri']        = str(i['Url'])
+					item_list['title']      = i['SongName']
+					item_list['artistName'] = i['ArtistName']
+					item_list['comment']    = i['ArtistName']+'\n'+i['AlbumName']
+					item_list['icon_hint']  = 'http://beta.grooveshark.com/static/amazonart/m'+ str(i['AlbumID']) +'.jpg'
+					item_list['albumID']    = i['AlbumID']
+					item_list['album']      = i['AlbumName']
+
+					if i['AlbumID'] not in albums_seen:
+						album_for_uri = urllib.quote(item_list['album'].encode('utf-8'))
+						print album_for_uri
+						item_list['album_uri'] = "http://grooveshark.com/#/album/"+ album_for_uri +"/"+ str(item_list['albumID'])
+						albums_seen[ item_list['albumID'] ] = 1
+
+
 					data_list.append(item_list)
 				return data_list
 			else:
@@ -116,45 +129,6 @@
 		else:
 			return []
 			
-	def grooveshark_album(self, search):
-		if search:
-			data_grooveshark = self.grooveshark_search("%s" % search, 2)
-			data_list = []
-			album_list = []
-			if data_grooveshark:
-				for i in data_grooveshark:
-					item_list = []
-
-					title = i['AlbumName']
-					icon_hint = 'http://beta.grooveshark.com/static/amazonart/m'+ str(i['AlbumID']) +'.jpg'
-					comment = i['ArtistName']
-					albumID = i['AlbumID']
-					import urllib
-					album_for_uri = urllib.quote(title.encode('utf-8'))
-					uri = "http://grooveshark.com/#/album/"+ album_for_uri +"/"+ str(albumID)
-
-					item_list.append(title)
-					item_list.append(comment)
-					item_list.append(uri)
-					item_list.append(icon_hint)
-					data_list.append(item_list)
-					album_list.append(comment+title)
-
-				album_dedup_list = []
-				dedup_list = []
-				item = 0
-				for i in data_list:
-					if album_list[item] not in album_dedup_list:
-						album_dedup_list.append(album_list[item])
-						dedup_list.append(i)
-					item = item + 1
-				return dedup_list
-			else:
-				return []
-		else:
-			return []
-
-
 
 if __name__ == "__main__":
 	session_bus_connection = Gio.bus_get_sync (Gio.BusType.SESSION, None)