Merge lp:~unity-api-team/unity-scopes-shell/wait-for-geoip-at-startup into lp:unity-scopes-shell

[Pete Woods]

Wait for location data at startup (with 1 second timeout)

Wait for location data at startup (with 1 second timeout)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/247/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/147/console

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

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/unity-scopes-shell/wait-for-geoip-at-startup]

160. By Paweł Stołowski on 2014-10-15

Don't query all favorite scopes on startup - query only next two scopes following current active. Fixes: 1374481
Approved by: PS Jenkins bot, Marcus Tomlinson

161. By PS Jenkins bot on 2014-10-15

Releasing 0.5.4+14.10.20141015-0ubuntu1

162. By Pete Woods on 2014-10-16

Wait for location data at startup (with 1 second timeout)

163. By Pete Woods on 2014-10-16

Don't wait for location in the longer tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:163
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/249/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/146
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/149

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

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Looks good. Tested a few reboots with the Nearby and Dashboard scopes favorited, and they seem to surface just fine now. Good work!

review: Approve

[Marcus Tomlinson (marcustomlinson)]

Tried again with News and Nearby (As described in the bug), and all looks good. (Tested on mako #91)

=== modified file 'src/Unity/locationservice.h'
--- src/Unity/locationservice.h	2014-07-25 15:30:02 +0000
+++ src/Unity/locationservice.h	2014-10-16 09:00:44 +0000
@@ -49,6 +49,8 @@
 
     virtual unity::scopes::Location location() const = 0;
 
+    virtual bool hasLocation() const = 0;
+
     virtual bool isActive() const = 0;
 
 public Q_SLOTS:

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2014-10-15 10:49:13 +0000
+++ src/Unity/scopes.cpp	2014-10-16 09:00:44 +0000
@@ -87,6 +87,7 @@
 
 int Scopes::LIST_DELAY = -1;
 const int Scopes::SCOPE_DELETE_DELAY = 3;
+const int LOCATION_STARTUP_TIMEOUT = 1000;
 
 class Scopes::Priv : public QObject {
     Q_OBJECT
@@ -290,6 +291,34 @@
         m_cachedMetadata[QString::fromStdString(it->first)] = std::make_shared<unity::scopes::ScopeMetadata>(it->second);
     }
 
+    if (m_locationService->hasLocation() || qEnvironmentVariableIsSet("UNITY_SCOPES_NO_WAIT_LOCATION"))
+    {
+        // If we already have a location just query the scopes now
+        completeDiscoveryFinished();
+    }
+    else
+    {
+        // Otherwise we have to wait for location data
+        // Either the the location data needs to change, or the timeout happens
+        connect(m_locationService.data(), &LocationService::locationChanged,
+                this, &Scopes::completeDiscoveryFinished);
+        connect(&m_startupQueryTimeout, &QTimer::timeout, this,
+                &Scopes::completeDiscoveryFinished);
+        m_startupQueryTimeout.setSingleShot(true);
+        m_startupQueryTimeout.setInterval(LOCATION_STARTUP_TIMEOUT);
+        m_startupQueryTimeout.start();
+    }
+}
+
+void Scopes::completeDiscoveryFinished()
+{
+    // Kill off everything that could potentially trigger the startup queries
+    m_startupQueryTimeout.stop();
+    disconnect(&m_startupQueryTimeout, &QTimer::timeout, this,
+               &Scopes::completeDiscoveryFinished);
+    disconnect(m_locationService.data(), &LocationService::locationChanged,
+               this, &Scopes::completeDiscoveryFinished);
+
     processFavoriteScopes();
     endResetModel();
 

=== modified file 'src/Unity/scopes.h'
--- src/Unity/scopes.h	2014-10-15 13:26:31 +0000
+++ src/Unity/scopes.h	2014-10-16 09:00:44 +0000
@@ -27,6 +27,7 @@
 // Qt
 #include <QList>
 #include <QThread>
+#include <QTimer>
 #include <QStringList>
 #include <QSharedPointer>
 #include <QGSettings>
@@ -86,6 +87,7 @@
     void initPopulateScopes();
     void dpkgFinished();
     void lsbReleaseFinished();
+    void completeDiscoveryFinished();
 
 private:
     void createUserAgentString();
@@ -106,6 +108,7 @@
     bool m_loaded;
 
     LocationService::Ptr m_locationService;
+    QTimer m_startupQueryTimeout;
 
     unity::scopes::Runtime::SPtr m_scopesRuntime;
 

=== modified file 'src/Unity/ubuntulocationservice.cpp'
--- src/Unity/ubuntulocationservice.cpp	2014-09-22 14:53:16 +0000
+++ src/Unity/ubuntulocationservice.cpp	2014-10-16 09:00:44 +0000
@@ -355,6 +355,11 @@
             culss::Interface::Updates::Status::enabled) : false;
 }
 
+bool UbuntuLocationService::hasLocation() const
+{
+    return p->m_result.valid || p->m_locationUpdatedAtLeastOnce;
+}
+
 void UbuntuLocationService::activate()
 {
     Q_EMIT enqueueActivate();

=== modified file 'src/Unity/ubuntulocationservice.h'
--- src/Unity/ubuntulocationservice.h	2014-09-22 14:23:44 +0000
+++ src/Unity/ubuntulocationservice.h	2014-10-16 09:00:44 +0000
@@ -40,6 +40,8 @@
 
     unity::scopes::Location location() const override;
 
+    bool hasLocation() const override;
+
     bool isActive() const override;
 
     void activate() override;

=== modified file 'tests/departmentstest.cpp'
--- tests/departmentstest.cpp	2014-10-15 14:08:09 +0000
+++ tests/departmentstest.cpp	2014-10-16 09:00:44 +0000
@@ -55,6 +55,7 @@
 private Q_SLOTS:
     void initTestCase()
     {
+        qputenv("UNITY_SCOPES_NO_WAIT_LOCATION", "1");
         m_registry.reset(new RegistrySpawner);
     }
 

=== modified file 'tests/resultstest.cpp'
--- tests/resultstest.cpp	2014-10-15 14:08:09 +0000
+++ tests/resultstest.cpp	2014-10-16 09:00:44 +0000
@@ -94,6 +94,7 @@
 private Q_SLOTS:
     void initTestCase()
     {
+        qputenv("UNITY_SCOPES_NO_WAIT_LOCATION", "1");
         m_registry.reset(new RegistrySpawner);
     }