Merge lp:~nataliabidart/ubuntuone-client/share-autosubscribe into lp:ubuntuone-client

[Natalia Bidart]

- Adding 'share-autosubscribe' config option (part of LP: #708335).

[lp:~nataliabidart/ubuntuone-client/share-autosubscribe]

828. By Natalia Bidart on 2011-02-01

Exposing autosubscribe through dbus.

829. By Natalia Bidart on 2011-02-02

Merged trunk in.

[Martin Albisetti (beuno)]

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'data/syncdaemon.conf'
--- data/syncdaemon.conf	2010-12-10 19:44:18 +0000
+++ data/syncdaemon.conf	2011-02-02 13:09:44 +0000
@@ -64,9 +64,14 @@
 udf_autosubscribe.help = Autosubsribe to new User Defined Folders, 'off' by default. 
                          (accepted values: 1/0, on/off, true/false and yes/no)
 
+share_autosubscribe.default = False
+share_autosubscribe.parser = bool
+share_autosubscribe.help = Autosubsribe to new Shares, 'off' by default. 
+                           (accepted values: 1/0, on/off, true/false and yes/no)
+
 autoconnect.default = True
 autoconnect.parser = bool
-autoconnect.help = Autoconnect the syncdaemon when is ready to start file synchronization against the server, 'on' by default.
+autoconnect.help = Autoconnect the syncdaemon when is ready to start file synchronization against the server, 'on' by default. 
                    (accepted values: 1/0, on/off, true/false and yes/no)
 
 ignore.parser = lines

=== modified file 'tests/platform/linux/test_dbus.py'
--- tests/platform/linux/test_dbus.py	2011-02-01 21:56:19 +0000
+++ tests/platform/linux/test_dbus.py	2011-02-02 13:09:44 +0000
@@ -2377,7 +2377,7 @@
                            error_handler=self.error_handler)
         return d
 
-    def test_autosubscribe_enabled(self):
+    def test_udf_autosubscribe_enabled(self):
         """Test for Config.udf_autosubscribe_enabled."""
         client = self.get_client()
         d = defer.Deferred()
@@ -2400,7 +2400,7 @@
                            error_handler=self.error_handler)
         return d
 
-    def test_enable_autosubscribe(self):
+    def test_enable_udf_autosubscribe(self):
         """Test for Config.enable_udf_autosubscribe."""
         client = self.get_client()
         d = defer.Deferred()
@@ -2413,7 +2413,7 @@
                            error_handler=self.error_handler)
         return d
 
-    def test_disable_autosubscribe(self):
+    def test_disable_udf_autosubscribe(self):
         """Test for Config.disable_udf_autosubscribe."""
         client = self.get_client()
         d = defer.Deferred()
@@ -2426,6 +2426,55 @@
                            error_handler=self.error_handler)
         return d
 
+    def test_share_autosubscribe_enabled(self):
+        """Test for Config.share_autosubscribe_enabled."""
+        client = self.get_client()
+        d = defer.Deferred()
+
+        def reply_handler_disabled(result):
+            """Handle the reply."""
+            self.assertFalse(result)
+            config.get_user_config().set_share_autosubscribe(not result)
+            client.call_method('share_autosubscribe_enabled',
+                               reply_handler=reply_handler_enabled,
+                               error_handler=self.error_handler)
+
+        def reply_handler_enabled(result):
+            """Handle the reply."""
+            self.assertTrue(result)
+            d.callback(True)
+
+        client.call_method('share_autosubscribe_enabled',
+                           reply_handler=reply_handler_disabled,
+                           error_handler=self.error_handler)
+        return d
+
+    def test_enable_share_autosubscribe(self):
+        """Test for Config.enable_share_autosubscribe."""
+        client = self.get_client()
+        d = defer.Deferred()
+        def reply_handler(_):
+            """Handle the reply."""
+            self.assertTrue(config.get_user_config().get_share_autosubscribe())
+            d.callback(True)
+        client.call_method('enable_share_autosubscribe',
+                           reply_handler=reply_handler,
+                           error_handler=self.error_handler)
+        return d
+
+    def test_disable_share_autosubscribe(self):
+        """Test for Config.disable_share_autosubscribe."""
+        client = self.get_client()
+        d = defer.Deferred()
+        def reply_handler(_):
+            """Handle the reply."""
+            self.assertFalse(config.get_user_config().get_share_autosubscribe())
+            d.callback(True)
+        client.call_method('disable_share_autosubscribe',
+                           reply_handler=reply_handler,
+                           error_handler=self.error_handler)
+        return d
+
     def test_autoconnect_enabled(self):
         """Test for Config.autoconnect_enabled."""
         client = self.get_client()

