Merge lp:~marcustomlinson/unity-scopes-api/invalidate_on_sss_scopes into lp:unity-scopes-api/devel

[Marcus Tomlinson]

Send an invalidation signal when the smart scopes become available.

[Michal Hruby (mhr3)]

Can we please send the signal only when something changes?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:280
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/293/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-amd64-ci/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-ci/293/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-i386-ci/293/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/293/rebuild

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-scopes-api/invalidate_on_sss_scopes]

281. By Marcus Tomlinson on 2014-03-19

Send signal only when something changes with the remote scopes

282. By Marcus Tomlinson on 2014-03-19

Oops, removed unused method from header

[Michal Hruby (mhr3)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/294/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-amd64-ci/295
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-ci/294
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-ci/294/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-i386-ci/294

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/294/rebuild

review: Approve (continuous-integration)

=== modified file 'src/scopes/internal/smartscopes/SmartScopesClient.cpp'
--- src/scopes/internal/smartscopes/SmartScopesClient.cpp	2014-03-07 04:00:11 +0000
+++ src/scopes/internal/smartscopes/SmartScopesClient.cpp	2014-03-19 14:50:06 +0000
@@ -36,6 +36,8 @@
 static const std::string c_scopes_cache_dir = std::string(getenv("HOME")) + "/.cache/unity-scopes/";
 static const std::string c_scopes_cache_filename = "remote-scopes.json";
 
+static const char* c_dbussend_cmd = "dbus-send /com/canonical/unity/scopes com.canonical.unity.scopes.InvalidateResults string:smart-scopes";
+
 using namespace unity::scopes;
 using namespace unity::scopes::internal::smartscopes;
 
@@ -609,6 +611,12 @@
 
 void SmartScopesClient::write_cache(std::string const& scopes_json)
 {
+    if (scopes_json != cached_scopes_)
+    {
+        // something has changed, send invalidate signal
+        system(c_dbussend_cmd);
+    }
+
     // make cache directory (fails silently if already exists)
     mkdir(c_scopes_cache_dir.c_str(), 0755);
 
@@ -620,7 +628,8 @@
         cache_file << scopes_json;
         cache_file.close();
 
-        have_latest_cache_ = false;
+        cached_scopes_ = scopes_json;
+        have_latest_cache_ = true;
     }
 }