Merge lp:~jhodapp/unity-lens-video/unity-lens-videos.previews into lp:unity-lens-video

[Jim Hodapp]

* Added dependencies section to README that details existing and new package dependencies necessary for a complete previews experience.

* Useful error message for an error condition when there was no video stream to preview.

* Added Recommend Videos category to display in the global home view by default. This view will use the coverflow renderer.

Don't merge this until the design team is finished testing usability.

[Jim Hodapp (jhodapp)]

This merge is no longer necessary since mhr3's work to consolidate categories and display recommended videos as 3rd on the home Dash view was committed.

Unmerged revisions

100. By Jim Hodapp on 2012-08-21

Added a dependencies section to README that details existing and new dependencies necessary for a complete previews experience.

99. By Jim Hodapp on 2012-08-20

Useful error message for an error condition.

98. By Jim Hodapp on 2012-08-17

Merged changes from trunk.

97. By Jim Hodapp on 2012-08-16

Added Recommended Videos category to display in the global home view by default. This view will use the coverflow rendere when it becomes available.

96. By Jim Hodapp on 2012-08-16

Added some useful comments after studying the source code.

=== modified file 'README'
--- README	2012-02-02 19:43:07 +0000
+++ README	2012-08-21 13:58:24 +0000
@@ -1,8 +1,17 @@
-
-#Install
+# Install
 sudo mkdir /usr/share/unity/lenses/video
 sudo cp video.lens /usr/share/unity/lenses/video
 
-#Run
+# Run
 ./src/unity-lens-video
 
+# Dependencies
+python2.7
+gir1.2-unity-5.0
+gir1.2-dee-1.0
+gir1.2-glib-2.0
+python-zeitgeist
+girl1.2-gstreamer-1.0
+gstreamer1.0-plugins-base
+gstreamer1.0-plugins-good
+gstreamer1.0-libav
 
=== modified file 'po/unity-lens-video.pot'
--- po/unity-lens-video.pot	2012-02-22 14:05:03 +0000
+++ po/unity-lens-video.pot	2012-08-21 13:58:24 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-22 11:42+0100\n"
+"POT-Creation-Date: 2012-08-15 11:40-0400\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,30 +17,30 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/unity-lens-video:78 ../src/unity-lens-video:84
+#: ../src/unity-lens-video:54 ../src/unity-lens-video:60
 msgid "My Videos"
 msgstr ""
 
-#: ../src/unity-lens-video:79
+#: ../src/unity-lens-video:55
 msgid "Online"
 msgstr ""
 
-#: ../src/unity-lens-video:80 ../video.lens.in.h:2
+#: ../src/unity-lens-video:56 ../video.lens.in.h:1
 msgid "Videos"
 msgstr ""
 
-#: ../src/unity-lens-video:81
+#: ../src/unity-lens-video:57
 msgid "Recently Viewed"
 msgstr ""
 
-#: ../src/unity-lens-video:82
+#: ../src/unity-lens-video:58
 msgid "Search Videos"
 msgstr ""
 
-#: ../src/unity-lens-video:83
+#: ../src/unity-lens-video:59
 msgid "Sources"
 msgstr ""
 
-#: ../video.lens.in.h:1
+#: ../video.lens.in.h:2
 msgid "Search local videos"
 msgstr ""
 
=== modified file 'src/unity-lens-video'
--- src/unity-lens-video	2012-08-14 12:44:20 +0000
+++ src/unity-lens-video	2012-08-21 13:58:24 +0000
@@ -55,6 +55,7 @@
 CAT_ONLINE = _("Online")
 CAT_GLOBAL = _("Videos")
 CAT_RECENT = _("Recently Viewed")
+CAT_RECOMMENDED = _("Recommended Videos")
 HINT = _("Search Videos")
 SOURCES = _("Sources")
 LOCAL_VIDEOS = _("My Videos")
@@ -73,11 +74,11 @@
 
 # pylint: disable=R0903
 class Daemon:
-    
+
     """Creation of a lens with a local scope."""
 
     def __init__(self):
-        #Create the lens
+        # Create the lens
         self._lens = Unity.Lens.new("/net/launchpad/lens/video", "video")
         self._lens.props.search_hint = HINT
         self._lens.props.visible = True
@@ -99,12 +100,16 @@
         cats.append(Unity.Category.new(CAT_GLOBAL,
             Gio.ThemedIcon.new("/usr/share/unity/6/lens-nav-video.svg"),
             Unity.CategoryRenderer.VERTICAL_TILE))
+        # Home Dash recommended online videos category
+        cats.append(Unity.Category.new(CAT_RECOMMENDED,
+            Gio.ThemedIcon.new("/usr/share/unity/6/lens-nav-video.svg"),
+            Unity.CategoryRenderer.FLOW))
         self._lens.props.categories = cats
 
         filters = []
         self._lens.props.filters = filters
-        
-        
+
+
         # Create the scope
         self._scope = Unity.Scope.new("/net/launchpad/lens/video/main")
         self._scope.search_in_global = True
@@ -130,7 +135,7 @@
             return True
         else:
             return False
-    
+
     def on_preview_uri(self, scope, uri):
         """Preview request handler"""
         preview = None
@@ -159,6 +164,8 @@
                             preview.add_info(Unity.InfoHint.new("format", _("Format"), None, GstPbutils.pb_utils_get_codec_description(vstream.get_caps())))
                             preview.add_info(Unity.InfoHint.new("dimensions", _("Dimensions"), None, dimensions))
                             preview.add_info(Unity.InfoHint.new("size", _("Size"), None, GLib.format_size(os.path.getsize(GLib.filename_from_uri(uri, None)))))
+                        else:
+                            print "No video streams detected that can be previewed."
                     except Exception as e:
                         print "Couldn't get video details", e
                 show_folder = Unity.PreviewAction.new("show-in-folder", _("Show in Folder"), None)
@@ -198,16 +205,18 @@
         print "Search changed to \"%s\"" % search_string
         model = search.props.results_model
         if self.source_activated('local'):
+            # Global search
             if search_type is Unity.SearchType.GLOBAL:
                 if search_string == '':
                     model.clear ()
                     if search_status:
                         search_status.finished ()
                     print "Global view without search string : hide"
-                    
+
                 else:
                     self.update_results_model(search_string, model, 'global', cancellable, search_status)
             else:
+                # Lens search
                 self.update_results_model(search_string, model, 'lens', cancellable, search_status)
         else:
             model.clear()
@@ -243,6 +252,7 @@
                     results = None
         else:
             results = None
+        # Populate the search results to display to the user
         result_list = []
         blacklist = self.get_blacklist ()
         if results:
@@ -253,6 +263,7 @@
                         if self.is_video(video) and not self.is_hidden(video, blacklist):
                             video_counter+= 1
                             title = self.get_name(video)
+                            print "title: " + title
                             comment = ''
                             uri = 'file://%s' % video
                             icon = self.get_icon(video)
@@ -264,14 +275,14 @@
                                 item.append(icon)
                                 result_list.append(item)
                 result_list = self.sort_alpha(result_list)
-        
+
         GLib.idle_add(self.add_results, search_status, model, cat, cancellable, result_list, search)
-        
+
 
     def add_results (self, search_status=None, model=None, 
                     cat=None, cancellable=None, result_list=[], search=None):
         result_sets = []
-        
+
         if cancellable and not cancellable.is_cancelled():
             if cat == 'global':
                 # Create only one result set for the Global search