=== modified file 'tests/syncdaemon/test_config.py'
--- tests/syncdaemon/test_config.py	2010-12-10 22:05:40 +0000
+++ tests/syncdaemon/test_config.py	2011-02-02 13:09:44 +0000
@@ -282,6 +282,48 @@
         conf_1 = config._Config(conf_file)
         self.assertEquals(True, conf_1.get_udf_autosubscribe())
 
+    def test_load_share_autosubscribe(self):
+        """Test load/set/override of share_autosubscribe config value."""
+        conf_file = os.path.join(self.test_root,
+                                 'test_share_autosubscribe_config.conf')
+        # write some throttling values to the config file
+        with open(conf_file, 'w') as fp:
+            fp.write('[__main__]\n')
+            fp.write('share_autosubscribe = True\n')
+
+        # keep a original around
+        conf_orig = config._Config(conf_file)
+
+        # load the config
+        conf = config._Config(conf_file)
+        self.assertTrue(conf.get_share_autosubscribe())
+        # change it to False
+        conf.set_share_autosubscribe(False)
+        self.assertFalse(conf.get_share_autosubscribe())
+        # save, load and check
+        conf.save()
+        conf_1 = config._Config(conf_file)
+        self.assertFalse(conf_1.get_share_autosubscribe())
+        # change it to True
+        conf.set_share_autosubscribe(True)
+        self.assertTrue(conf.get_share_autosubscribe())
+        # save, load and check
+        conf.save()
+        conf_1 = config._Config(conf_file)
+        self.assertTrue(conf_1.get_share_autosubscribe())
+
+        # load the config, check the override of the value
+        conf = config._Config(conf_file)
+        self.assertTrue(conf.get_share_autosubscribe())
+        overridden_opts = [('__main__', 'share_autosubscribe', False)]
+        conf.override_options(overridden_opts)
+        self.assertFalse(conf.get_share_autosubscribe())
+        self.assertNotEqual(conf.get_share_autosubscribe(),
+                            conf_orig.get_share_autosubscribe())
+        conf.save()
+        conf_1 = config._Config(conf_file)
+        self.assertEquals(True, conf_1.get_share_autosubscribe())
+
     def test_load_autoconnect(self):
         """Test load/set/override of autoconnect config value."""
         conf_file = os.path.join(self.test_root,

=== modified file 'ubuntuone/platform/linux/dbus_interface.py'
--- ubuntuone/platform/linux/dbus_interface.py	2011-01-21 15:45:16 +0000
+++ ubuntuone/platform/linux/dbus_interface.py	2011-02-02 13:09:44 +0000
@@ -1403,6 +1403,28 @@
         user_config.save()
 
     @dbus.service.method(DBUS_IFACE_CONFIG_NAME,
+                         in_signature='', out_signature='b')
+    def share_autosubscribe_enabled(self):
+        """Return the share_autosubscribe config value."""
+        return config.get_user_config().get_share_autosubscribe()
+
+    @dbus.service.method(DBUS_IFACE_CONFIG_NAME,
+                         in_signature='', out_signature='')
+    def enable_share_autosubscribe(self):
+        """Enable UDF autosubscribe."""
+        user_config = config.get_user_config()
+        user_config.set_share_autosubscribe(True)
+        user_config.save()
+
+    @dbus.service.method(DBUS_IFACE_CONFIG_NAME,
+                         in_signature='', out_signature='')
+    def disable_share_autosubscribe(self):
+        """Enable UDF autosubscribe."""
+        user_config = config.get_user_config()
+        user_config.set_share_autosubscribe(False)
+        user_config.save()
+
+    @dbus.service.method(DBUS_IFACE_CONFIG_NAME,
                          in_signature='b', out_signature='')
     def set_files_sync_enabled(self, enabled):
         """Enable/disable file sync service."""

=== modified file 'ubuntuone/syncdaemon/config.py'
--- ubuntuone/syncdaemon/config.py	2010-12-13 15:49:53 +0000
+++ ubuntuone/syncdaemon/config.py	2011-02-02 13:09:44 +0000
@@ -334,6 +334,14 @@
     def get_udf_autosubscribe(self):
         return self.get_parsed(MAIN, 'udf_autosubscribe')
 
+    @requires_section(MAIN)
+    def set_share_autosubscribe(self, enabled):
+        self.set(MAIN, 'share_autosubscribe', str(enabled))
+
+    @requires_section(MAIN)
+    def get_share_autosubscribe(self):
+        return self.get_parsed(MAIN, 'share_autosubscribe')
+
     # files sync enablement get/set
     @requires_section(MAIN)
     def set_files_sync_enabled(self, enabled):