Make the 1st phase of delayed starts faster

4 files changed, 13 insertions, 4 deletions

diff --git a/TODO b/TODO
index cb183d9..94f2e8c 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,6 @@
 - 0.10
-  * no Packages project
+  * keep user guids after reflasing XOs
+  * F1/F3 will preserve original behaviour to show ~/Activities activities
 
 - (!) Editors' workflows:
   - (?) log all (including editros) posters of particular document to minimize conflicts about why somthing was changed
diff --git a/sugar-network b/sugar-network
index 4fdf588..0c77de5 100755
--- a/sugar-network
+++ b/sugar-network
@@ -323,8 +323,8 @@ class Application(application.Application):
 
         def porcelain_dump(value):
             if type(value) is dict:
-                if len(value) == 1 and 'guid' in value:
-                    porcelain_dump(value['guid'])
+                if len(value) == 1:
+                    porcelain_dump(value.values()[0])
                 else:
                     for i in sorted(value.items()):
                         print '%-18s%s' % i
diff --git a/sugar-network-client b/sugar-network-client
index 2da4030..e2f152e 100755
--- a/sugar-network-client
+++ b/sugar-network-client
@@ -137,6 +137,8 @@ class Application(application.Daemon):
             if client.cache_timeout.value:
                 self.jobs.spawn(self._recycle_cache, routes)
 
+            routes.connect()
+
         def delayed_start(event=None):
             for __ in routes.subscribe(event='delayed-start'):
                 break
diff --git a/sugar_network/client/routes.py b/sugar_network/client/routes.py
index e9df9e1..0ed8593 100644
--- a/sugar_network/client/routes.py
+++ b/sugar_network/client/routes.py
@@ -55,9 +55,15 @@ class ClientRoutes(model.FrontRoutes, implementations.Routes, journal.Routes):
         self._jobs = coroutine.Pool()
         self._no_subscription = no_subscription
         self._server_mode = not api_url
+        self._api_url = api_url
 
         self._got_offline()
+        if not client.delayed_start.value:
+            self.connect()
 
+    def connect(self):
+        if self._inline_job:
+            return
         if self._server_mode:
             mountpoints.connect(_SN_DIRNAME,
                     self._found_mount, self._lost_mount)
@@ -65,7 +71,7 @@ class ClientRoutes(model.FrontRoutes, implementations.Routes, journal.Routes):
             if client.discover_server.value:
                 self._jobs.spawn(self._discover_node)
             else:
-                self._remote_urls.append(api_url)
+                self._remote_urls.append(self._api_url)
             self._jobs.spawn(self._wait_for_connectivity)
 
     def close(self):