Merge lp:~verterok/ubuntuone-client/dbus-quit into lp:ubuntuone-client

[Guillermo Gonzalez]

[r=chipaca, r=dobey] Expose quit via DBus, add --quit option to u1sdtool and quit syncdaemon when the applet quit menu option is clicked

[Guillermo Gonzalez (verterok)]

 Expose quit via Dbus and add --quit option to u1sdtool

[dobey (dobey)]

If you could update the applet to call quit instead of disconnect for the quit menu item callback as well, this would also fix bug #365103.

review: Abstain

[Guillermo Gonzalez (verterok)]

sure, I'll do that

On Wed, May 13, 2009 at 7:17 PM, Rodney Dawes
<email address hidden> wrote:
> Review: Abstain
> If you could update the applet to call quit instead of disconnect for the quit menu item callback as well, this would also fix bug #365103.
> --
> https://code.edge.launchpad.net/~verterok/ubuntuone-client/dbus-quit/+merge/6553
> You are the owner of lp:~verterok/ubuntuone-client/dbus-quit.
>

[Guillermo Gonzalez (verterok)]

After testing this a bit, if I click quit on applet, and the daemon is stopped, it'll started again by nautilus as soon the user open it (via the dbus call).
Maybe the nautilus plugin should support an "stooped" daemon?

[Guillermo Gonzalez (verterok)]

 Expose quit via Dbus and add --quit option to u1sdtool and quit syncdaemon when the applet quit menu option is clicked.

[John Lenton (chipaca)]

excellent.

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'bin/u1sdtool'
--- bin/u1sdtool	2009-05-13 15:33:22 +0000
+++ bin/u1sdtool	2009-05-13 19:58:44 +0000
@@ -26,6 +26,7 @@
 import warnings
 
 from canonical.ubuntuone.storage.syncdaemon.tools import SyncDaemonTool
+from canonical.ubuntuone.storage.syncdaemon.dbus_interface import DBUS_IFACE_NAME
 from dbus.mainloop.glib import DBusGMainLoop
 from optparse import OptionParser
 from twisted.internet import reactor
@@ -35,7 +36,7 @@
     usage = "Usage: %prog [option]"
     parser = OptionParser(usage=usage)
     parser.add_option("-w", "--wait", dest="wait", action="store_true",
-                      help="Wait until SyncDaemon reachs nirvana")
+                      help="Wait until ubuntuone-syncdaemon reachs nirvana")
     parser.add_option("", "--accept-share", dest="accept_share",
                       metavar="SHARE_ID",
                       help="accept the share with the specified id")
@@ -62,6 +63,8 @@
     parser.add_option("", "--current-transfers", dest="current_transfers", 
                       action="store_true",
                       help=" show the current uploads and downloads")
+    parser.add_option("-q", "--quit", dest="quit", action='store_true',
+                      help="shutdown the syncdaemon")
 
     (options, args) = parser.parse_args(argv)
 
@@ -72,7 +75,7 @@
     if options.wait:
         def callback(result):
             """ wait_for_nirvana callback (stop the reactor and exit)"""
-            print "\nSyncDaemon became a fully enlightened Buddha!"
+            print "\nubuntuone-syncdaemon became a fully enlightened Buddha!"
 
         d = sync_daemon_tool.wait_for_nirvana(verbose=True)
         d.addCallbacks(callback)
@@ -154,6 +157,15 @@
         d.addCallback(show_uploads)
         d.addCallback(lambda _: sync_daemon_tool.get_current_downloads())
         d.addCallback(show_downloads)
+    elif options.quit:
+        d = sync_daemon_tool.quit()
+        def shutdown_check(result):
+            if result is None and \
+               DBUS_IFACE_NAME in bus.list_names():
+                print "ubuntuone-syncdaemon stopped"
+            else:
+                print "ubuntuone-syncdaemon still running."
+        d.addBoth(shutdown_check)
     else:
         parser.print_help()
         sys.exit(0)

=== modified file 'bin/ubuntuone-client-applet'
--- bin/ubuntuone-client-applet	2009-05-13 18:57:52 +0000
+++ bin/ubuntuone-client-applet	2009-05-14 15:04:58 +0000
@@ -479,7 +479,7 @@
                               button, timestamp, icon)
 
       def __quit_applet(self, menuitem, data=None):
-            """Disconnects the daemon and closes the applet."""
+            """Quit the daemon and closes the applet."""
             def handler():
                   """Simple handler to make dbus do stuff async."""
                   pass
