Merge lp:~mhr3/unity-scopes-shell/fix-1305147 into lp:unity-scopes-shell

[Michal Hruby]

Handle scope uris.

Handle scope uris.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:88
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/95/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-trusty-amd64-ci/95/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-trusty-armhf-ci/95/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-trusty-i386-ci/95/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/95/rebuild

review: Needs Fixing (continuous-integration)

[Pete Woods (pete-woods)]

LGTM

review: Approve

[Michal Hruby (mhr3)]

Sigh, the CI job wasn't updated to build against U. :(

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-04-08 10:06:42 +0000
+++ src/Unity/scope.cpp	2014-04-30 17:24:07 +0000
@@ -164,7 +164,7 @@
             Q_EMIT previewRequested(QVariant::fromValue(result));
             break;
          case scopes::ActivationResponse::PerformQuery:
-            processPerformQuery(response, true);
+            executeCannedQuery(response->query(), true);
             break;
         default:
             break;
@@ -176,7 +176,13 @@
     std::shared_ptr<scopes::ActivationResponse> response;
     response.swap(m_delayedActivation);
 
-    processPerformQuery(response, false);
+    if (!response) {
+        return;
+    }
+
+    if (response->status() == scopes::ActivationResponse::PerformQuery) {
+        executeCannedQuery(response->query(), false);
+    }
 }
 
 void Scope::internetFlagChanged(QString const& key)
@@ -188,7 +194,7 @@
     invalidateResults();
 }
 
