openkylin
/
kylin-system-updater
mirror of https://gitee.com/openkylin/kylin-system-updater.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

添加状态细节信息

This commit is contained in:
wangsong 2021-09-29 14:27:15 +08:00
parent 04f6cc12f1
commit 40308619da
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SystemUpdater/UpdateManager.py
View File

@ -151,7 +151,7 @@ class UpdateManager():
_success,header,desc = self.refresh_cache()
#特殊情况的处理 单独安装包需要直接退出 安装or卸载执行完毕后 还会调到start_available
if _success == True and header == INSTALL_ALONE_PROGRESS:
if _success == False and header == INSTALL_ALONE_PROGRESS:
return
else:
upgrade_list = self.update_list.local_upgrade_list.get('upgrade_groups_list',[]) + self.update_list.local_upgrade_list.get('pkg_important_list',[])
@ -176,7 +176,7 @@ class UpdateManager():
logging.info("groups JSON ConfigPkgs(%s) start upgrading...",self.GROUPS_JSON_PKG)
self.start_install_alone(pkgs_upgrade = [GROUPS_JSON_PKG])
#直接退出
_success = True
_success = False
header = INSTALL_ALONE_PROGRESS
return _success,header,desc
else:
@ -185,7 +185,7 @@ class UpdateManager():
logging.info("groups JSON ConfigPkgs(%s) start new installing...",GROUPS_JSON_PKG)
self.start_install_alone(pkgs_install = [GROUPS_JSON_PKG])
#直接退出
_success = True
_success = False
header = INSTALL_ALONE_PROGRESS
return _success,header,desc
@ -201,7 +201,7 @@ class UpdateManager():
#将软件包卸载 之后进行重新安装here --> purge --> start_available 进行判断是否安装未安装重新安装
self.start_install_alone(pkgs_purge = [GROUPS_JSON_PKG])
#直接退出
_success = True
_success = False
header = INSTALL_ALONE_PROGRESS
return _success,header,desc
@ -216,6 +216,7 @@ class UpdateManager():
logging.info('Emptying the configuration file is complete...')
except Exception as e:
logging.warning(e)
return _success,header,desc
def refresh_cache(self):

14
SystemUpdater/UpdateManagerDbus.py
View File

@ -196,9 +196,9 @@ class UpdateManagerDbusController(dbus.service.Object):
success,upgrade_group,error_string,error_desc)
#升级的进度信息 0~100 进度信息 101为非预期的信号
@dbus.service.signal(INTERFACE,signature='asis')
def UpdateDloadAndInstStaChanged(self,groups_list,progress,status):
logging.info("emit upgrade groups_list = %s progress = %d , status = %s",groups_list,progress,status)
@dbus.service.signal(INTERFACE,signature='asiss')
def UpdateDloadAndInstStaChanged(self,groups_list,progress,status,current_details):
logging.info("emit upgrade groups_list = %s progress = %d , status = %s ,current_details = %s",groups_list,progress,status,current_details)
#升级完成的信号
@dbus.service.signal(INTERFACE,signature='basss')
@ -207,12 +207,12 @@ class UpdateManagerDbusController(dbus.service.Object):
success,upgrade_group, error_string,error_desc)
#发送下载包信息
@dbus.service.signal(INTERFACE, signature='iiiiis')
def UpdateDownloadInfo(self, current_items, total_items, currenty_bytes, total_bytes, current_cps, current_details):
logging.info("emit current_items = %d, total_items = %d, currenty_bytes = %d, total_bytes = %d, current_cps = %d, current_details = %s.",\
@dbus.service.signal(INTERFACE, signature='iiiii')
def UpdateDownloadInfo(self, current_items, total_items, currenty_bytes, total_bytes, current_cps):
logging.info("emit current_items = %d, total_items = %d, currenty_bytes = %d, total_bytes = %d, current_cps = %d",\
current_items, total_items, \
currenty_bytes, total_bytes,\
current_cps, current_details)
current_cps)
# 信号是否可取消
@dbus.service.signal(INTERFACE, signature='b')

6
SystemUpdater/backend/InstallBackendAptdaemon.py
View File

@ -88,7 +88,7 @@ class InstallBackendAptdaemon(InstallBackend):
if action == self.ACTION_UPDATE:
self.window_main.dbusController.UpdateDetectStatusChanged(self.trans_progress,self.trans_status)
else:
self.window_main.dbusController.UpdateDloadAndInstStaChanged(self.now_upgrade_list,self.trans_progress,self.trans_status)
self.window_main.dbusController.UpdateDloadAndInstStaChanged(self.now_upgrade_list,self.trans_progress,self.trans_status,self.details)
#同步状态回调
def _on_status_changed(self, trans, status,action):
@ -99,7 +99,7 @@ class InstallBackendAptdaemon(InstallBackend):
self.window_main.dbusController.UpdateDetectStatusChanged(self.trans_progress,self.trans_status)
else:
#升级的时候发送状态信号时需要上传更新组信息self.upgrade_groups_list
self.window_main.dbusController.UpdateDloadAndInstStaChanged(self.now_upgrade_list,self.trans_progress,self.trans_status)
self.window_main.dbusController.UpdateDloadAndInstStaChanged(self.now_upgrade_list,self.trans_progress,self.trans_status,self.details)
def _on_details_changed(self, trans, details):
self.details = details
@ -113,7 +113,7 @@ class InstallBackendAptdaemon(InstallBackend):
self.window_main.dbusController.UpdateDownloadInfo(\
current_items, total_items, \
currenty_bytes, total_bytes, \
current_cps, self.details)
current_cps)
def _on_cancellable_changed(self, trans, Cancelable):
self.window_main.dbusController.Cancelable(Cancelable)