@@ -487,7 +487,7 @@
             try:
                   client = self.__bus.get_object(DBUS_IFACE_NAME, "/")
                   iface = dbus.Interface(client, DBUS_IFACE_SYNC_NAME)
-                  iface.disconnect(reply_handler=handler, error_handler=handler)
+                  iface.quit(reply_handler=handler, error_handler=handler)
             except DBusException:
                   pass
 

=== modified file 'bin/ubuntuone-syncdaemon'
--- bin/ubuntuone-syncdaemon	2009-05-12 13:36:05 +0000
+++ bin/ubuntuone-syncdaemon	2009-05-14 15:04:58 +0000
@@ -140,9 +140,6 @@
         signal.signal(signal.SIGINT, handler)
 
     reactor.callWhenRunning(install_handlers)
-    # manually call connect(), this call is going to executed via DBus
-    # by the applet
-    reactor.callLater(1, main.dbus_iface.sync.connect)
     # set the application name
     gobject.set_application_name('ubuntuone-syncdaemon')
     reactor.run()

=== modified file 'canonical/ubuntuone/storage/syncdaemon/dbus_interface.py'
--- canonical/ubuntuone/storage/syncdaemon/dbus_interface.py	2009-05-13 13:38:20 +0000
+++ canonical/ubuntuone/storage/syncdaemon/dbus_interface.py	2009-05-13 19:58:44 +0000
@@ -369,6 +369,15 @@
         items = [(mdobj.share_id, mdobj.node_id, "")]
         self.dbus_iface.action_queue.query(items)
 
+    @dbus.service.method(DBUS_IFACE_SYNC_NAME,
+                         in_signature='', out_signature='',
+                         async_callbacks=('reply_handler', 'error_handler'))
+    def quit(self, reply_handler=None, error_handler=None):
+        """ shutdown the syncdaemon. """
+        self.dbus_iface.log.debug('Quit requested')
+        if reply_handler:
+            reply_handler()
+        self.dbus_iface.quit()
 
 class FileSystem(DBusExposedObject):
     """ A dbus interface to the FileSystem Manager. """
@@ -645,3 +654,7 @@
         """ Push the SYS_DISCONNECT event. """
         self.event_queue.push('SYS_DISCONNECT')
 
+    def quit(self):
+        """ calls Main.quit. """
+        self.log.debug('Calling Main.quit')
+        self.main.quit()

=== modified file 'docs/man/u1sdtool.1'
--- docs/man/u1sdtool.1	2009-05-13 15:33:22 +0000
+++ docs/man/u1sdtool.1	2009-05-13 19:58:44 +0000
@@ -34,6 +34,9 @@
 .br
 .B u1sdtool
 \-\-current-transfers
+.br
+.B u1sdtool
+\-\-quit
 
 .SH DESCRIPTION
 u1sdtool is a command line command line utility for controlling 
@@ -46,7 +49,7 @@
 .SH OPTIONS
 .TP
 \fB\-\-wait\fR
-Wait until SyncDaemon reaches nirvana (no more events, uploads and/or downloads)
+Wait until ubuntuone-syncdaemon reachs nirvana
 .TP
 \fB\-\-accept-share\fR=\fISHARE_ID\fR
 accept the share with the specified id
@@ -108,6 +111,10 @@
 .TP
 \fB\-\-current-transfers\fR
 Show the current uploads and downloads
+.TP
+\fB\-\-quit
+shutdown ubuntuone-syncdaemon
+
 .SH AUTHOR
 This manual page was written by Guillermo Gonzalez <[e-mail]>.
 

=== modified file 'tests/syncdaemon/test_dbus.py'
--- tests/syncdaemon/test_dbus.py	2009-05-13 13:38:20 +0000
+++ tests/syncdaemon/test_dbus.py	2009-05-13 19:58:44 +0000
@@ -512,6 +512,23 @@
                            error_handler=self.error_handler)
         return d
 
+    def test_quit(self):
+        """ test the quit exposed method. """
+        client = DBusClient(self.bus, '/', DBUS_IFACE_SYNC_NAME)
+        d = defer.Deferred()
+        # helper functions, we need to call quit but don't quit
+        # pylint: disable-msg=C0111,W0601,W0602
+        def fake_quit():
+            pass
+        self.main.quit = fake_quit
+        def handler(result):
+            d.callback(True)
+        d.addCallback(lambda result: self.assertTrue(result))
+        client.call_method('quit',
+                           reply_handler=handler,
+                           error_handler=self.error_handler)
+        return d
+
 
 class DBusInterfaceUnicodeTests(DBusTwistedTestCase):
     """ Unicode variant of basic tests to the objects exposed with D-Bus"""