Merge lp:~chipaca/ubuntuone-client/fix-u1launch into lp:ubuntuone-client

[John Lenton]

makes ubuntuone-launch work with the new sso (fixes LP:631822). Also, waits for READY before asking for connection (meliorates LP:525743 and LP:518027).

makes ubuntuone-launch work with the new sso (fixes LP:631822). Also, waits for READY before asking for connection (meliorates LP:525743 and LP:518027).

[John Lenton (chipaca)]

oh, forgot to mention, it also does not try to start syncdaemon if file sync is disabled (rather than trying and having syncdaemon come back with "nope")

[Roman Yepishev (rye)]

Traceback (most recent call last):
  File "/usr/bin/ubuntuone-launch", line 38, in <module>
    from ubuntuone.syncdaemon.clientdefs import APP_NAME as SD_APP_NAME
ImportError: No module named clientdefs

Boo!

review: Needs Fixing (fieldtest)

[lp:~chipaca/ubuntuone-client/fix-u1launch]

686. By John Lenton on 2010-09-08

clientdefs is not usually in ubuntuone.syncdaemon :)

[Roman Yepishev (rye)]

I have something in my system that calls syncdaemon early on login - will find it later since that does not look like ubuntuone-launch.

review: Approve (fieldtest)

[lp:~chipaca/ubuntuone-client/fix-u1launch]

687. By John Lenton on 2010-09-09

added a module docstring summarizing what ubuntuone-launch does

[Rodrigo Moya (rodrigo-moya)]

review: Approve

=== modified file 'bin/ubuntuone-launch'
--- bin/ubuntuone-launch	2010-03-31 16:12:39 +0000
+++ bin/ubuntuone-launch	2010-09-09 01:41:11 +0000
@@ -17,11 +17,30 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+"""
+Ubuntu One storage synchronization daemon (syncdaemon) startup helper.
+
+This script decides whether to start and connect syncdaemon.
+
+ * If you've never used Ubuntu One file sync, or if you've disabled
+   file sync via ubuntuone-preferences (or equivalently via setting
+   files_sync_enabled to False in the syncdaemon configuration file),
+   syncdaemon is not started, and nothing happens as a result of this
+   script being run.
+
+ * otherwise if syncdaemon is not already running it is started, and
+   local rescan is allowed to finish.
+
+ * if syncdaemon has never synced to the server, or if there are no
+   credentials for Ubuntu One in the keyring, nothing further happens.
+
+ * otherwise, syncdaemon is asked to connect.
+
+"""
 import sys
 import os
 
-U1ROOT=os.path.expanduser('~/Ubuntu One/')
+U1ROOT = os.path.expanduser('~/Ubuntu One/')
 
 if __name__ == '__main__':
     # this check is done early to speed up startup on people who are not
@@ -33,23 +52,40 @@
 import dbus
 import glib
 import gobject
-import gnomekeyring
 from dbus.mainloop.glib import DBusGMainLoop
 from ubuntuone.syncdaemon.tools import SyncDaemonTool, is_running
+from ubuntuone.clientdefs import APP_NAME as SD_APP_NAME
+from ubuntu_sso.main import SSOCredentials
 from twisted.internet import defer
 
+
 def stage_two(node, sync_daemon_tool):
-    """do the last few checks and ask for a connect if all is ok"""
-    d = None
-    if node['node_id'] is not None:
-        items = gnomekeyring.find_items_sync(
-            gnomekeyring.ITEM_GENERIC_SECRET,
-            {'ubuntuone-realm': 'https://ubuntuone.com'})
-        if items:
+    """Do the last few checks and ask for a connect if all is ok."""
+    # if the node_id of the root node is None, the user has never
+    # connected. Do not connect in that case.
+    if node.get('node_id', '') is None:
+        d = defer.fail(RuntimeError("never connected?"))
+    else:
+        # one last check: avoid having sso pop up asking for creds if
+        # the user deleted them
+
+        # XXX: that this works with None is probably excessive
+        # chumminess with the implementation
+        creds = SSOCredentials(None)
+        if creds.find_credentials(SD_APP_NAME):
             d = sync_daemon_tool.connect()
-    if d is None:
-        d = defer.fail(RuntimeError("bad node"))
-    return d
+        else:
+            d = defer.fail(RuntimeError("no creds"))
+    return d
+
+
+def wait_for_ready(_, sync_daemon_tool):
+    """Wait for syncdaemon to be READY."""
+    d = sync_daemon_tool.wait_for_signal(
+        'StatusChanged',
+        lambda a: a.get('name', '') == 'READY')
+    return d
+
 
 def main():
     """Start syncdaemon and ask it to connect, if possible."""
@@ -58,13 +94,21 @@
     bus = dbus.SessionBus(mainloop=loop)
     sync_daemon_tool = SyncDaemonTool(bus)
 
-    if not is_running():
-        try:
-            d = sync_daemon_tool.start()
-        except dbus.exception.DBusException, e:
-            d = defer.fail(e)
+    if sync_daemon_tool.is_files_sync_enabled():
+        if not is_running():
+            try:
+                # have SD start
+                d = sync_daemon_tool.start()
+                d.addCallback(wait_for_ready, sync_daemon_tool)
+            except dbus.exception.DBusException, e:
+                # some dbus error, shouldn't happen, bail out
+                d = defer.fail(e)
+        else:
+            # SD is already running
+            d = defer.succeed(True)
     else:
-        d = defer.succeed(True)
+        # SD will not start (has been disabled by user)
+        d = defer.fail(RuntimeError("File sync is disabled"))
 
     d.addCallback(lambda _: sync_daemon_tool.get_metadata(U1ROOT))
     d.addCallback(stage_two, sync_daemon_tool)
@@ -74,5 +118,6 @@
     mainloop = glib.MainLoop()
     mainloop.run()
 
+
 if __name__ == '__main__':
     main()