Merge lp:~didrocks/unity-lens-photos/add-disabling-online-support into lp:unity-lens-photos

[Didier Roche-Tolomelli]

Add disabling online search support on the facebook, flickr and picasa scopes

[David Callé (davidc3)]

Looks good overall, but this needs to be fixed :

facebook_scope.py:61
- self._scope.connect("filters-changed", self.on_lens_active)
+ self._scope.connect("filters-changed", self.on_lens_active_or_preference_changed)

review: Needs Fixing

[lp:~didrocks/unity-lens-photos/add-disabling-online-support]

90. By Didier Roche-Tolomelli on 2012-09-27

fix missing rename

[Didier Roche-Tolomelli (didrocks)]

fixed and pushed, please rereview :)

[David Callé (davidc3)]

Thanks Didier! I like the fact that you don't hide remote sources in the Sources filter when the setting is changed. Makes up for the OA integration vs No remote possible confusion :)

review: Approve

=== modified file 'src/facebook_scope.py'
--- src/facebook_scope.py	2012-09-20 22:29:07 +0000
+++ src/facebook_scope.py	2012-09-27 09:23:28 +0000
@@ -58,10 +58,14 @@
         self._authenticating = False
         self._get_accounts_for_service ('facebook')
         self._scope.connect("search-changed", self.on_search_changed)
-        self._scope.connect("filters-changed", self.on_lens_active)
-        self._scope.connect("notify::active", self.on_lens_active)
+        self._scope.connect("filters-changed", self.on_lens_active_or_preference_changed)
+        self._scope.connect("notify::active", self.on_lens_active_or_preference_changed)
         self._scope.connect('preview-uri', self.on_preview_uri)
         self._scope.props.sources.connect("notify::filtering", self.on_filtering_changed)
+
+        self.preferences = Unity.PreferencesManager.get_default()
+        self.preferences.connect("notify::remote-content-search", self.on_lens_active_or_preference_changed)
+
         self._scope.export ()
         lens.add_local_scope (self._scope)
 
@@ -121,7 +125,7 @@
         if source_name in self._sources_options:
             self._sources_options.remove(source_name)
             self._scope.props.sources.remove_option(source_name)
-            self.on_lens_active ()
+            self.on_lens_active_or_preference_changed ()
 
 
     def get_account_service(self):
@@ -165,7 +169,7 @@
             self.enabled = False
             self._sources_options.remove(source_name)
             self._scope.props.sources.remove_option(source_name)
-            self.on_lens_active ()
+            self.on_lens_active_or_preference_changed ()
             print ('Removed Facebook account')
 
 
@@ -236,7 +240,7 @@
 ########
 
 
-    def on_lens_active(self, *_):
+    def on_lens_active_or_preference_changed(self, *_):
         """ Update results when the lens is opened """
         self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
 
@@ -283,6 +287,13 @@
         model = search.props.results_model
         search.set_reply_hint ("no-results-hint", GLib.Variant.new_string(NO_RESULTS_HINT))
         model.clear()
+
+        # only perform the request if the user has not disabled
+        # online results. That will hide the category as well.
+        if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
+            search.finished()
+            return
+
         self._queued_search = (scope, search, search_type, cancellable)
         if self._authenticating:
             print ("authenticating, queuing search")
 
=== modified file 'src/flickr_scope.py'
--- src/flickr_scope.py	2012-09-20 22:29:07 +0000
+++ src/flickr_scope.py	2012-09-27 09:23:28 +0000
@@ -59,10 +59,14 @@
         self._authenticating = False
         self._get_accounts_for_service ('flickr')
         self._scope.connect("search-changed", self.on_search_changed)
-        self._scope.connect ("filters-changed", self.on_lens_active)
-        self._scope.connect("notify::active", self.on_lens_active)
+        self._scope.connect ("filters-changed", self.on_lens_active_or_preference_changed)
+        self._scope.connect("notify::active", self.on_lens_active_or_preference_changed)
         self._scope.props.sources.connect("notify::filtering", self.on_filtering_changed)
         self._scope.connect('preview-uri', self.on_preview_uri)
+
+        self.preferences = Unity.PreferencesManager.get_default()
+        self.preferences.connect("notify::remote-content-search", self.on_lens_active_or_preference_changed)
+
         self._scope.export ()
         lens.add_local_scope (self._scope)
 
@@ -122,7 +126,7 @@
         if source_name in self._sources_options:
             self._sources_options.remove(source_name)
             self._scope.props.sources.remove_option(source_name)
-            self.on_lens_active ()
+            self.on_lens_active_or_preference_changed ()
 
 
     def get_account_service(self):
@@ -166,7 +170,7 @@
             self.enabled = False
             self._sources_options.remove(source_name)
             self._scope.props.sources.remove_option(source_name)
-            self.on_lens_active ()
+            self.on_lens_active_or_preference_changed ()
             print ('Removed Flickr account')
 
 
@@ -300,7 +304,7 @@
 # Lens functions
 ########
 
-    def on_lens_active(self, *_):
+    def on_lens_active_or_preference_changed(self, *_):
         """ Update results when the lens is opened """
         self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
 
@@ -348,6 +352,13 @@
         model = search.props.results_model
         search.set_reply_hint ("no-results-hint", GLib.Variant.new_string(NO_RESULTS_HINT))
         model.clear()
