Merge lp:~marcustomlinson/unity-scope-youtube/oa_start_timeout into lp:unity-scope-youtube

[Marcus Tomlinson]

Don't hold up the start() method for too long waiting for OA to reply (Timeout after 2s), and updated unity-scopes-api dependancy to version 0.6.7

[Pete Woods (pete-woods)]

Looks good to me!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-16 10:39:19 +0000
+++ CMakeLists.txt	2014-10-13 12:17:24 +0000
@@ -27,7 +27,7 @@
   SCOPE
   glib-2.0
   gio-unix-2.0
-  libunity-scopes>=0.6.6
+  libunity-scopes>=0.6.7
   jsoncpp
   net-cpp>=1.1.0
   process-cpp

=== modified file 'debian/control'
--- debian/control	2014-09-16 11:40:39 +0000
+++ debian/control	2014-10-13 12:17:24 +0000
@@ -15,7 +15,7 @@
                libjsoncpp-dev,
                libnet-cpp-dev (>= 1.1.0),
                libprocess-cpp-dev,
-               libunity-scopes-dev (>= 0.6.6),
+               libunity-scopes-dev (>= 0.6.7),
                pkg-config,
                python-tornado,
 Maintainer: Ubuntu Developers <[e-mail]>

=== modified file 'include/youtube/api/config.h'
--- include/youtube/api/config.h	2014-08-11 10:35:09 +0000
+++ include/youtube/api/config.h	2014-10-13 12:17:24 +0000
@@ -63,7 +63,7 @@
      */
     std::string accept {"application/json"};
 
-    /**
+    /*
      * Have we got access to private APIs?
      */
     bool authenticated = false;

=== modified file 'include/youtube/scope/scope.h'
--- include/youtube/scope/scope.h	2014-09-12 16:29:32 +0000
+++ include/youtube/scope/scope.h	2014-10-13 12:17:24 +0000
@@ -27,6 +27,8 @@
 #include <unity/scopes/ReplyProxyFwd.h>
 #include <unity/scopes/ScopeBase.h>
 
+#include <condition_variable>
+
 namespace youtube {
 
 namespace scope {
@@ -50,6 +52,7 @@
 protected:
     youtube::api::Config::Ptr config_;
     std::mutex config_mutex_;
+    std::condition_variable config_cond_;
     std::shared_ptr<unity::scopes::OnlineAccountClient> oa_client_;
 };
 

=== modified file 'src/youtube/scope/scope.cpp'
--- src/youtube/scope/scope.cpp	2014-09-15 10:12:11 +0000
+++ src/youtube/scope/scope.cpp	2014-10-13 12:17:24 +0000
@@ -63,6 +63,8 @@
     } else {
         cerr << "YouTube scope is authenticated" << endl;
     }
+
+    config_cond_.notify_all();
 }
 
 void Scope::start(string const&) {
@@ -73,12 +75,18 @@
 
     oa_client_.reset(
             new sc::OnlineAccountClient(SCOPE_INSTALL_NAME,
-                    "sharing", "google",
-                    sc::OnlineAccountClient::CreateInternalMainLoop));
+                    "sharing", "google"));
     oa_client_->set_service_update_callback(
             std::bind(&Scope::service_update, this, std::placeholders::_1));
 
-    update_config();
+    // Allow 2 seconds for the callback to initialize config_
+    std::unique_lock<std::mutex> lock(config_mutex_);
+    config_cond_.wait_for(lock, std::chrono::seconds(2), [this] { return config_ != nullptr; });
+    if (config_ == nullptr)
+    {
+        // If the callback was not invoked, default initialize config_
+        config_ = make_shared<Config>();
+    }
 }
 
 void Scope::stop() {