Merge lp:~didrocks/unity-lens-music/add-conditional-activation into lp:unity-lens-music

[Didier Roche-Tolomelli]

add conditional search activation to the remote scope (LP: #1054746)

add conditional search activation to the music remote scope (LP: #1054746)

Add manual test as for the rest of the lens.

[lp:~didrocks/unity-lens-music/add-conditional-activation]

113. By Didier Roche-Tolomelli on 2012-09-26

comply to latest API

[Michal Hruby (mhr3)]

Looking good, two things though:

37 + message ("Unity shopping lens online search disabled.");

Drop the msg, it's not necessary, and would only cause console spam since it's logged with every search.

21 + private PreferencesManager preferences = PreferencesManager.get_default ();

The scope should listen to changes on the remote_content_search property and call queue_search_changed() to make the setting take effect immediately.

review: Needs Fixing

[lp:~didrocks/unity-lens-music/add-conditional-activation]

114. By Didier Roche-Tolomelli on 2012-09-26

listen to remote change and remove message

[Michal Hruby (mhr3)]

Looking good.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-09-19 06:25:55 +0000
+++ configure.ac	2012-09-26 12:58:22 +0000
@@ -64,7 +64,7 @@
                   sqlite3 >= 3.7.7
                   gee-1.0
 		  json-glib-1.0
-                  unity >= 4.99.0
+                  unity >= 6.7
                   tdb >= 1.2.6)
 
 PKG_CHECK_MODULES(PREVIEW_PLAYER,

=== modified file 'src/musicstore-scope.vala'
--- src/musicstore-scope.vala	2012-09-14 16:02:22 +0000
+++ src/musicstore-scope.vala	2012-09-26 12:58:22 +0000
@@ -26,6 +26,7 @@
     private MusicStoreCollection collection;
     private PreviewPlayer preview_player;
     private Unity.MusicPreview? music_preview;
+    private PreferencesManager preferences = PreferencesManager.get_default ();
 
     public MusicStoreScopeProxy ()
     {
@@ -41,6 +42,8 @@
 
       collection = new MusicStoreCollection ();
 
+      preferences.notify["remote-content-search"].connect((obj, pspec) => { scope.queue_search_changed(SearchType.DEFAULT); });
+
       try {
 	scope.export ();
       } catch (GLib.IOError e) {
@@ -189,6 +192,17 @@
     {
       if (is_search_empty (search))
         return;
+
+      /**
+       * only perform the request if the user has not disabled
+       * online/commercial suggestions. That will hide the category as well.
+       */
+      if (preferences.remote_content_search != Unity.PreferencesManager.RemoteContent.ALL)
+      {
+        search.results_model.clear ();
+        search.finished ();
+        return;
+      }
       
       try {
 	debug ("model has %u rows before search", search.results_model.get_n_rows ());

=== added file 'tests/manual/activation-remote-scope.txt'
--- tests/manual/activation-remote-scope.txt	1970-01-01 00:00:00 +0000
+++ tests/manual/activation-remote-scope.txt	2012-09-26 12:58:22 +0000
@@ -0,0 +1,15 @@
+'Disable' Music store Search
+----------------------------------------------------
+Disabling the music store scope should not show any remote fetched result.
+
+Setup:
+Internet connectivity.
+
+Actions:
+1. Disable the online/commercial search in gnome-control-center or directly in gsettings
+(com.canonical.Unity.Lenses "remote-content-search" to none)
+2 Perfom a search in the music lens
+
+Expected Results:
+No "More suggestions" category should appear.
+