Merge lp:~davidc3/unity-lens-video/dont-crash-on-zg-previews into lp:unity-lens-video

[David Callé]

Don't crash when previewing Zeitgeist non local results

* Don't crash when previewing Zeitgeist non local results and provides the bare minimum for a preview.
* Re-order preview actions (Play is now selected by default for local results)

[Michal Hruby (mhr3)]

I'm going to approve this, but the remote zeitgeist results shouldn't be displayed directly, only used to sort the online results. This will need to be fixed in the future.

Of course the other fixes here still apply :)

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'src/unity-lens-video'
--- src/unity-lens-video	2012-09-14 09:12:09 +0000
+++ src/unity-lens-video	2012-09-22 11:41:20 +0000
@@ -156,13 +156,18 @@
         while not model.is_last(iter):
             if model.get_string(iter, 0) == uri:
                 title = model.get_string(iter, 4);
-                subtitle = time.strftime("%x, %X", time.localtime(os.path.getmtime(GLib.filename_from_uri(uri, None))))
+                try:
+                    subtitle = time.strftime("%x, %X", time.localtime(os.path.getmtime(GLib.filename_from_uri(uri, None))))
+                except:
+                    # Instead of empty, maybe the date/time of the zg event?
+                    subtitle = ''
                 desc = model.get_string(iter, 5);
                 preview = Unity.MoviePreview.new(title, subtitle, desc, None)
                 preview.connect('closed', self.on_preview_closed)
 
                 # we may get remote uris from zeitgeist - fetch details for local files only
                 if uri.startswith("file://"):
+                    local_video = True
                     preview.props.image_source_uri = uri
                     try:                        
                         player = self.bus.get_object (PREVIEW_PLAYER_DBUS_NAME, PREVIEW_PLAYER_DBUS_PATH)
@@ -179,11 +184,15 @@
                         preview.add_info(Unity.InfoHint.new("size", _("Size"), None, GLib.format_size(os.path.getsize(GLib.filename_from_uri(uri, None)))))
                     except Exception as e:
                         print "Couldn't get video details", e
-                show_folder = Unity.PreviewAction.new("show-in-folder", _("Show in Folder"), None)
-                show_folder.connect('activated', self.show_in_folder)
-                preview.add_action(show_folder)
+                else:
+                    local_video = False
+                    preview.props.image_source_uri = model.get_string(iter, 1)
                 play_video = Unity.PreviewAction.new("play", _("Play"), None)
                 preview.add_action(play_video)
+                if local_video:
+                    show_folder = Unity.PreviewAction.new("show-in-folder", _("Show in Folder"), None)
+                    show_folder.connect('activated', self.show_in_folder)
+                    preview.add_action(show_folder)
                 break
             iter = model.next(iter)
         if preview == None: