Merge lp:~stolowski/unity-lens-video/remote-videos-scope-trunk.previews into lp:unity-lens-video/remote-videos-scope-trunk

[Paweł Stołowski]

Implementation of previews

Implementation of previews.

[Michal Hruby (mhr3)]

59 + preview.add_info(Unity.InfoHint.with_variant("uploaded-by", "Uploaded by", None, GLib.Variant('s', "")));
60 + preview.add_info(Unity.InfoHint.with_variant("uploaded-on", "Uploaded on", None, GLib.Variant('s', "")));

Let's use the default constructor here, which takes a string as the value. (+ gettext)

review: Needs Fixing

[Michal Hruby (mhr3)]

This will probably get more love (and detailed information) later, but atm it looks fine.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-remote-videos-scope/1/console reported an error when processing this lp:~stolowski/unity-lens-videos/remote-videos-scope-trunk.previews branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-remote-videos-scope/2/console reported an error when processing this lp:~stolowski/unity-lens-videos/remote-videos-scope-trunk.previews branch.
Not merging it.

[Didier Roche-Tolomelli (didrocks)]

make check disable for python program now. And this should get our first python bot automerging :)

=== modified file 'src/unity-scope-video-remote'
--- src/unity-scope-video-remote	2012-06-21 18:45:17 +0000
+++ src/unity-scope-video-remote	2012-08-14 12:56:51 +0000
@@ -22,6 +22,7 @@
 import sys
 from urllib import urlencode
 import time
+import gettext
 
 #pylint: disable=E0611
 from zeitgeist.client import ZeitgeistClient
@@ -42,6 +43,13 @@
 )
 #pylint: enable=E0611
 
+APP_NAME = "unity-lens-video"
+LOCAL_PATH = "/usr/share/locale/"
+
+gettext.bindtextdomain(APP_NAME, LOCAL_PATH)
+gettext.textdomain(APP_NAME)
+_ = gettext.gettext
+
 BUS_NAME = "net.launchpad.scope.RemoteVideos"
 SERVER = "http://videosearch.ubuntu.com/v0"
 
@@ -74,12 +82,14 @@
         self.scope.props.sources.connect("notify::filtering",
             self.on_filtering_changed)
         self.scope.connect ("activate-uri", self.on_activate_uri)
+        self.scope.connect('preview-uri', self.on_preview_uri)
         self.session = Soup.SessionAsync()
         self.session.props.user_agent = "Unity Video Lens Remote Scope v0.4"
         self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME)
         self.query_list_of_sources()
         self.update_recommendations()
         self.scope.export()
+        self.details_map = {}  #holds details not passed via lens-meta://, needed by preview
 
     def update_recommendations(self):
         """Query the server for 'recommendations'.
@@ -168,6 +178,8 @@
         print "Search changed to %r" % search_string
         model = search.props.results_model
         model.clear()
+        # Clear results details map
+        self.details_map = {}
         # Create a list of activated sources
         sources = [source for source in self.sources_list
                    if self.source_activated(source)]
@@ -195,6 +207,7 @@
                 title = i['title'].encode('utf-8')
                 icon = i['img'].encode('utf-8')
                 comment = i['source'].encode('utf-8')
+                self.details_map[uri] = (comment) #TODO: more to come
                 if uri.startswith('http'):
                     # Instead of an uri, we pass a string of uri + metadata
                     model.append(uri+'lens-meta://'+title+'lens-meta://'+icon,
@@ -264,6 +277,33 @@
         # Then close the Dash
         return Unity.ActivationResponse(goto_uri='', handled=2 )
 
+    def on_preview_uri (self, scope, rawuri):
+        """Preview request handler"""
+        uri = rawuri.split('lens-meta://')[0]
+        title = rawuri.split('lens-meta://')[1]
+        thumbnail_uri = rawuri.split('lens-meta://')[2]
+        subtitle = ''
+        desc = ''
+        if self.details_map.has_key (uri):
+            desc = self.details_map[uri][0]
+        try:
+            thumbnail_file = Gio.File.new_for_uri (thumbnail_uri)
+            thumbnail_icon = Gio.FileIcon.new(thumbnail_file)
+        except:
+            thumbnail_icon = None
+        preview = Unity.MoviePreview.new(title, subtitle, desc, thumbnail_icon)
+        play_video = Unity.PreviewAction.new("play", _("Play"), None)
+        play_video.connect('activated', self.play_video)
+        preview.add_action(play_video)
+        #TODO: insert proper uploader and upload date when available in videosearch metadata
+        preview.add_info(Unity.InfoHint.new("uploaded-by", _("Uploaded by"), None, ""));
+        preview.add_info(Unity.InfoHint.new("uploaded-on", _("Uploaded on"), None, ""));
+        return preview
+
+    def play_video (self, action, uri):
+        """Preview request - Play action handler"""
+        return self.on_activate_uri (action, uri)
+
     def zeitgeist_insert_event(self, uri, title, icon):
         """Insert item uri as a new Zeitgeist event"""
         # "storage" is an optional zg string