Merge lp:~stolowski/unity-scope-home/privacy-and-disabled-scopes into lp:unity-scope-home

[Paweł Stołowski]

Handle remote-content-search and disabled-scopes gsettings flags.

Handle remote-content-search and disabled-scopes gsettings flags.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-raring-amd64-ci/30

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-scope-home-trunk-ci/30/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

49 + public string[] disabled_scopes
50 + {
51 + get
52 + {
53 + return preferences.disabled_scopes;
54 + }
55 + }
56 +

Why the extra copy when there's the Set?

review: Needs Information

[Michal Hruby (mhr3)]

>
> Why the extra copy when there's the Set?

Solved on IRC.. +1

review: Approve

=== modified file 'src/scope-manager.vala'
--- src/scope-manager.vala	2013-03-21 21:40:00 +0000
+++ src/scope-manager.vala	2013-03-22 19:42:24 +0000
@@ -24,23 +24,67 @@
   private PreferencesManager preferences = PreferencesManager.get_default ();
   private MasterScopesManager master_scopes_mgr = new MasterScopesManager ();
   private Gee.Set<string> client_scopes = new Gee.HashSet<string> ();
+  private Gee.Set<string> disabled_scopes_lut = new Gee.HashSet<string> ();
 
   private Settings gp_settings;
   private const string HOMELENS_DEFAULT_VIEW = "home-lens-default-view";
+  private const string DISABLED_SCOPES_KEY = "disabled-scopes";
+  private const string REMOTE_CONTENT_KEY = "remote-content-search";
 
   public ScopeManager ()
   {
     gp_settings = new Settings ("com.canonical.Unity.Lenses");
     gp_settings.bind (HOMELENS_DEFAULT_VIEW, this, "home_lens_default_view", SettingsBindFlags.DEFAULT); // bind get/set
+
+    update_disabled_scopes ();
+
+    preferences.notify[DISABLED_SCOPES_KEY].connect ((obj, pspec) =>
+    {
+      update_disabled_scopes ();
+    });
+
+    update_remote_content_search ();
+    preferences.notify[REMOTE_CONTENT_KEY].connect ((obj, pspec) =>
+    {
+      update_remote_content_search ();
+    });
+  }
+
+  private void update_remote_content_search ()
+  {
+    remote_content_search = (preferences.remote_content_search == Unity.PreferencesManager.RemoteContent.ALL);
+  }
+
+  private void update_disabled_scopes ()
+  {
+    disabled_scopes_lut.clear ();
+    foreach (var scope_id in preferences.disabled_scopes)
+    {
+      disabled_scopes_lut.add (scope_id);
+    }
   }
 
   public string[] home_lens_default_view { get; set; default = new string[0]; }
+  public string[] disabled_scopes
+  {
+    get
+    {
+      return preferences.disabled_scopes;
+    }
+  }
+
+  public bool remote_content_search { get; internal set; }
 
   public void start_master_scopes ()
   {
     master_scopes_mgr.start ();
   }
 
+  public bool is_disabled (string scope_id)
+  {
+    return disabled_scopes_lut.contains (scope_id);
+  }
+
   public bool is_client_scope (string scope_id)
   {
     if (client_scopes.size == 0)

=== modified file 'src/scope.vala'
--- src/scope.vala	2013-03-22 15:59:12 +0000
+++ src/scope.vala	2013-03-22 19:42:24 +0000
@@ -75,6 +75,11 @@
     debug ("Exporting home scope");
     export ();
 
+    scope_mgr.notify["remote-content-search"].connect ((obj, pspec) =>
+    {
+      remote_content_search_changed ();
+    });
+
     init_sss_client ();
   }
 
@@ -98,8 +103,32 @@
     ml.run ();
   }
 