+
+        # only perform the request if the user has not disabled
+        # online results. That will hide the category as well.
+        if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
+            search.finished()
+            return
+
         self._queued_search = (scope, search, search_type, cancellable)
         if self._authenticating:
             print ("authenticating, queuing search")
 
=== modified file 'src/picasa_scope.py'
--- src/picasa_scope.py	2012-09-20 22:29:07 +0000
+++ src/picasa_scope.py	2012-09-27 09:23:28 +0000
@@ -57,10 +57,14 @@
         self._cancellable = [Gio.Cancellable (), Gio.Cancellable ()]
         self._get_accounts_for_service ('google')
         self._scope.connect("search-changed", self._on_search_changed)
-        self._scope.connect ("filters-changed", self.on_lens_active)
-        self._scope.connect("notify::active", self.on_lens_active)
+        self._scope.connect ("filters-changed", self.on_lens_active_or_preference_changed)
+        self._scope.connect("notify::active", self.on_lens_active_or_preference_changed)
         self._scope.props.sources.connect("notify::filtering", self.on_filtering_changed)
         self._scope.connect('preview-uri', self.on_preview_uri)
+
+        self.preferences = Unity.PreferencesManager.get_default()
+        self.preferences.connect("notify::remote-content-search", self.on_lens_active_or_preference_changed)
+
         self._scope.export ()
         lens.add_local_scope (self._scope)
 
@@ -103,7 +107,7 @@
         if source_name in self._sources_options:
             self._sources_options.remove(source_name)
             self._scope.props.sources.remove_option(source_name)
-            self.on_lens_active ()
+            self.on_lens_active_or_preference_changed ()
 
 
     def get_account_service(self):
@@ -147,7 +151,7 @@
             self.enabled = False
             self._sources_options.remove(source_name)
             self._scope.props.sources.remove_option(source_name)
-            self.on_lens_active ()
+            self.on_lens_active_or_preference_changed ()
             print ('Removed Picasa account')
 
 
@@ -155,7 +159,7 @@
 # Lens functions
 ########
 
-    def on_lens_active(self, *_):
+    def on_lens_active_or_preference_changed(self, *_):
         """ Update results when the lens is opened """
         self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
 
@@ -202,6 +206,13 @@
         model = search.props.results_model
         search.set_reply_hint ("no-results-hint", GLib.Variant.new_string(NO_RESULTS_HINT))
         model.clear ()
+
+        # only perform the request if the user has not disabled
+        # online results. That will hide the category as well.
+        if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
+            search.finished()
+            return
+
         search_string = search.props.search_string
         if self._enabled:
             if search_type == Unity.SearchType.DEFAULT:
 
=== modified file 'tests/manual/facebook-photos.txt'
--- tests/manual/facebook-photos.txt	2012-09-21 16:08:09 +0000
+++ tests/manual/facebook-photos.txt	2012-09-27 09:23:28 +0000
@@ -12,3 +12,19 @@
 
 Expected Result:
 The lens should display the most recent Facebook photos and Facebook friends photos in the Recent category, less recent Facebook photos in the My Photos category and less recent Facebook friends photos in the Friends Photos category.
+
+'Disable' Online searched
+----------------------------------------------------
+Disabling the online searches should not search on Facebook.
+
+Setup:
+Internet connectivity.
+
+Actions:
+Disable the online search in gnome-control-center or directly in gsettings
+(com.canonical.Unity.Lenses "remote-content-search" to none)
+Perfom a search in the home dash and within the photo lens.
+
+Expected Results:
+No result from Facebook in the lens should be displayed.
+
 
=== modified file 'tests/manual/flickr-photos.txt'
--- tests/manual/flickr-photos.txt	2012-09-21 16:08:09 +0000
+++ tests/manual/flickr-photos.txt	2012-09-27 09:23:28 +0000
@@ -12,3 +12,19 @@
 
 Expected Result:
 The lens should display the most recent Flickr photos and Flickr contacts photos in the Recent category, less recent Flickr photos in the My Photos category and less recent Flickr contacts photos in the Friends Photos category.
+
+'Disable' Online searched
+----------------------------------------------------
+Disabling the online searches should not search on Flickr.
+
+Setup:
+Internet connectivity.
+
+Actions:
+Disable the online search in gnome-control-center or directly in gsettings
+(com.canonical.Unity.Lenses "remote-content-search" to none)
+Perfom a search in the home dash and within the photo lens.
+
+Expected Results:
+No result from Flickr in the lens should be displayed. 
+
 
=== modified file 'tests/manual/picasa-photos.txt'
--- tests/manual/picasa-photos.txt	2012-09-21 16:08:09 +0000
+++ tests/manual/picasa-photos.txt	2012-09-27 09:23:28 +0000
@@ -12,3 +12,19 @@
 
 Expected Result:
 The lens should display the 100 most recent Picasa photos, 50 in the Recent category, 50 in the My Photos category.
+
+'Disable' Online searched
+----------------------------------------------------
+Disabling the online searches should not search on Picasa.
+
+Setup:
+Internet connectivity.
+
+Actions:
+Disable the online search in gnome-control-center or directly in gsettings
+(com.canonical.Unity.Lenses "remote-content-search" to none)
+Perfom a search in the home dash and within the photo lens.
+
+Expected Results:
+No result from Picasa in the lens should be displayed. 
+