信号整理

UpdateManager/UpdateManager.py

@@ -240,7 +240,7 @@ class UpdateManager():
             desc = _("important.list list is empty")
 
         #发送更新升级列表完成的标志
-        self.dbusController.UpdateDetectFinished(_success,self.update_list.output_upgrade_list,header,desc)
+        self.dbusController.update_finished_signal(_success,self.update_list.output_upgrade_list,header,desc)
 
     def _setup_dbus(self):
         """ this sets up a dbus listener if none is installed already """

UpdateManager/UpdateManagerDbus.py

@@ -57,7 +57,7 @@ class UpdateManagerDbusController(dbus.service.Object):
 
     #更新的dbus
     @dbus.service.method(INTERFACE)
-    def UpdateDetect(self):
+    def update(self):
         try:
             #处于更新和升级中的话 不进行更新
             if self.parent.is_updating or self.parent.is_upgrading:
@@ -70,9 +70,9 @@ class UpdateManagerDbusController(dbus.service.Object):
         except Exception:
             return False
     
-    #升级的dbus
+    #全部升级
     @dbus.service.method(INTERFACE)
-    def UpgradeSystem(self):
+    def all_upgrade(self):
         try:
             #处于更新和升级中的话 不进行升级
             if self.parent.is_updating or self.parent.is_upgrading:
@@ -84,35 +84,18 @@ class UpdateManagerDbusController(dbus.service.Object):
                 return True
         except Exception:
             return False
+    
+    #部分升级
+    @dbus.service.method(INTERFACE)
+    def partial_upgrade(self):
+        pass
+    
     #更新和升级的进度信息 0~100 进度信息 101为非预期的信号
     @dbus.service.signal(INTERFACE,signature='is')
-    def UpdateDetectStatusChanged(self,progress,status):
+    def update_progress_signal(self,progress,status):
         logging.info("emit progress = %d , status = %s",progress,status)
     
     @dbus.service.signal(INTERFACE,signature='basss')
-    def UpdateDetectFinished(self, success, data,error_string='',error_desc='',):
+    def update_finished_signal(self, success, data,error_string='',error_desc='',):
         logging.info("emit success = %r , data = %a, error_string = %s , error_desc = %s ",success,data, error_string,error_desc)
         pass
-
-    #信号 发射更新和升级的状态
-    @dbus.service.signal(INTERFACE, signature='s')
-    def status_changed_signal(self, message):
-        pass
-    
-    '''
-        执行完毕的信号
-        输入
-        action 表示更新或者安装0更新 1安装
-                ACTION_UPDATE = 0   
-                ACTION_INSTALL = 1
-                ACTION_UPDATE_LIST = 2
-
-        success True成功 and False失败
-        error_string 错误的结果
-        error_desc 产生的原因
-    '''
-    @dbus.service.signal(INTERFACE,signature='ibss')
-    def on_finished_signal(self,action, success, error_string='',error_desc=''):
-        logging.info("emit action = %d , success = %r , error_string = %s , error_desc = %s",action,success, error_string,error_desc)
-        pass
-    

UpdateManager/backend/InstallBackendAptdaemon.py

@@ -90,11 +90,11 @@ class InstallBackendAptdaemon(InstallBackend):
 
     def _on_progress_changed(self, trans, progress):
         self.trans_progress = progress
-        self.window_main.dbusController.UpdateDetectStatusChanged(self.trans_progress,self.trans_status)
+        self.window_main.dbusController.update_progress_signal(self.trans_progress,self.trans_status)
 
     def _on_status_changed(self, trans, status):
         self.trans_status = status
-        self.window_main.dbusController.UpdateDetectStatusChanged(self.trans_progress,self.trans_status)
+        self.window_main.dbusController.update_progress_signal(self.trans_progress,self.trans_status)
 
     def _on_details_changed(self, trans, details):
         logging.info(details)
@@ -197,7 +197,7 @@ class InstallBackendAptdaemon(InstallBackend):
                 trans_failed = True
                 error_desc = error_desc + "\n" + self.trans_failed_msg
         is_success = (status == EXIT_SUCCESS)
-        
+
         try:
             self._action_done(action,
                               authorized=True, success=is_success,

UpdateManager/backend/__init__.py

@@ -95,9 +95,9 @@ class InstallBackend():
                 self.window_main.start_available()
             elif error_string or error_desc:
                 logging.warning(error_string + error_desc)
-                self.window_main.dbusController.UpdateDetectFinished(success,[],error_string,error_desc)
+                self.window_main.dbusController.update_finished_signal(success,[],error_string,error_desc)
             else:
-                self.window_main.dbusController.UpdateDetectFinished(success,[],'','')
+                self.window_main.dbusController.update_finished_signal(success,[],'','')
 
 # try aptdaemon
 if os.path.exists("/usr/sbin/aptd") \