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

[Welton Rodrigo Torres Nascimento]

A simple preview implementation

This branch implements a simple preview for unity-scope-grooveshark.

The way grooveshark API works makes impossible to recover item details from SongID or AlbumID. That forced me to use a form of data storage.

The first parameter of model.append was used to store the entire item in a serialized form.

This is probably not the best approach. The best alternative may be apply for Grooveshark Public API access.

A good preview would show all tracks from an album, even if user previewed a track.

Feel free to refuse this merge if you don't agree with anything.

[Welton Rodrigo Torres Nascimento (motoster)]

Hello,

I would like to continue working in this Grooveshark scope. Could you give me some hint or advice on what kind of preview it should have?

It would be possible to build a much better preview having access to the public API Grooveshark.

You ever requested such access?

[David Callé (davidc3)]

Hello!

I didn't had the time this week to review and eventually merge your
proposals (because I'm in Copenhagen for the UDS), so I'm probably going to
do that on monday.
I've requested access to the Grooveshark API, and it wasn't granted, a year
ago and 6 months ago, but I think I will try again next week. About
previews, I don't remember exactly but I think that the Grooveshark API
could provide actual song previews; the idea would be to get as close as
the current local music previews, as a first step, then maybe work on a
better design. I also know that the Unity Design team wants it to be
installed by default, so music previews will have to be quite consistent
between scopes.

Nevertheless, there is a new policy that won't allow Python scopes/lenses
installed by default (for obvious ram reasons, since Ubuntu wants to target
the mobile/tablet market), so it will be ported to Vala, or (hopefully) Go,
this cycle. But that's another story, and it still needs input from the
Ubuntu Desktop team...

On more thing on the Grooveshark API, if we get access, we will be able to
provide an Online Accounts plugin, to integrate Grooveshark favorites,
uploaded songs from the user account, etc. Which is quite exciting.

Thanks *a lot* for collaborating on this!

On Fri, Nov 2, 2012 at 4:19 PM, Welton Rodrigo Torres Nascimento <
<email address hidden>> wrote:

> Hello,
>
> I would like to continue working in this Grooveshark scope. Could you give
> me some hint or advice on what kind of preview it should have?
>
> It would be possible to build a much better preview having access to the
> public API Grooveshark.
>
> You ever requested such access?
>
> --
>
> https://code.launchpad.net/~motoster/onehundredscopes/grooveshark-precise-simple_preview/+merge/132007
> You are requested to review the proposed merge of
> lp:~motoster/onehundredscopes/grooveshark-precise-simple_preview into
> lp:~davidc3/onehundredscopes/grooveshark-precise.
>

[David Callé (davidc3)]

Oh, I've answered by mail and it wasn't supposed to land directly on this page but to be a personnal mail. Oh, well.

=== modified file 'src/unity-scope-grooveshark'
--- src/unity-scope-grooveshark	2012-10-29 06:42:03 +0000
+++ src/unity-scope-grooveshark	2012-10-30 03:42:18 +0000
@@ -31,6 +31,8 @@
 		self.scope.search_in_global = False
 		self.scope.connect ("search-changed", self.on_search_changed)
 		self.scope.connect ("filters-changed", lambda scope : self.scope.queue_search_changed(Unity.SearchType.DEFAULT))
+		self.scope.connect ("activate_uri", self.on_activate)
+		self.scope.connect ("preview_uri", self.on_preview)
 #		self.preferences = Unity.PreferencesManager.get_default()
 #		self.preferences.connect("notify::remote-content-search", self._on_preference_changed)
 		self.scope.export()
@@ -54,28 +56,26 @@
 		search.finished()
 
 	def update_results_model(self, search, model):
+		import simplejson
+
 		data_list = self.grooveshark(search)
 		if data_list:
 			for i in data_list:
+				serialized = simplejson.dumps(i)
+
+				if i['type'] == 'track':
+					category = 0
+				else: # album
+					category = 1
+
 				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'])
+					serialized,
+					str(i['icon_hint']),
+					category,
+					"text/html",
+					i['title'],
+					i['artistName'] + "\n" + i['album'],	#comment
+					i['uri'])
 
 	def grooveshark_search(self, q, key):
 		import urllib, urllib2, simplejson
@@ -113,22 +113,39 @@
 				for i in data_grooveshark:
 					item_list = {}
 
+					item_list['type']       = 'track'
 					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['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']
 
+					# URI for complete album
+					uri = urllib.quote(item_list['album'].encode('utf-8'))
+					item_list['album_uri'] = "http://grooveshark.com/#/album/%s/%s" % (uri, item_list['albumID'])
+
+					# Append to the list.
+					data_list.append(item_list)
+
+					# Create an entry on list for album too, but only first time we see it.
 					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)
+
+						# Clone the item
+						album_item_list = item_list.copy()
+
+						# Adjust fields
+						album_item_list['type']  = 'album'
+						album_item_list['title'] = album_item_list['album']
+						album_item_list['uri']   = album_item_list['album_uri']
+
+						# Mark as seen
+						albums_seen[ album_item_list['albumID'] ] = 1
+
+						# Append an entry for this album.
+						data_list.append(album_item_list)
+
 				return data_list
 			else:
 				return []
@@ -136,6 +153,47 @@
 			return []
 			
 
+	def _deserialize(self, stream):
+		import urllib2, simplejson
+
+		# De-serialize the item.
+		return simplejson.loads(stream)
+
+	def on_activate(self, scope, stream):
+		item = self._deserialize(stream)
+		print "Stream is %s" % stream
+		
+		uri = ''
+		if item['type'] == 'track':
+			uri = item['uri']
+		else:
+			uri = item['album_uri']
+
+		print "Type is %s" % item['type']
+		print "URI is %s"  % uri
+
+		Gio.AppInfo.launch_default_for_uri(uri, None)
+
+		return Unity.ActivationResponse(handled=Unity.HandledType.HIDE_DASH)
+
+	def on_preview(self, scope, stream):
+		item = self._deserialize(stream)
+		preview = Unity.MusicPreview.new(
+				item['title'], item['artistName'], 
+				Gio.FileIcon.new_for_string(item['icon_hint']))
+
+		play_action = Unity.PreviewAction.new("play_action", "Play on Grooveshark", None)
+		play_action.connect("activated", self.play_action)
+		preview.add_action(play_action)
+
+		return preview
+
+	def play_action(self, scope, stream):
+		print "Clicked URI is %s" % self._deserialize(stream)['uri']
+		return self.on_activate(scope, stream)
+
+
+
 if __name__ == "__main__":
 	session_bus_connection = Gio.bus_get_sync (Gio.BusType.SESSION, None)
 	session_bus = Gio.DBusProxy.new_sync (session_bus_connection, 0, None,