+  internal void remote_content_search_changed ()
+  {
+    debug ("remote-content-search flag changed");
+
+    if (!scope_mgr.remote_content_search)
+    {
+      if (smart_scopes_initialized)
+      {
+        debug ("Disabling Smart Scopes Server connectivity"); 
+        smart_scopes_initialized = false;
+        smart_scopes_ready = false;
+        if (metrics_timer > 0)
+        {
+          GLib.Source.remove (metrics_timer);
+          metrics_timer = 0;
+        }
+        sss_client = null;
+      }
+    } // don't do anything if it got enabled - this will be handled on next search ()
+  }
+
   internal void init_sss_client ()
   {
+    if (scope_mgr.remote_content_search == false)
+      return;
+
     if (!smart_scopes_initialized)
     {
       debug ("Initializing Smart Scopes client");
@@ -342,6 +371,9 @@
   internal override async ActivationResponse? activate (Unity.AggregatorActivation activation)
   {
     debug ("Activation request for scope %s, action_type=%u", activation.scope_id, activation.action_type);
+
+    if (!scope_mgr.remote_content_search)
+      return null; //nothing to do
  
     string? server_sid = channel_id_map.server_sid_for_channel (activation.channel_id);
     string? session_id = channel_id_map.session_id_for_channel (activation.channel_id);
@@ -463,7 +495,7 @@
     }
 
     // initiate Smart Scopes Search (if enabled and query not empty)
-    if (smart_scopes_ready == true)
+    if (smart_scopes_ready)
     {
       if (empty_query)
       { 
@@ -504,7 +536,7 @@
             remote_scopes_to_query += scope_id;
         }
 
-        sss_client.search.begin (scope_search.search_string, session_id, remote_scopes_to_query,
+        sss_client.search.begin (scope_search.search_string, session_id, remote_scopes_to_query, scope_mgr.disabled_scopes,
             (scope_id, row) =>
             {
               var pushed_model = push_data.lookup (scope_id);
@@ -539,7 +571,7 @@
     else
     {
       // may happen if remote-scopes haven't finished or returned an error
-      warning ("Smart scopes not ready and not enabled for this query");
+      debug ("Smart scopes not ready or not enabled for this query");
     }
 
     // no filters set / no scopes to search, use always-search scopes

=== modified file 'src/smart-scopes-interface.vala'
--- src/smart-scopes-interface.vala	2013-03-21 22:10:04 +0000
+++ src/smart-scopes-interface.vala	2013-03-22 19:42:24 +0000
@@ -48,7 +48,7 @@
   public interface SmartScopeClientInterface : Object
   {
     public abstract string create_session_id ();
-    public abstract async void search (string query, string session_id, string[] scopes, SmartScopeResult result_cb,
+    public abstract async void search (string query, string session_id, string[] scopes, string[] disabled_scopes, SmartScopeResult result_cb,
         SmartScopeCategories categories_cb, SmartScopeRecommendations recommend_cb, GLib.Cancellable? cancellable) throws Error;
     public abstract async Preview? preview (string server_sid, string session_id, string result_id, ScopeResult result, GLib.Cancellable? cancellable) throws Error;
     public abstract async RemoteScopeInfo[]? remote_scopes (GLib.Cancellable? cancellable) throws Error;

=== modified file 'src/smart-scopes-search.vala'
--- src/smart-scopes-search.vala	2013-03-22 13:41:11 +0000
+++ src/smart-scopes-search.vala	2013-03-22 19:42:24 +0000
@@ -241,10 +241,10 @@
         return null;
       }
 
-      public async void search (string query, string session_id, string[] scopes, SmartScopeResult result_cb,
+      public async void search (string query, string session_id, string[] scopes, string[] disabled_scopes, SmartScopeResult result_cb,
               SmartScopeCategories categories_cb, SmartScopeRecommendations recommend_cb, GLib.Cancellable? cancellable) throws Error
       {
-        var uri = build_search_uri (query, session_id, scopes);
+        var uri = build_search_uri (query, session_id, scopes, disabled_scopes);
         debug ("Dispatching query '%s' to %s", query, uri);
 
         if (search_requests.contains (session_id))
@@ -340,7 +340,7 @@
         metrics.add_found_event (session_id, server_sid, scope_results, timestamp);
       }
 
-      internal string build_search_uri (string query, string session_id, string[] scopes = {})
+      internal string build_search_uri (string query, string session_id, string[] scopes = {}, string[] disabled_scopes = {})
       {
         var sb = new StringBuilder (base_uri);
         sb.append (SEARCH_URI);
@@ -362,9 +362,12 @@
           sb.append ("&added_scopes=");
           sb.append (added_scopes);
         }
-        if (info.removed_scopes.length > 0)
+        if (info.removed_scopes.length > 0 || disabled_scopes.length > 0)
         {
-          var removed_scopes = string.joinv (",", info.removed_scopes);
+          var rscopes = info.removed_scopes;
+          foreach (var id in disabled_scopes)
+            rscopes += id;
+          var removed_scopes = string.joinv (",", rscopes);
           sb.append ("&removed_scopes=");
           sb.append (removed_scopes);
         }

=== modified file 'tests/unit/test-home-scope.vala'
--- tests/unit/test-home-scope.vala	2013-03-22 13:41:46 +0000
+++ tests/unit/test-home-scope.vala	2013-03-22 19:42:24 +0000
@@ -1024,7 +1024,7 @@
 
       int num_results = 0;
       int num_recommend = 0;
-      client.search.begin ("foo", session_id, {"scope3"}, (scope_id, row) => 
+      client.search.begin ("foo", session_id, {"scope3"}, {}, (scope_id, row) => 
           {
             num_results++;
           },
@@ -1158,7 +1158,7 @@
 
       var ml = new MainLoop ();
 
-      client.search.begin ("foo", session_id, {"scope3"}, (scope_id, row) => 
+      client.search.begin ("foo", session_id, {"scope3"}, {}, (scope_id, row) => 
           {
             assert_not_reached ();
           },