Merge lp:~verterok/unity-scope-grooveshark/basic-preview into lp:unity-scope-grooveshark

[Guillermo Gonzalez]

Add basic preview support.

Add basic preview support.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-saucy-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-saucy-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-saucy-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-grooveshark-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-saucy-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-grooveshark-ci/4/rebuild

review: Approve (continuous-integration)

[David Callé (davidc3)]

+1!

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-05-23 13:39:20 +0000
+++ debian/control	2013-09-06 14:55:54 +0000
@@ -7,6 +7,7 @@
                python3-distutils-extra,
                pkg-config,
                python3-nose,
+               python3-gi,
                gir1.2-unity-5.0 (>= 7),
                gir1.2-dee-1.0,
                gir1.2-glib-2.0,

=== modified file 'po/unity-scope-grooveshark.pot'
--- po/unity-scope-grooveshark.pot	2013-02-21 00:56:34 +0000
+++ po/unity-scope-grooveshark.pot	2013-09-06 14:55:54 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-21 01:56+0100\n"
+"POT-Creation-Date: 2013-09-04 17:50-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,34 +17,37 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/unity_grooveshark_daemon.py:37 ../data/grooveshark.scope.in.h:4
+#: ../src/unity_grooveshark_daemon.py:38 ../data/grooveshark.scope.in.h:4
 msgid "Search Grooveshark"
 msgstr ""
 
-#: ../src/unity_grooveshark_daemon.py:38
+#: ../src/unity_grooveshark_daemon.py:39
 msgid "Sorry, there are no Grooveshark song or album that matches your search."
 msgstr ""
 
-#: ../src/unity_grooveshark_daemon.py:39
+#: ../src/unity_grooveshark_daemon.py:40
 msgid "Powered by Grooveshark"
 msgstr ""
 
-#: ../src/unity_grooveshark_daemon.py:47
+#: ../src/unity_grooveshark_daemon.py:48
 msgid "Songs"
 msgstr ""
 
-#: ../src/unity_grooveshark_daemon.py:51
+#: ../src/unity_grooveshark_daemon.py:52
 msgid "Albums"
 msgstr ""
 
+#: ../src/unity_grooveshark_daemon.py:188 ../data/grooveshark.scope.in.h:2
+msgid "Grooveshark"
+msgstr ""
+
 #: ../data/grooveshark.scope.in.h:1
 msgid "music;grooveshark;"
 msgstr ""
 
-#: ../data/grooveshark.scope.in.h:2
-msgid "Grooveshark"
-msgstr ""
-
 #: ../data/grooveshark.scope.in.h:3
-msgid "Find Grooveshark songs and albums"
+msgid ""
+"This is an Ubuntu search plugin that enables information from Grooveshark to "
+"be searched and displayed in the Dash underneath the Music header. If you do "
+"not wish to search this content source, you can disable this search plugin."
 msgstr ""

=== modified file 'src/unity_grooveshark_daemon.py'
--- src/unity_grooveshark_daemon.py	2013-03-13 10:09:43 +0000
+++ src/unity_grooveshark_daemon.py	2013-09-06 14:55:54 +0000
@@ -17,7 +17,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gi.repository import Unity, UnityExtras
+from gi.repository import Unity
 from gi.repository import Gio, GLib
 import urllib.parse
 import urllib.request
@@ -88,12 +88,11 @@
         return results
     search = urllib.parse.quote(search)
     uri = "%ss/%s?format=json&key=%s&limit=32" % (SEARCH_URI, search, API_KEY)
-    print(uri)
     try:
         response = urllib.request.urlopen(uri).read()
         data = json.loads(response.decode('utf8'))
     except Exception as error:
-        print(error)
+        print("[grooveshark] Error: ", error)
         return results
     albums_seen = {}
     for i in data:
@@ -163,14 +162,30 @@
                             if m['id'] == e:
                                 i['metadata'][e] = i[e]
                 i['metadata']['provider_credits'] = GLib.Variant('s', PROVIDER_CREDITS)
-                result = Unity.ScopeResult.create(str(i['uri']), str(i['icon']),
-                                                  i['category'], i['result_type'],
-                                                  str(i['mimetype']), str(i['title']),
-                                                  str(i['comment']), str(i['dnd_uri']),
-                                                  i['metadata'])
-                result_set.add_result(result)
+                result_set.add_result(**i)
         except Exception as error:
-            print (error)
+            print("[grooveshark] Error: ", error)
+
+
+class Preview (Unity.ResultPreviewer):
+
+    def do_run(self):
+        title = self.result.title.strip()
+        artist = self.result.metadata['artist'].get_string().strip()
+        album = self.result.metadata['album'].get_string().strip()
+        description = self.result.comment.strip()
+        preview = Unity.MusicPreview.new(title, description, None)
+        if title != album:
+            preview.props.subtitle = artist + " - " + album
+        else:
+            preview.props.subtitle = artist
+        image = self.result.icon_hint
+        preview.props.image_source_uri = image
+        icon = Gio.FileIcon.new (Gio.file_new_for_path(PROVIDER_ICON))
+        view_action = Unity.PreviewAction.new("view", _("Grooveshark"), icon)
+        preview.add_action(view_action)
+        return preview
+
 
 class Scope (Unity.AbstractScope):
     def __init__(self):
@@ -210,7 +225,7 @@
         '''
         fs = Unity.FilterSet.new ()
 #        if FILTERS:
-#            
+#
         return fs
 
     def do_get_group_name (self):
@@ -223,5 +238,11 @@
         se = MySearch (search_context)
         return se
 
+    def do_create_previewer(self, result, metadata):
+        rp = Preview()
+        rp.set_scope_result(result)
+        rp.set_search_metadata(metadata)
+        return rp
+
 def load_scope():
     return Scope()