Merge lp:~alexlauni/update-manager/dbus into lp:update-manager

[Alex Launi]

Adds update and upgrade methods to dbus

[Michael Vogt (mvo)]

Thanks, that looks excellent! I'm happy to merge it, but in order to do that I need to ask
you for signing the canonical contributors agreement. Signing the single-page agreement is very easy and is typically done with a single email. For more information about this agreement, look here: http://www.canonical.com/contributors

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2010-11-12 15:55:48 +0000
+++ UpdateManager/UpdateManager.py	2010-12-06 12:09:54 +0000
@@ -1,6 +1,6 @@
 # UpdateManager.py 
 #  
-#  Copyright (c) 2004-2008 Canonical
+#  Copyright (c) 2004-2010 Canonical
 #                2004 Michiel Sikkes
 #                2005 Martin Willemoes Hansen
 #                2010 Mohamed Amine IL Idrissi
@@ -9,6 +9,7 @@
 #          Michael Vogt <[e-mail]>
 #          Martin Willemoes Hansen <[e-mail]>
 #          Mohamed Amine IL Idrissi <[e-mail]>
+#          Alex Launi <[e-mail]>
 # 
 #  This program is free software; you can redistribute it and/or 
 #  modify it under the terms of the GNU General Public License as 
@@ -124,18 +125,45 @@
     dialog.destroy()
 
 
-class UpdateManagerDbusControler(dbus.service.Object):
+class UpdateManagerDbusController(dbus.service.Object):
     """ this is a helper to provide the UpdateManagerIFace """
     def __init__(self, parent, bus_name,
                  object_path='/org/freedesktop/UpdateManagerObject'):
         dbus.service.Object.__init__(self, bus_name, object_path)
         self.parent = parent
+        self.alert_watcher = AlertWatcher ()
+        self.alert_watcher.connect("network-alert", self._on_network_alert)
+        self.connected = False
 
     @dbus.service.method('org.freedesktop.UpdateManagerIFace')
     def bringToFront(self):
         self.parent.window_main.present()
         return True
 
+    @dbus.service.method('org.freedesktop.UpdateManagerIFace')
+    def update(self):
+        try:
+            self.alert_watcher.check_alert_state ()
+            self.parent.invoke_manager(UPDATE)
+            return self.connected
+        except:
+            return False
+
+    @dbus.service.method('org.freedesktop.UpdateManagerIFace')
+    def upgrade(self):
+        try:
+            self.parent.cache.checkFreeSpace()
+            self.parent.invoke_manager(INSTALL)
+            return True
+        except:
+            return False	
+
+    def _on_network_alert(self, watcher, state):
+        if state == NM_STATE_CONNECTED:
+            self.connected = True
+        else:
+            self.connected = False
+
 class UpdateManager(SimpleGtkbuilderApp):
 
   # how many days until u-m warns about manual pressing "check"
@@ -316,7 +344,7 @@
     except dbus.DBusException, e:
          #print "no listening object (%s) "% e
          bus_name = dbus.service.BusName('org.freedesktop.UpdateManager',bus)
-         self.dbusControler = UpdateManagerDbusControler(self, bus_name)
+         self.dbusControler = UpdateManagerDbusController(self, bus_name)
 
 
   def on_checkbutton_reminder_toggled(self, checkbutton):