Merge lp:~stolowski/unity-lens-video/close-preview-player into lp:unity-lens-video

[Paweł Stołowski]

Handle preview closed() signal and call Close() dbus method of music-preview-player. Added manual tests.

Handle preview closed() signal and call Close() dbus method of music-preview-player. Added manual tests.

[Michal Hruby (mhr3)]

Code-wise looks fine, I don't really like the ever-increasing number of manual tests, but we don't really have infrastructure to automate these right now.

review: Approve

=== modified file 'src/unity-lens-video'
--- src/unity-lens-video	2012-08-23 16:19:24 +0000
+++ src/unity-lens-video	2012-08-31 14:01:38 +0000
@@ -131,6 +131,13 @@
         else:
             return False
     
+    def on_preview_closed(self, preview):
+        try:                        
+            player = self.bus.get_object (PREVIEW_PLAYER_DBUS_NAME, PREVIEW_PLAYER_DBUS_PATH)
+            dbus.Interface (player, PREVIEW_PLAYER_DBUS_IFACE).Close()
+        except Exception as e:
+            print "Failed to send close signal to preview player:", e
+
     def on_preview_uri(self, scope, uri):
         """Preview request handler"""
         preview = None
@@ -142,6 +149,7 @@
                 subtitle = time.strftime("%x, %X", time.localtime(os.path.getmtime(GLib.filename_from_uri(uri, None))))
                 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://"):

=== added directory 'tests'
=== added directory 'tests/manual'
=== added file 'tests/manual/local-video-previews.txt'
--- tests/manual/local-video-previews.txt	1970-01-01 00:00:00 +0000
+++ tests/manual/local-video-previews.txt	2012-08-31 14:01:38 +0000
@@ -0,0 +1,34 @@
+Preview of local video file
+---------------------------
+Test that details of a local video file are displayed in the preview.
+
+Setup:
+Have some video files available in ~/Videos folder.
+
+Actions:
+1. Open the Dash and switch to the video lens.
+2. Make sure some video files from ~/Videos folder are displayed.
+3. Right click a video file.
+
+Expected Result:
+Video preview should be displayed. Verify the preview display a sample video frame (a picture) and contains
+the following data: file name (as title), modification date and time (as subtitle)  and 'Format', 'Dimensions',
+'Size' info; 'Dimensions' should include resolution and aspect ratio, e.g. '1280:720, 16:9'.
+
+
+Preview of local video file - preview-player close
+--------------------------------------------------
+Test that music-preview-player is closed automatically when not needed.
+
+Setup:
+Have some video files available in ~/Videos folder.
+
+Actions:
+1. Open the Dash and switch to the video lens.
+2. Make sure some video files from ~/Videos folder are displayed.
+3. Right click a video file.
+4. Close the preview.
+
+Expected Result:
+Video preview should be displayed. After closing the preview, verify with 'ps aux' that music-preview-player
+process disappears after approximately 1 minute.