Merge lp:~davidc3/unity-lens-video/stop-looking-for-recommendations-when-no-remote into lp:unity-lens-video/remote-videos-scope-trunk

[David Callé]

Disable initial recommendations and sources requests when remote calls are not allowed.

Don't call for new recommendations if remote content search is disabled in Privacy settings. Results were not fetched but the initial call was still there.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested & works. No traffic with the privacy option set.

[John Lenton (chipaca)]

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'src/unity-scope-video-remote'
--- src/unity-scope-video-remote	2012-09-28 12:57:58 +0000
+++ src/unity-scope-video-remote	2012-10-11 21:29:20 +0000
@@ -91,9 +91,9 @@
         self.session = Soup.SessionAsync()
         self.session.props.user_agent = "Unity Video Lens Remote Scope v0.4"
         self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME)
+        self.preferences = Unity.PreferencesManager.get_default()
         self.query_list_of_sources()
         self.update_recommendations()
-        self.preferences = Unity.PreferencesManager.get_default()
         self.preferences.connect("notify::remote-content-search", self.on_filtering_or_preference_changed)
         self.scope.export()
         # refresh the at least once every 30 minutes
@@ -105,6 +105,8 @@
         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)
 
@@ -121,6 +123,8 @@
     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."""
+        if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
+            return
         msg = Soup.Message.new("GET", SERVER + "/sources")
         self.session.queue_message(msg, self._sources_cb, None)