Merge lp:~saviq/unity-lens-video/remote-videos-scope-plurals into lp:~jhodapp/unity-lens-video/remote-videos-scope-trunk

[Michał Sawicz]

[lp:~saviq/unity-lens-video/remote-videos-scope-plurals]

59. By Michał Sawicz on 2012-08-28

Use ngettext and str.join in details retrieval

Use ngettext in multivalued details for plural handling
Use str.join to join multivalued details

60. By Michał Sawicz on 2012-08-28

Don't differentiate between sources

Display all data in the preview, if available, regardless of the source.

61. By Michał Sawicz on 2012-08-28

Don't use list.get when unnecessary

62. By Michał Sawicz on 2012-08-28

Only import datetime from datetime

63. By Michał Sawicz on 2012-08-28

Another dict.get vs dict[]

64. By Michał Sawicz on 2012-08-28

And another one

[Jim Hodapp (jhodapp)]

This looks good, but revision 60 needs to be undone since we do need to differentiate between sources given that not every video preview looks the same according to the design mockups.

review: Needs Fixing (code)

[lp:~saviq/unity-lens-video/remote-videos-scope-plurals]

65. By Michał Sawicz on 2012-08-28

Revert r60

[Jim Hodapp (jhodapp)]

Looks good!

review: Approve (code)

=== modified file 'src/unity-scope-video-remote'
--- src/unity-scope-video-remote	2012-08-27 15:56:53 +0000
+++ src/unity-scope-video-remote	2012-08-28 14:58:23 +0000
@@ -22,7 +22,7 @@
 import sys
 from urllib import urlencode
 import time
-import datetime
+from datetime import datetime
 import gettext
 
 #pylint: disable=E0611
@@ -50,6 +50,7 @@
 gettext.bindtextdomain(APP_NAME, LOCAL_PATH)
 gettext.textdomain(APP_NAME)
 _ = gettext.gettext
+n_ = gettext.ngettext
 
 BUS_NAME = "net.launchpad.scope.RemoteVideos"
 #SERVER = "http://videosearch.ubuntu.com/v0"
@@ -294,11 +295,11 @@
         desc = ''
         source = ''
         if isinstance(details, dict):
-            uri = details.get('browser_url', '')
-            title = details.get('title', '')
-            thumbnail_uri = details.get('image', '')
-            desc = details.get('description', '')
-            source = details.get('source', '')
+            uri = details['browser_url']
+            title = details['title']
+            thumbnail_uri = details['image']
+            desc = details['description']
+            source = details['source']
 
         try:
             thumbnail_file = Gio.File.new_for_uri (thumbnail_uri)
@@ -312,38 +313,38 @@
 
         # TODO: For details of future source types, factor out common detail key/value pairs
         if source == "Amazon":
-            directors = self.get_list_values("directors", details)
-            if len(directors) > 0:
-                preview.add_info(Unity.InfoHint.new("directors", _("Directors"),
-                    None, directors))
+            if "directors" in details:
+                directors = details["directors"]
+                preview.add_info(Unity.InfoHint.new("directors",
+                    n_("Director", "Directors", len(directors)), None, ', '.join(directors)))
             if "starring" in details:
-                cast = self.get_list_values("starring", details)
-                if len(cast) > 0:
-                    preview.add_info(Unity.InfoHint.new("cast", _("Cast"),
-                        None, cast))
+                cast = details["starring"]
+                if cast:
+                    preview.add_info(Unity.InfoHint.new("cast",
+                        n_("Cast", "Cast", len(cast)), None, ', '.join(cast)))
             if "genres" in details:
-                genres = self.get_list_values("genres", details)
-                if len(genres) > 0:
-                    preview.add_info(Unity.InfoHint.new("genres", _("Genres"),
-                        None, genres))
+                genres = details["genres"] 
+                if genres:
+                    preview.add_info(Unity.InfoHint.new("genres",
+                        n_("Genre", "Genres", len(genres)), None, ', '.join(genres)))
             if "release_date" in details:
                 try:
                     # v1 spec states release_date will be YYYY-MM-DD
-                    release_date = datetime.datetime.strptime(details.get("release_date", ""), "%Y-%m-%d")
+                    release_date = datetime.strptime(details["release_date"], "%Y-%m-%d")
                     preview.year = release_date.strftime("%Y")
                 except:
                     print "Failed to parse release_date since it was not in format: YYYY-MM-DD"
             if "duration" in details:
-                duration = int(details.get("duration")) / 60
-                # TODO: Extend VideoPreview class and set property for showing video length
+                duration = int(details["duration"]) / 60
+            # TODO: Extend VideoPreview class and set property for showing video length
         # TODO: Add Vimeo & YouTube details for v1 of JSON API
         else:
             if "uploaded_by" in details:
                 preview.add_info(Unity.InfoHint.new("uploaded-by", _("Uploaded by"),
-                    None, details.get("uploaded_by", "")))
+                    None, details["uploaded_by"]))
             if "date_uploaded" in details:
                 preview.add_info(Unity.InfoHint.new("uploaded-on", _("Uploaded on"),
-                    None, details.get("date_uploaded", "")))
+                    None, details["date_uploaded"]))
 
         return preview
 
@@ -368,18 +369,6 @@
 
         return details
 
-    def get_list_values(self, key, details):
-        """Given a JSON list (i.e. "starring": ["Robert Downey Jr.", "Terrence Howard"])
-        extract the values and put them into a comma separated string."""
-        values = ""
-        if key in details:
-            for value in details.get(key, ""):
-                values += str(value) + ", "
-            # Remove the final ", "
-            values = values[0:len(values)-2]
-
-        return values
-
     def play_video (self, action, uri):
         """Preview request - Play action handler"""
         return self.on_activate_uri (action, uri)