Merge lp:~andrea.corbellini/ubuntuone-client/fix-1068006 into lp:ubuntuone-client

[Andrea Corbellini]

This is an attempt to fix bug #1068006.

My solution is to use ubuntuone.syncdaemon.config inside ubuntuone-launch. An alternative solution would be to construct an ad-hoc config parser for ubuntuone-launch that just looks for the value of root_dir, without parsing the whole file. This would be a bit faster, but way too complex to maintain, in my opinion.

[dobey (dobey)]

This will need tests for the added methods in ubuntuone.syncdaemon.config. They'll go in tests/syncdaemon/test_config.py where the tests for the other methods in that module are.

Also, please use bzr commit --fixes=lp:1068006 to link the bug into the branch history. The linking of bugs/branches in the LP web interface is not functionally the same. Thanks.

review: Needs Fixing

[dobey (dobey)]

Andrea, can you please add the necessary tests, and use bzr commit --fixes to link the bug? Thanks.

[dobey (dobey)]

Rejecting, due to no response.

[Andrea Corbellini (andrea.corbellini)]

Sorry, I've been busy. I will resubmit as soon as I write the tests. Thanks for your patience!

Unmerged revisions

1365. By Andrea Corbellini on 2012-12-14

ubuntuone-launch now checks the value of root_dir instead of guessing

1364. By Andrea Corbellini on 2012-12-14

Add get/set methods for root_dir in the _Config class

=== modified file 'bin/ubuntuone-launch'
--- bin/ubuntuone-launch	2012-10-15 20:12:29 +0000
+++ bin/ubuntuone-launch	2012-12-14 15:31:21 +0000
@@ -52,14 +52,15 @@
 """
 import sys
 import os
-
-U1ROOT = os.path.expanduser('~/Ubuntu One/')
+from ubuntuone.syncdaemon.config import get_user_config
 
 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
+    # (yet) using the service (this way avoids most of the imports).
+    config = get_user_config()
+    if (not config.get_files_sync_enabled() or
+        not os.path.isdir(config.get_root_dir())):
+        # SD disabled by user or no directory, just quit
         sys.exit(1)
 
 import dbus
@@ -68,7 +69,6 @@
 from gi.repository import GLib
 from twisted.internet import defer
 
-from ubuntuone.syncdaemon.config import get_user_config
 from ubuntuone.platform.tools import SyncDaemonTool, is_already_running
 
 
@@ -77,11 +77,6 @@
     """Start syncdaemon and ask it to connect, if possible."""
     GLib.set_application_name("ubuntuone-launch")
 
-    files_sync_enabled = get_user_config().get_files_sync_enabled()
-    if not files_sync_enabled:
-        # SD will not start (has been disabled by user)
-        raise RuntimeError("File sync is disabled")
-
     loop = DBusGMainLoop(set_as_default=True)
     bus = dbus.SessionBus(mainloop=loop)
     sync_daemon_tool = SyncDaemonTool(bus)

=== modified file 'ubuntuone/syncdaemon/config.py'
--- ubuntuone/syncdaemon/config.py	2012-10-17 06:14:38 +0000
+++ ubuntuone/syncdaemon/config.py	2012-12-14 15:31:21 +0000
@@ -413,6 +413,14 @@
         self.set(MAIN, 'use_trash', str(enabled))
 
     @requires_section(MAIN)
+    def get_root_dir(self):
+        return self.get_parsed(MAIN, 'root_dir')
+
+    @requires_section(MAIN)
+    def set_root_dir(self, value):
+        self.set(MAIN, 'root_dir', str(value))
+
+    @requires_section(MAIN)
     def get_simult_transfers(self):
         """Get the simultaneous transfers value."""
         return self.get_parsed(MAIN, 'simult_transfers')