1
=== modified file 'bin/ubuntuone-launch'
2
--- bin/ubuntuone-launch	2010-03-31 16:12:39 +0000
3
+++ bin/ubuntuone-launch	2010-09-09 01:41:11 +0000
4
@@ -17,11 +17,30 @@
5
17
#
17
#
6
18
# You should have received a copy of the GNU General Public License along
18
# You should have received a copy of the GNU General Public License along
7
19
# with this program.  If not, see <http://www.gnu.org/licenses/>.
19
# with this program.  If not, see <http://www.gnu.org/licenses/>.
9
20
20
"""
10
21
Ubuntu One storage synchronization daemon (syncdaemon) startup helper.
11
22
12
23
This script decides whether to start and connect syncdaemon.
13
24
14
25
 * If you've never used Ubuntu One file sync, or if you've disabled
15
26
   file sync via ubuntuone-preferences (or equivalently via setting
16
27
   files_sync_enabled to False in the syncdaemon configuration file),
17
28
   syncdaemon is not started, and nothing happens as a result of this
18
29
   script being run.
19
30
20
31
 * otherwise if syncdaemon is not already running it is started, and
21
32
   local rescan is allowed to finish.
22
33
23
34
 * if syncdaemon has never synced to the server, or if there are no
24
35
   credentials for Ubuntu One in the keyring, nothing further happens.
25
36
26
37
 * otherwise, syncdaemon is asked to connect.
27
38
28
39
"""
29
21
import sys
40
import sys
30
22
import os
41
import os
31
23
42
33
24
U1ROOT=os.path.expanduser('~/Ubuntu One/')
43
U1ROOT = os.path.expanduser('~/Ubuntu One/')
34
25
44
35
26
if __name__ == '__main__':
45
if __name__ == '__main__':
36
27
    # this check is done early to speed up startup on people who are not
46
    # this check is done early to speed up startup on people who are not
37
@@ -33,23 +52,40 @@
38
33
import dbus
52
import dbus
39
34
import glib
53
import glib
40
35
import gobject
54
import gobject
41
36
import gnomekeyring
42
37
from dbus.mainloop.glib import DBusGMainLoop
55
from dbus.mainloop.glib import DBusGMainLoop
43
38
from ubuntuone.syncdaemon.tools import SyncDaemonTool, is_running
56
from ubuntuone.syncdaemon.tools import SyncDaemonTool, is_running
44
57
from ubuntuone.clientdefs import APP_NAME as SD_APP_NAME
45
58
from ubuntu_sso.main import SSOCredentials
46
39
from twisted.internet import defer
59
from twisted.internet import defer
47
40
60
48
61
49
41
def stage_two(node, sync_daemon_tool):
62
def stage_two(node, sync_daemon_tool):
57
42
    """do the last few checks and ask for a connect if all is ok"""
63
    """Do the last few checks and ask for a connect if all is ok."""
58
43
    d = None
64
    # if the node_id of the root node is None, the user has never
59
44
    if node['node_id'] is not None:
65
    # connected. Do not connect in that case.
60
45
        items = gnomekeyring.find_items_sync(
66
    if node.get('node_id', '') is None:
61
46
            gnomekeyring.ITEM_GENERIC_SECRET,
67
        d = defer.fail(RuntimeError("never connected?"))
62
47
            {'ubuntuone-realm': 'https://ubuntuone.com'})
68
    else:
63
48
        if items:
69
        # one last check: avoid having sso pop up asking for creds if
64
70
        # the user deleted them
65
71
66
72
        # XXX: that this works with None is probably excessive
67
73
        # chumminess with the implementation
68
74
        creds = SSOCredentials(None)
69
75
        if creds.find_credentials(SD_APP_NAME):
70
49
            d = sync_daemon_tool.connect()
76
            d = sync_daemon_tool.connect()
74
50
    if d is None:
77
        else:
75
51
        d = defer.fail(RuntimeError("bad node"))
78
            d = defer.fail(RuntimeError("no creds"))
76
52
    return d
79
    return d
77
80
78
81
79
82
def wait_for_ready(_, sync_daemon_tool):
80
83
    """Wait for syncdaemon to be READY."""
81
84
    d = sync_daemon_tool.wait_for_signal(
82
85
        'StatusChanged',
83
86
        lambda a: a.get('name', '') == 'READY')
84
87
    return d
85
88
86
53
89
87
54
def main():
90
def main():
88
55
    """Start syncdaemon and ask it to connect, if possible."""
91
    """Start syncdaemon and ask it to connect, if possible."""
89
@@ -58,13 +94,21 @@
90
58
    bus = dbus.SessionBus(mainloop=loop)
94
    bus = dbus.SessionBus(mainloop=loop)
91
59
    sync_daemon_tool = SyncDaemonTool(bus)
95
    sync_daemon_tool = SyncDaemonTool(bus)
92
60
96
98
61
    if not is_running():
97
    if sync_daemon_tool.is_files_sync_enabled():
99
62
        try:
98
        if not is_running():
100
63
            d = sync_daemon_tool.start()
99
            try:
101
64
        except dbus.exception.DBusException, e:
100
                # have SD start
102
65
            d = defer.fail(e)
101
                d = sync_daemon_tool.start()
103
102
                d.addCallback(wait_for_ready, sync_daemon_tool)
104
103
            except dbus.exception.DBusException, e:
105
104
                # some dbus error, shouldn't happen, bail out
106
105
                d = defer.fail(e)
107
106
        else:
108
107
            # SD is already running
109
108
            d = defer.succeed(True)
110
66
    else:
109
    else:
112
67
        d = defer.succeed(True)
110
        # SD will not start (has been disabled by user)
113
111
        d = defer.fail(RuntimeError("File sync is disabled"))
114
68
112
115
69
    d.addCallback(lambda _: sync_daemon_tool.get_metadata(U1ROOT))
113
    d.addCallback(lambda _: sync_daemon_tool.get_metadata(U1ROOT))
116
70
    d.addCallback(stage_two, sync_daemon_tool)
114
    d.addCallback(stage_two, sync_daemon_tool)
117
@@ -74,5 +118,6 @@
118
74
    mainloop = glib.MainLoop()
118
    mainloop = glib.MainLoop()
119
75
    mainloop.run()
119
    mainloop.run()
120
76
120
121
121
122
77
if __name__ == '__main__':
122
if __name__ == '__main__':
123
78
    main()
123
    main()
Reviewer	Review Type	Date Requested	Status
Rodrigo Moya (community)			Approve on 2010-09-09
Roman Yepishev (community)	fieldtest	2010-09-08	Approve on 2010-09-08
Review via email: mp+34924@code.launchpad.net