-void Scope::processPerformQuery(std::shared_ptr<scopes::ActivationResponse> const& response, bool allowDelayedActivation)
+void Scope::executeCannedQuery(unity::scopes::CannedQuery const& query, bool allowDelayedActivation)
 {
     scopes_ng::Scopes* scopes = qobject_cast<scopes_ng::Scopes*>(parent());
     if (scopes == nullptr) {
@@ -196,37 +202,30 @@
         return;
     }
 
-    if (!response) {
-        return;
-    }
-
-    if (response->status() == scopes::ActivationResponse::PerformQuery) {
-        scopes::CannedQuery q(response->query());
-        QString scopeId(QString::fromStdString(q.scope_id()));
-        QString searchString(QString::fromStdString(q.query_string()));
-        // figure out if this scope is already favourited
-        Scope* scope = scopes->getScopeById(scopeId);
-        if (scope != nullptr) {
-            // TODO: change department, filters, query_string?
+    QString scopeId(QString::fromStdString(query.scope_id()));
+    QString searchString(QString::fromStdString(query.query_string()));
+    // figure out if this scope is already favourited
+    Scope* scope = scopes->getScopeById(scopeId);
+    if (scope != nullptr) {
+        // TODO: change department, filters?
+        scope->setSearchQuery(searchString);
+        Q_EMIT gotoScope(scopeId);
+    } else {
+        // create temp dash page
+        auto meta_sptr = scopes->getCachedMetadata(scopeId);
+        if (meta_sptr) {
+            scope = new scopes_ng::Scope(this);
+            scope->setScopeData(*meta_sptr);
             scope->setSearchQuery(searchString);
-            Q_EMIT gotoScope(scopeId);
+            m_tempScopes.insert(scope);
+            Q_EMIT openScope(scope);
+        } else if (allowDelayedActivation) {
+            // request registry refresh to get the missing metadata
+            m_delayedActivation = std::make_shared<scopes::ActivationResponse>(query);
+            QObject::connect(scopes, &Scopes::metadataRefreshed, this, &Scope::metadataRefreshed);
+            scopes->refreshScopeMetadata();
         } else {
-            // create temp dash page
-            auto meta_sptr = scopes->getCachedMetadata(scopeId);
-            if (meta_sptr) {
-                scope = new scopes_ng::Scope(this);
-                scope->setScopeData(*meta_sptr);
-                scope->setSearchQuery(searchString);
-                m_tempScopes.insert(scope);
-                Q_EMIT openScope(scope);
-            } else if (allowDelayedActivation) {
-                // request registry refresh to get the missing metadata
-                m_delayedActivation = response;
-                QObject::connect(scopes, &Scopes::metadataRefreshed, this, &Scope::metadataRefreshed);
-                scopes->refreshScopeMetadata();
-            } else {
-                qWarning("Unable to find scope \"%s\" after metadata refresh", q.scope_id().c_str());
-            }
+            qWarning("Unable to find scope \"%s\" after metadata refresh", query.scope_id().c_str());
         }
     }
 }
@@ -572,7 +571,7 @@
        Qt to open the uri.
     */
     QUrl url(uri);
-    if (url.scheme() == "application") {
+    if (url.scheme() == QLatin1String("application")) {
         QString path(url.path().isEmpty() ? url.authority() : url.path());
         if (path.startsWith("/")) {
             Q_FOREACH(const QString &dir, QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation)) {
@@ -585,6 +584,14 @@
         }
 
         Q_EMIT activateApplication(QFileInfo(path).completeBaseName());
+    } else if (url.scheme() == QLatin1String("scope")) {
+        qDebug() << "Got scope URI" << uri;
+        try {
+            scopes::CannedQuery q(scopes::CannedQuery::from_uri(uri.toStdString()));
+            executeCannedQuery(q, true);
+        } catch (...) {
+            qWarning("Unable to parse scope uri!");
+        }
     } else {
         qDebug() << "Trying to open" << uri;
         /* Try our luck */
 
=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2014-04-07 16:55:52 +0000
+++ src/Unity/scope.h	2014-04-30 17:24:07 +0000
@@ -134,7 +134,7 @@
 
 private:
     void processSearchChunk(PushEvent* pushEvent);
-    void processPerformQuery(std::shared_ptr<unity::scopes::ActivationResponse> const& response, bool allowDelayedActivation);
+    void executeCannedQuery(unity::scopes::CannedQuery const& query, bool allowDelayedActivation);
 
     void processResultSet(QList<std::shared_ptr<unity::scopes::CategorisedResult>>& result_set);
     void dispatchSearch();
 
=== modified file 'tests/data/mock-scope/mock-scope.cpp'
--- tests/data/mock-scope/mock-scope.cpp	2014-03-31 11:33:21 +0000
+++ tests/data/mock-scope/mock-scope.cpp	2014-04-30 17:24:07 +0000
@@ -156,6 +156,15 @@
             res.set_intercept_activation();
             reply->push(res);
         }
+        else if (query_ == "scope-uri")
+        {
+            CategoryRenderer minimal_rndr(R"({"schema-version": 1, "components": {"title": "title"}})");
+            auto cat = reply->register_category("cat1", "Category 1", "", minimal_rndr);
+            CategorisedResult res(cat);
+            res.set_uri("scope://mock-scope?q=next-scope-uri");
+            res.set_title("result for: \"" + query_ + "\"");
+            reply->push(res);
+        }
         else if (query_ == "two-categories")
         {
             auto cat1 = reply->register_category("cat1", "Category 1", "");
 
=== modified file 'tests/resultstest-ng.cpp'
--- tests/resultstest-ng.cpp	2014-04-04 15:07:05 +0000
+++ tests/resultstest-ng.cpp	2014-04-30 17:24:07 +0000
@@ -779,7 +779,23 @@
         QCOMPARE(spy3.count(), 0);
     }
 
+    void testScopeResultWithScopeUri()
+    {
+        performSearch(m_scope, QString("scope-uri"));
+
+        unity::scopes::Result::SPtr result;
+        QVERIFY(getFirstResult(m_scope, result));
+
+        QSignalSpy spy(m_scope, SIGNAL(gotoScope(QString)));
+        m_scope->activate(QVariant::fromValue(result));
+        // this is likely to be invoked synchronously
+        if (spy.count() == 0) {
+            QVERIFY(spy.wait());
+        }
+        QVERIFY(spy.count() > 0);
+    }
+
 };
 
-QTEST_MAIN(ResultsTestNg)
+QTEST_GUILESS_MAIN(ResultsTestNg)
 #include <resultstest-ng.moc>
 
=== modified file 'tests/utilstest-ng.cpp'
--- tests/utilstest-ng.cpp	2014-03-25 16:34:26 +0000
+++ tests/utilstest-ng.cpp	2014-04-30 17:24:07 +0000
@@ -110,5 +110,5 @@
     }
 };
 
-QTEST_MAIN(UtilsTestNg)
+QTEST_GUILESS_MAIN(UtilsTestNg)
 #include <utilstest-ng.moc>