Merge lp:~mhr3/unity-lens-video/fix-1079699 into lp:unity-lens-video/remote-videos-scope-trunk

[Michal Hruby]

Ensure we query the videosearch server only when the data is needed

There was a bug in the remote video scope, which caused it to query the videosearch server every 5 minutes from non-US regions.

Ensure we query the videosearch server only when the data is needed.

[lp:~mhr3/unity-lens-video/fix-1079699]

64. By Michal Hruby on 2012-12-04

Merge trunk

[John Lenton (chipaca)]

OK. Not sure I like the behaviour change, but I'm OK with it.

review: Approve

[lp:~mhr3/unity-lens-video/fix-1079699]

65. By Michal Hruby on 2012-12-06

Remove extra PreferencesManager call

[Paweł Stołowski (stolowski)]

75 + if not search.props.search_string.strip() and not sources and results:

Why 'not sources'?

review: Needs Information

[Michal Hruby (mhr3)]

> 75 + if not search.props.search_string.strip() and not sources and
> results:
>
> Why 'not sources'?

Cause we want to cache only empty, non-filtered search.

[Paweł Stołowski (stolowski)]

Right. Ok, LGTM and works fine.

review: Approve

=== modified file 'src/unity-scope-video-remote'
--- src/unity-scope-video-remote	2012-10-11 21:27:49 +0000
+++ src/unity-scope-video-remote	2012-12-06 10:06:18 +0000
@@ -79,6 +79,7 @@
         self._pending = None
         self.sources_list = []
         self.recommendations = []
+        self.recommendations_last_update = 0
         self.scope = Unity.Scope.new("/net/launchpad/scope/remotevideos")
         self.scope.search_in_global = False
         self.scope.connect("search-changed", self.on_search_changed)
@@ -93,33 +94,11 @@
         self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME)
         self.preferences = Unity.PreferencesManager.get_default()
         self.query_list_of_sources()
-        self.update_recommendations()
         self.preferences.connect("notify::remote-content-search", self.on_filtering_or_preference_changed)
         self.scope.export()
         # refresh the at least once every 30 minutes
         GLib.timeout_add_seconds(REFRESH_INTERVAL/2, self.refresh_online_videos)
 
-    def update_recommendations(self):
-        """Query the server for 'recommendations'.
-
-        In v0 extended, that means simply do an empty search with Amazon
-        as the source since it's the only paid provider at the moment.
-        """
-        if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
-            return
-        msg = Soup.Message.new("GET", SERVER + "/search?q=&sources=Amazon")
-        self.session.queue_message(msg, self._recs_cb, None)
-
-    def _recs_cb(self, session, msg, user_data):
-        recs = self._handle_search_msg(msg)
-        print "Got %d recommendations from the server" % len(recs)
-        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."""
@@ -269,8 +248,9 @@
 
     def get_results(self, search_string, search, model, sources):
         """Query the server with the search string and the list of sources."""
-        if not search_string and not sources and self.recommendations:
-            self.update_results_model(search, model, self.recommendations, True)
+        if not search_string and not sources and self.recommendations and \
+            time.time()-self.recommendations_last_update < REFRESH_INTERVAL:
+            self.update_results_model(search, model, self.recommendations)
             return
         if self._pending is not None:
             self.session.cancel_message(self._pending,
@@ -285,15 +265,19 @@
         self._pending = Soup.Message.new("GET", url)
         self.session.queue_message(self._pending,
                                    self._search_cb,
-                                   (search, model))
+                                   (search, model, sources))
 
-    def _search_cb(self, session, msg, (search, model)):
+    def _search_cb(self, session, msg, (search, model, sources)):
         if msg is not self._pending:
             # nothing to do here
             print "WAT? _search_cb snuck in on a non-pending msg"
             return
         self._pending = None
         results = self._handle_search_msg(msg)
+        # cache no-query results
+        if not search.props.search_string.strip() and not sources and results:
+            self.recommendations = results
+            self.recommendations_last_update = time.time()
         self.update_results_model(search, model, results)
 
     def _handle_search_msg(self, msg):