Merge lp:~chipaca/ubuntuone-client/connect-on-startup-maybe into lp:ubuntuone-client

[John Lenton]

Add autostart wrapper for Ubuntu One start-up on log-in

This adds ubuntuone-launch, the fabled, mythical, connect-my-ubuntuone-on-startup helper.

[dobey (dobey)]

Personally, I would avoid using twisted here, as there's no need for it. The glib main loop would suffice.

However, given that the script is poking at the keyring, you should also add the necessary bits to the data files, so that it gets added to the keyring acl when a token is gotten, to avoid popping up the keyring access when the user logs in. But once the keyring acls data is updated here, I'll approve. :)

review: Needs Fixing

[John Lenton (chipaca)]

On Wed, Mar 31, 2010 at 03:20:09PM -0000, Rodney Dawes wrote:
> Review: Needs Fixing
> Personally, I would avoid using twisted here, as there's no need for it. The glib main loop would suffice.
>
> However, given that the script is poking at the keyring, you should also add the necessary bits to the data files, so that it gets added to the keyring acl when a token is gotten, to avoid popping up the keyring access when the user logs in. But once the keyring acls data is updated here, I'll approve. :)

fixed, I think :)

[lp:~chipaca/ubuntuone-client/connect-on-startup-maybe]

465. By John Lenton on 2010-03-31

fixes as per dobey

466. By John Lenton on 2010-03-31

added the directory check straight into the .desktop file

[dobey (dobey)]

review: Approve

[dobey (dobey)]

Oh. Also, the ubuntuone-launch.desktop.in should have Icon=ubuntuone added to it. :)

review: Needs Fixing

[lp:~chipaca/ubuntuone-client/connect-on-startup-maybe]

467. By John Lenton on 2010-03-31

added an icon to the .desktop file

[Joshua Hoover (joshuahoover)]

Approved. Removed ubuntuone-* packages and then installed John's branch (copying bin/ubuntuone-syncdaemon to /usr/libexec/). Restarted and waited 30 seconds. Ran u1sdtool -s and saw I was connected and syncdaemon was doing its thing. Also did the same test without a u1 token and got the expected results: nothing happens. :)

review: Approve (ran branch and verified functionality)

[dobey (dobey)]

review: Approve

[Nicola Larosa (teknico)]

I don't know much about the client's architecture, just a couple Twisted-related comments.

1) Nothing seems to involve Twisted's reactor, are deferreds going to work even without it?

2) I'm not familiar with the idiom of firing a deferred *before* hooking up callbacks and errbacks. It might work, but then why use deferreds at all?

I must be missing something. :-)

[lp:~chipaca/ubuntuone-client/connect-on-startup-maybe]

468. By John Lenton on 2010-03-31

and a blank Comment line to make gnome-session-properties prettier

[Guillermo Gonzalez (verterok)]

Hi,

Nicola,

Deferreds should work without the reactor, and in this case the deferred callback/errback is triggered by a dbus reply/error handler.

John,
/me really likes the inlineCallbacks version

=== modified file 'Makefile.am'
--- Makefile.am	2010-02-04 23:47:35 +0000
+++ Makefile.am	2010-03-31 18:09:30 +0000
@@ -19,6 +19,7 @@
 # Install our scripts and extra data here
 bin_SCRIPTS =				\
 	bin/ubuntuone-preferences	\
+	bin/ubuntuone-launch		\
 	bin/u1sdtool			\
 	bin/u1sync
 

=== added file 'bin/ubuntuone-launch'
--- bin/ubuntuone-launch	1970-01-01 00:00:00 +0000
+++ bin/ubuntuone-launch	2010-03-31 18:09:30 +0000
@@ -0,0 +1,78 @@
+#!/usr/bin/python
+
+# ubuntuone-start - Ubuntu One storage synchronization daemon startup helper
+#
+# Author: John Lenton <[e-mail]>
+#
+# Copyright 2010 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import os
+
+U1ROOT=os.path.expanduser('~/Ubuntu One/')
+
+if __name__ == '__main__':
+    # this check is done early to speed up startup on people who are not
+    # (yet) using the service (this way avoids all the imports).
+    if not os.path.isdir(U1ROOT):
+        # no directory, just quit
+        sys.exit(1)
+
+import dbus
+import glib
+import gobject
+import gnomekeyring
+from dbus.mainloop.glib import DBusGMainLoop
+from ubuntuone.syncdaemon.tools import SyncDaemonTool, is_running
+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:
+            d = sync_daemon_tool.connect()
+    if d is None:
+        d = defer.fail(RuntimeError("bad node"))
+    return d
+
+def main():
+    """Start syncdaemon and ask it to connect, if possible."""
+    gobject.set_application_name("ubuntuone-launch")
+    loop = DBusGMainLoop(set_as_default=True)
+    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)
+    else:
+        d = defer.succeed(True)
+
+    d.addCallback(lambda _: sync_daemon_tool.get_metadata(U1ROOT))
+    d.addCallback(stage_two, sync_daemon_tool)
+    # os._exit feels like it's cheating, but it's simple and fast
+    d.addCallbacks(lambda _: os._exit(0), lambda _: os._exit(1))
+
+    mainloop = glib.MainLoop()
+    mainloop.run()
+
+if __name__ == '__main__':
+    main()

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2010-02-17 17:42:26 +0000
+++ data/Makefile.am	2010-03-31 18:09:30 +0000
@@ -23,6 +23,10 @@
 desktop_in_files = ubuntuone-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_in_files = ubuntuone-launch.desktop.in
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+
 @INTLTOOL_DESKTOP_RULE@
 
 %.conf: %.conf.in
@@ -132,6 +136,7 @@
 	$(config_in_files)	\
 	$(memenu_in_files)	\
 	$(desktop_in_files)     \
+	$(autostart_in_files)     \
 	$(service_in_files)	\
 	$(emblem_in_files)	\
 	$(icon_in_files)	\
@@ -144,6 +149,7 @@
 CLEANFILES =		\
 	$(memenu_DATA)	\
 	$(desktop_DATA) \
+	$(autostart_DATA) \
 	$(service_DATA)	\
 	$(emblem_files)	\
 	hicolor

=== modified file 'data/oauth_registration.d/ubuntuone'
--- data/oauth_registration.d/ubuntuone	2010-03-10 21:11:45 +0000
+++ data/oauth_registration.d/ubuntuone	2010-03-31 18:09:30 +0000
@@ -15,3 +15,9 @@
 consumer_key = ubuntuone
 exe_path = /usr/bin/python
 application_name = ubuntuone-preferences
+
+[launcher]
+realm = https://ubuntuone.com
+consumer_key = ubuntuone
+exe_path = /usr/bin/python
+application_name = ubuntuone-launch

=== added file 'data/ubuntuone-launch.desktop.in'
--- data/ubuntuone-launch.desktop.in	1970-01-01 00:00:00 +0000
+++ data/ubuntuone-launch.desktop.in	2010-03-31 18:09:30 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Ubuntu One
+Exec=/bin/sh -c '[ -d "$HOME/Ubuntu One" ] && ubuntuone-launch'
+Type=Application
+X-GNOME-Autostart-Delay=30
+Icon=ubuntuone
+Comment=