Merge lp:~chipaca/unity-lens-video/refresh-sources-and-cache-recommendations-and-refresh-them-too-why-not into lp:unity-lens-video/remote-videos-scope-trunk

[John Lenton]

Refreshing of sources, and early fetching, and caching, and refreshing of recommendations.

Apologies for earlier merge proposal, which was targeted at the wrong branch.

[lp:~chipaca/unity-lens-video/refresh-sources-and-cache-recommendations-and-refresh-them-too-why-not]

37. By John Lenton on 2012-02-26

only update sources_list if it changes

38. By John Lenton on 2012-02-26

a bit of clenaup

=== modified file 'src/unity-scope-video-remote'
--- src/unity-scope-video-remote	2012-02-24 10:34:11 +0000
+++ src/unity-scope-video-remote	2012-02-26 16:58:17 +0000
@@ -20,7 +20,7 @@
 
 import json
 import sys
-import urllib
+from urllib import urlencode
 import time
 
 #pylint: disable=E0611
@@ -45,6 +45,9 @@
 BUS_NAME = "net.launchpad.scope.RemoteVideos"
 SERVER = "http://video.u1.to/v0"
 
+REFRESH_INTERVAL = 3600         # fetch sources & recommendations once an hour
+RETRY_INTERVAL = 60             # retry sources/recommendations after a minute
+
 # Be cautious with Zeitgeist, don't assume it's ready
 try:
     ZGCLIENT = ZeitgeistClient()
@@ -60,7 +63,8 @@
     """Create the scope and listen to Unity signals"""
 
     def __init__(self):
-        self.sources_list = None
+        self.sources_list = []
+        self.recommendations = []
         self.scope = Unity.Scope.new("/net/launchpad/scope/remotevideos")
         self.scope.search_in_global = False
         self.scope.connect("search-changed", self.on_search_changed)
@@ -74,20 +78,49 @@
         self.session.user_agent = "Unity Video Lens Remote Scope v0"
         self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME)
         self.query_list_of_sources()
+        self.update_recommendations()
         self.scope.export()
 
+    def update_recommendations(self):
+        """Query the server for 'recommendations'.
+
+        In v0, that means simply do an empty search.
+        """
+        recs = self.get_results('', [])
+        if recs:
+            self.recommendations = recs
+            dt = REFRESH_INTERVAL
+        else:
+            dt = RETRY_INTERVAL
+        GLib.timeout_add_seconds(dt, self.update_recommendations)
+
     def query_list_of_sources(self):
         """Query the server for a list of sources that will be used
         to build sources filter options and search queries."""
         msg = Soup.Message.new("GET", SERVER + "/sources")
         if self.session.send_message(msg) != 200:
-            self.sources_list = []
             print "Error: Unable to query the server for a list of sources"
             print "       %d: %s" % (msg.status_code, msg.reason_phrase)
         else:
-            self.sources_list = json.loads(msg.response_body.data)
-            for n, source in enumerate(self.sources_list):
-                self.scope.props.sources.add_option(str(n), source, None)
+            try:
+                sources_list = json.loads(msg.response_body.data)
+            except ValueError:
+                print "Error: got garbage json from the server"
+            else:
+                if sources_list != self.sources_list:
+                    self.sources_list = sources_list
+                    sources = self.scope.props.sources
+                    for opt in sources.options[:]:
+                        sources.remove_option(opt.props.id)
+                    for n, source in enumerate(self.sources_list):
+                        sources.add_option(str(n), source, None)
+        if self.sources_list:
+            # refresh later
+            dt = REFRESH_INTERVAL
+        else:
+            # retry soon
+            dt = RETRY_INTERVAL
+        GLib.timeout_add_seconds(dt, self.query_list_of_sources)
 
     def on_filtering_changed(self, *_):
         """Run another search when a filter change is notified."""
@@ -162,10 +195,12 @@
 
     def get_results(self, search, sources):
         """Query the server with the search string and the list of sources."""
+        if not search and not sources and self.recommendations:
+            return self.recommendations
         query = dict(q=search)
         if sources:
             query['sources'] = sources.encode("utf-8")
-        query = urllib.urlencode(query)
+        query = urlencode(query)
         url = "%s/search?%s" % (SERVER, query)
         print "Querying the server:", url
         msg = Soup.Message.new("GET", url)
@@ -174,7 +209,13 @@
             print "       %d: %s" % (msg.status_code, msg.reason_phrase)
             return []
         else:
-            return json.loads(msg.response_body.data)
+            try:
+                data = json.loads(msg.response_body.data)
+            except ValueError:
+                print "Error: got garbage json from the server"
+                return []
+            else:
+                return data
 
     def on_activate_uri (self, scope, rawuri):
         """On item clicked, parse the custom uri items"""
@@ -186,7 +227,7 @@
             self.zeitgeist_insert_event(uri, title, icon)
         # Use direct glib activation instead of Unity's own method
         # to workaround an ActivationResponse bug.
-        GLib.spawn_command_line_async("gvfs-open "+uri)
+        GLib.spawn_async(["/usr/bin/gvfs-open", uri])
         # Then close the Dash
         return Unity.ActivationResponse(goto_uri='', handled=2 )