spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-09 00:34:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

AsyncAction refactoting

Browse Source
This commit is contained in:
Vinicius Moreira
2019-08-20 19:21:19 -03:00
parent 640c98d6a8
commit f46745f472
3 changed files with 76 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bauh/core/controller.py
View File

@@ -3,7 +3,7 @@ from threading import Thread
from typing import List, Dict from typing import List, Dict
from bauh_api.abstract.controller import ApplicationManager from bauh_api.abstract.controller import ApplicationManager
from bauh_api.abstract.handler import ProcessHandler from bauh_api.abstract.handler import ProcessWatcher
from bauh_api.abstract.model import Application, ApplicationUpdate, ApplicationHistory from bauh_api.abstract.model import Application, ApplicationUpdate, ApplicationHistory
from bauh_api.util.disk import DiskCacheLoader from bauh_api.util.disk import DiskCacheLoader
from bauh_api.util.disk import DiskCacheLoaderFactory from bauh_api.util.disk import DiskCacheLoaderFactory
@@ -120,7 +120,7 @@ class GenericApplicationManager(ApplicationManager):
return installed return installed
def downgrade_app(self, app: Application, root_password: str, handler: ProcessHandler) -> bool: def downgrade_app(self, app: Application, root_password: str, handler: ProcessWatcher) -> bool:
man = self._get_manager_for(app) man = self._get_manager_for(app)
if man and app.can_be_downgraded(): if man and app.can_be_downgraded():
@@ -134,19 +134,19 @@ class GenericApplicationManager(ApplicationManager):
if man: if man:
return man.clean_cache_for(app) return man.clean_cache_for(app)
def update(self, app: Application, root_password: str, handler: ProcessHandler) -> bool: def update(self, app: Application, root_password: str, handler: ProcessWatcher) -> bool:
man = self._get_manager_for(app) man = self._get_manager_for(app)
if man: if man:
return man.update(app, root_password, handler) return man.update(app, root_password, handler)
def uninstall(self, app: Application, root_password: str, handler: ProcessHandler) -> bool: def uninstall(self, app: Application, root_password: str, handler: ProcessWatcher) -> bool:
man = self._get_manager_for(app) man = self._get_manager_for(app)
if man: if man:
return man.uninstall(app, root_password, handler) return man.uninstall(app, root_password, handler)
def install(self, app: Application, root_password: str, handler: ProcessHandler) -> bool: def install(self, app: Application, root_password: str, handler: ProcessWatcher) -> bool:
man = self._get_manager_for(app) man = self._get_manager_for(app)
if man: if man:
@@ -187,13 +187,13 @@ class GenericApplicationManager(ApplicationManager):
if man: if man:
return man.requires_root(action, app) return man.requires_root(action, app)
def refresh(self, app: Application, root_password: str) -> SystemProcess: def refresh(self, app: Application, root_password: str, watcher: ProcessWatcher) -> bool:
self._wait_to_be_ready() self._wait_to_be_ready()
man = self._get_manager_for(app) man = self._get_manager_for(app)
if man: if man:
return man.refresh(app, root_password) return man.refresh(app, root_password, watcher)
def _prepare(self): def _prepare(self):
if self.managers: if self.managers:

160
bauh/view/qt/thread.py
View File

@@ -5,58 +5,27 @@ from typing import List
import requests import requests
from PyQt5.QtCore import QThread, pyqtSignal from PyQt5.QtCore import QThread, pyqtSignal
from bauh_api.abstract.controller import ApplicationManager from bauh_api.abstract.controller import ApplicationManager
from bauh_api.abstract.handler import ProcessHandler from bauh_api.abstract.handler import ProcessWatcher
from bauh_api.abstract.model import ApplicationStatus from bauh_api.abstract.model import ApplicationStatus
from bauh_api.exception import NoInternetException from bauh_api.exception import NoInternetException
from bauh_api.util.cache import Cache from bauh_api.util.cache import Cache
from bauh_api.util.system import SystemProcess
from bauh.view.qt.view_model import ApplicationView from bauh.view.qt.view_model import ApplicationView
class AsyncAction(QThread, ProcessHandler): class AsyncAction(QThread, ProcessWatcher):
signal_confirmation = pyqtSignal(dict) signal_output = pyqtSignal(str) # print messages to the terminal widget
signal_confirmation = pyqtSignal(dict) # asks the users to confirm something
signal_finished = pyqtSignal(object) # informs the main window that the action has finished
signal_error = pyqtSignal(dict) # asks the GUI to show an error popup
signal_status = pyqtSignal(str) # changes the GUI status message
def __init__(self): def __init__(self):
super(AsyncAction, self).__init__() super(AsyncAction, self).__init__()
self.wait_confirmation = False self.wait_confirmation = False
self.confirmation_res = None self.confirmation_res = None
def notify_subproc_outputs(self, proc: SystemProcess, signal) -> bool:
"""
:param signal:
:param proc:
:return: if the subprocess succeeded
"""
signal.emit(' '.join(proc.subproc.args) + '\n')
success, already_succeeded = True, False
for output in proc.subproc.stdout:
line = output.decode().strip()
if line:
signal.emit(line)
if proc.success_phrase and proc.success_phrase in line:
already_succeeded = True
if already_succeeded:
return True
for output in proc.subproc.stderr:
line = output.decode().strip()
if line:
signal.emit(line)
if proc.check_error_output:
if proc.wrong_error_phrase and proc.wrong_error_phrase in line:
continue
else:
success = False
return proc.subproc.returncode is None or proc.subproc.returncode == 0
def request_confirmation(self, title: str, body: str, options: dict) -> dict: def request_confirmation(self, title: str, body: str, options: dict) -> dict:
self.wait_confirmation = True self.wait_confirmation = True
self.signal_confirmation.emit({'title': title, 'body': body, 'options': options}) self.signal_confirmation.emit({'title': title, 'body': body, 'options': options})
@@ -71,18 +40,28 @@ class AsyncAction(QThread, ProcessHandler):
while self.wait_confirmation: while self.wait_confirmation:
time.sleep(0.01) time.sleep(0.01)
def print(self, msg: str):
if msg:
self.signal_output.emit(msg)
def show_error(self, title: str, body: str):
self.signal_error.emit({'title': title, 'body': body})
def notify_finished(self, res: object):
self.signal_finished.emit(res)
def change_status(self, status: str):
self.signal_status.emit(status)
class UpdateSelectedApps(AsyncAction): class UpdateSelectedApps(AsyncAction):
signal_finished = pyqtSignal(bool, int) def __init__(self, manager: ApplicationManager, locale_keys: dict, apps_to_update: List[ApplicationView] = None):
signal_status = pyqtSignal(str)
signal_output = pyqtSignal(str)
def __init__(self, manager: ApplicationManager, apps_to_update: List[ApplicationView] = None):
super(UpdateSelectedApps, self).__init__() super(UpdateSelectedApps, self).__init__()
self.apps_to_update = apps_to_update self.apps_to_update = apps_to_update
self.manager = manager self.manager = manager
self.root_password = None self.root_password = None
self.locale_keys = locale_keys
def run(self): def run(self):
@@ -91,7 +70,7 @@ class UpdateSelectedApps(AsyncAction):
if self.apps_to_update: if self.apps_to_update:
updated = 0 updated = 0
for app in self.apps_to_update: for app in self.apps_to_update:
self.signal_status.emit(app.model.base_data.name) self.change_status('{} {}...'.format(self.locale_keys['manage_window.status.upgrading'], app.model.base_data.name))
success = bool(self.manager.update(app.model, self.root_password, self)) success = bool(self.manager.update(app.model, self.root_password, self))
if not success: if not success:
@@ -100,33 +79,22 @@ class UpdateSelectedApps(AsyncAction):
updated += 1 updated += 1
self.signal_output.emit('\n') self.signal_output.emit('\n')
self.signal_finished.emit(success, updated) self.notify_finished({'success': success, 'updated': updated})
self.apps_to_update = None self.apps_to_update = None
def handle(self, proc: SystemProcess) -> bool:
return self.notify_subproc_outputs(proc, self.signal_output)
def notify(self, msg: str): class RefreshApps(AsyncAction):
if msg:
self.signal_output.emit(msg)
class RefreshApps(QThread):
signal = pyqtSignal(list)
def __init__(self, manager: ApplicationManager): def __init__(self, manager: ApplicationManager):
super(RefreshApps, self).__init__() super(RefreshApps, self).__init__()
self.manager = manager self.manager = manager
def run(self): def run(self):
self.signal.emit(self.manager.read_installed()) self.notify_finished(self.manager.read_installed())
class UninstallApp(AsyncAction): class UninstallApp(AsyncAction):
signal_finished = pyqtSignal(object)
signal_output = pyqtSignal(str)
def __init__(self, manager: ApplicationManager, icon_cache: Cache, app: ApplicationView = None): def __init__(self, manager: ApplicationManager, icon_cache: Cache, app: ApplicationView = None):
super(UninstallApp, self).__init__() super(UninstallApp, self).__init__()
@@ -143,22 +111,12 @@ class UninstallApp(AsyncAction):
self.icon_cache.delete(self.app.model.base_data.icon_url) self.icon_cache.delete(self.app.model.base_data.icon_url)
self.manager.clean_cache_for(self.app.model) self.manager.clean_cache_for(self.app.model)
self.signal_finished.emit(self.app if success else None) self.notify_finished(self.app if success else None)
self.app = None self.app = None
self.root_password = None self.root_password = None
def handle(self, proc: SystemProcess) -> bool:
return self.notify_subproc_outputs(proc, self.signal_output)
def notify(self, msg: str):
if msg:
self.signal_output.emit(msg)
class DowngradeApp(AsyncAction): class DowngradeApp(AsyncAction):
signal_finished = pyqtSignal(bool)
signal_error = pyqtSignal(dict)
signal_output = pyqtSignal(str)
def __init__(self, manager: ApplicationManager, locale_keys: dict, app: ApplicationView = None): def __init__(self, manager: ApplicationManager, locale_keys: dict, app: ApplicationView = None):
super(DowngradeApp, self).__init__() super(DowngradeApp, self).__init__()
@@ -174,25 +132,14 @@ class DowngradeApp(AsyncAction):
success = self.manager.downgrade_app(self.app.model, self.root_password, self) success = self.manager.downgrade_app(self.app.model, self.root_password, self)
except (requests.exceptions.ConnectionError, NoInternetException): except (requests.exceptions.ConnectionError, NoInternetException):
success = False success = False
self.signal_output.emit(self.locale_keys['internet.required']) self.print(self.locale_keys['internet.required'])
finally: finally:
self.app = None self.app = None
self.root_password = None self.root_password = None
self.signal_finished.emit(success) self.notify_finished(success)
def handle(self, proc: SystemProcess) -> bool:
return self.notify_subproc_outputs(proc, self.signal_output)
def notify(self, msg: str):
if msg:
self.signal_output.emit(msg)
def show_error(self, title: str, body: str):
self.signal_error.emit({'title': title, 'body': body})
class GetAppInfo(QThread): class GetAppInfo(AsyncAction):
signal_finished = pyqtSignal(dict)
def __init__(self, manager: ApplicationManager, app: ApplicationView = None): def __init__(self, manager: ApplicationManager, app: ApplicationView = None):
super(GetAppInfo, self).__init__() super(GetAppInfo, self).__init__()
@@ -203,12 +150,11 @@ class GetAppInfo(QThread):
if self.app: if self.app:
info = {'__app__': self.app} info = {'__app__': self.app}
info.update(self.manager.get_info(self.app.model)) info.update(self.manager.get_info(self.app.model))
self.signal_finished.emit(info) self.notify_finished(info)
self.app = None self.app = None
class GetAppHistory(QThread): class GetAppHistory(AsyncAction):
signal_finished = pyqtSignal(dict)
def __init__(self, manager: ApplicationManager, locale_keys: dict, app: ApplicationView = None): def __init__(self, manager: ApplicationManager, locale_keys: dict, app: ApplicationView = None):
super(GetAppHistory, self).__init__() super(GetAppHistory, self).__init__()
@@ -219,15 +165,14 @@ class GetAppHistory(QThread):
def run(self): def run(self):
if self.app: if self.app:
try: try:
self.signal_finished.emit({'history': self.manager.get_history(self.app.model)}) self.notify_finished({'history': self.manager.get_history(self.app.model)})
except (requests.exceptions.ConnectionError, NoInternetException): except (requests.exceptions.ConnectionError, NoInternetException):
self.signal_finished.emit({'error': self.locale_keys['internet.required']}) self.notify_finished({'error': self.locale_keys['internet.required']})
finally: finally:
self.app = None self.app = None
class SearchApps(QThread): class SearchApps(AsyncAction):
signal_finished = pyqtSignal(list)
def __init__(self, manager: ApplicationManager): def __init__(self, manager: ApplicationManager):
super(SearchApps, self).__init__() super(SearchApps, self).__init__()
@@ -241,17 +186,12 @@ class SearchApps(QThread):
res = self.manager.search(self.word) res = self.manager.search(self.word)
apps_found.extend(res['installed']) apps_found.extend(res['installed'])
apps_found.extend(res['new']) apps_found.extend(res['new'])
self.notify_finished(apps_found)
self.signal_finished.emit(apps_found) self.word = None
self.word = None
class InstallApp(AsyncAction): class InstallApp(AsyncAction):
signal_finished = pyqtSignal(object)
signal_error = pyqtSignal(dict)
signal_output = pyqtSignal(str)
def __init__(self, manager: ApplicationManager, disk_cache: bool, icon_cache: Cache, locale_keys: dict, app: ApplicationView = None): def __init__(self, manager: ApplicationManager, disk_cache: bool, icon_cache: Cache, locale_keys: dict, app: ApplicationView = None):
super(InstallApp, self).__init__() super(InstallApp, self).__init__()
self.app = app self.app = app
@@ -261,11 +201,7 @@ class InstallApp(AsyncAction):
self.locale_keys = locale_keys self.locale_keys = locale_keys
self.root_password = None self.root_password = None
self.wait_confirmation = False
self.msg_confirmation = None
def run(self): def run(self):
if self.app: if self.app:
success = False success = False
@@ -282,21 +218,11 @@ class InstallApp(AsyncAction):
only_icon=False) only_icon=False)
except (requests.exceptions.ConnectionError, NoInternetException): except (requests.exceptions.ConnectionError, NoInternetException):
success = False success = False
self.signal_output.emit(self.locale_keys['internet.required']) self.print(self.locale_keys['internet.required'])
finally: finally:
self.signal_finished.emit(self.app if success else None) self.signal_finished.emit(self.app if success else None)
self.app = None self.app = None
def handle(self, proc: SystemProcess) -> bool:
return self.notify_subproc_outputs(proc, self.signal_output)
def notify(self, msg: str):
if msg:
self.signal_output.emit(msg)
def show_error(self, title: str, body: str):
self.signal_error.emit({'title': title, 'body': body})
class AnimateProgress(QThread): class AnimateProgress(QThread):
@@ -366,9 +292,6 @@ class VerifyModels(QThread):
class RefreshApp(AsyncAction): class RefreshApp(AsyncAction):
signal_finished = pyqtSignal(bool)
signal_output = pyqtSignal(str)
def __init__(self, manager: ApplicationManager, app: ApplicationView = None): def __init__(self, manager: ApplicationManager, app: ApplicationView = None):
super(RefreshApp, self).__init__() super(RefreshApp, self).__init__()
self.app = app self.app = app
@@ -381,8 +304,7 @@ class RefreshApp(AsyncAction):
success = False success = False
try: try:
process = self.manager.refresh(self.app.model, self.root_password) success = self.manager.refresh(self.app.model, self.root_password, self)
success = self.notify_subproc_outputs(process, self.signal_output)
except (requests.exceptions.ConnectionError, NoInternetException): except (requests.exceptions.ConnectionError, NoInternetException):
success = False success = False
self.signal_output.emit(self.locale_keys['internet.required']) self.signal_output.emit(self.locale_keys['internet.required'])
@@ -393,15 +315,13 @@ class RefreshApp(AsyncAction):
class FindSuggestions(AsyncAction): class FindSuggestions(AsyncAction):
signal_finished = pyqtSignal(list)
def __init__(self, man: ApplicationManager): def __init__(self, man: ApplicationManager):
super(FindSuggestions, self).__init__() super(FindSuggestions, self).__init__()
self.man = man self.man = man
def run(self): def run(self):
sugs = self.man.list_suggestions(limit=-1) sugs = self.man.list_suggestions(limit=-1)
self.signal_finished.emit(sugs if sugs is not None else []) self.notify_finished(sugs if sugs is not None else [])
class ListWarnings(QThread): class ListWarnings(QThread):

72
bauh/view/qt/window.py
View File

@@ -19,7 +19,8 @@ from bauh.view.qt.history import HistoryDialog
from bauh.view.qt.info import InfoDialog from bauh.view.qt.info import InfoDialog
from bauh.view.qt.root import is_root, ask_root_password from bauh.view.qt.root import is_root, ask_root_password
from bauh.view.qt.thread import UpdateSelectedApps, RefreshApps, UninstallApp, DowngradeApp, GetAppInfo, \ from bauh.view.qt.thread import UpdateSelectedApps, RefreshApps, UninstallApp, DowngradeApp, GetAppInfo, \
GetAppHistory, SearchApps, InstallApp, AnimateProgress, VerifyModels, RefreshApp, FindSuggestions, ListWarnings GetAppHistory, SearchApps, InstallApp, AnimateProgress, VerifyModels, RefreshApp, FindSuggestions, ListWarnings, \
AsyncAction
from bauh.view.qt.view_model import ApplicationView from bauh.view.qt.view_model import ApplicationView
DARK_ORANGE = '#FF4500' DARK_ORANGE = '#FF4500'
@@ -141,38 +142,18 @@ class ManageWindow(QWidget):
self.textarea_output.setVisible(False) self.textarea_output.setVisible(False)
self.textarea_output.setReadOnly(True) self.textarea_output.setReadOnly(True)
self.thread_update = UpdateSelectedApps(self.manager) self.thread_update = self._bind_async_action(UpdateSelectedApps(self.manager, self.locale_keys), finished_call=self._finish_update_selected)
self.thread_update.signal_output.connect(self._update_action_output) self.thread_refresh = self._bind_async_action(RefreshApps(self.manager), finished_call=self._finish_refresh_apps, only_finished=True)
self.thread_update.signal_finished.connect(self._finish_update_selected) self.thread_uninstall = self._bind_async_action(UninstallApp(self.manager, self.icon_cache), finished_call=self._finish_uninstall)
self.thread_update.signal_status.connect(self._change_updating_app_status) self.thread_get_info = self._bind_async_action(GetAppInfo(self.manager), finished_call=self._finish_get_info)
self.thread_get_history = self._bind_async_action(GetAppHistory(self.manager, self.locale_keys), finished_call=self._finish_get_history)
self.thread_refresh = RefreshApps(self.manager) self.thread_search = self._bind_async_action(SearchApps(self.manager), finished_call=self._finish_search, only_finished=True)
self.thread_refresh.signal.connect(self._finish_refresh_apps) self.thread_downgrade = self._bind_async_action(DowngradeApp(self.manager, self.locale_keys), finished_call=self._finish_downgrade)
self.thread_refresh_app = self._bind_async_action(RefreshApp(manager=self.manager), finished_call=self._finish_refresh)
self.thread_uninstall = UninstallApp(self.manager, self.icon_cache) self.thread_suggestions = self._bind_async_action(FindSuggestions(man=self.manager), finished_call=self._finish_search, only_finished=True)
self.thread_uninstall.signal_output.connect(self._update_action_output)
self.thread_uninstall.signal_finished.connect(self._finish_uninstall)
self.thread_downgrade = DowngradeApp(self.manager, self.locale_keys)
self.thread_downgrade.signal_output.connect(self._update_action_output)
self.thread_downgrade.signal_finished.connect(self._finish_downgrade)
self.thread_downgrade.signal_error.connect(self._show_error)
self.thread_get_info = GetAppInfo(self.manager)
self.thread_get_info.signal_finished.connect(self._finish_get_info)
self.thread_get_history = GetAppHistory(self.manager, self.locale_keys)
self.thread_get_history.signal_finished.connect(self._finish_get_history)
self.thread_search = SearchApps(self.manager)
self.thread_search.signal_finished.connect(self._finish_search)
self.thread_install = InstallApp(manager=self.manager, disk_cache=self.disk_cache, icon_cache=self.icon_cache, locale_keys=self.locale_keys) self.thread_install = InstallApp(manager=self.manager, disk_cache=self.disk_cache, icon_cache=self.icon_cache, locale_keys=self.locale_keys)
self.thread_install.signal_confirmation.connect(self._ask_confirmation) self._bind_async_action(self.thread_install, finished_call=self._finish_install)
self.thread_install.signal_output.connect(self._update_action_output)
self.thread_install.signal_error.connect(self._show_error)
self.thread_install.signal_finished.connect(self._finish_install)
self.signal_user_res.connect(self.thread_install.confirm)
self.thread_animate_progress = AnimateProgress() self.thread_animate_progress = AnimateProgress()
self.thread_animate_progress.signal_change.connect(self._update_progress) self.thread_animate_progress.signal_change.connect(self._update_progress)
@@ -180,13 +161,6 @@ class ManageWindow(QWidget):
self.thread_verify_models = VerifyModels() self.thread_verify_models = VerifyModels()
self.thread_verify_models.signal_updates.connect(self._notify_model_data_change) self.thread_verify_models.signal_updates.connect(self._notify_model_data_change)
self.thread_refresh_app = RefreshApp(manager=self.manager)
self.thread_refresh_app.signal_finished.connect(self._finish_refresh)
self.thread_refresh_app.signal_output.connect(self._update_action_output)
self.thread_suggestions = FindSuggestions(man=self.manager)
self.thread_suggestions.signal_finished.connect(self._finish_search)
self.toolbar_bottom = QToolBar() self.toolbar_bottom = QToolBar()
self.toolbar_bottom.setIconSize(QSize(16, 16)) self.toolbar_bottom.setIconSize(QSize(16, 16))
@@ -223,6 +197,18 @@ class ManageWindow(QWidget):
self.thread_warnings = ListWarnings(man=manager, locale_keys=locale_keys) self.thread_warnings = ListWarnings(man=manager, locale_keys=locale_keys)
self.thread_warnings.signal_warnings.connect(self._show_warnings) self.thread_warnings.signal_warnings.connect(self._show_warnings)
def _bind_async_action(self, action: AsyncAction, finished_call, only_finished: bool = False) -> AsyncAction:
action.signal_finished.connect(finished_call)
if not only_finished:
action.signal_confirmation.connect(self._ask_confirmation)
action.signal_output.connect(self._update_action_output)
action.signal_error.connect(self._show_error)
action.signal_status.connect(self._change_label_status)
self.signal_user_res.connect(action.confirm)
return action
def _ask_confirmation(self, msg: dict): def _ask_confirmation(self, msg: dict):
res = dialog.ask_confirmation(msg['title'], msg['body'], self.locale_keys) res = dialog.ask_confirmation(msg['title'], msg['body'], self.locale_keys)
self.signal_user_res.emit({'proceed': res, 'options': {}}) self.signal_user_res.emit({'proceed': res, 'options': {}})
@@ -396,8 +382,8 @@ class ManageWindow(QWidget):
else: else:
self.checkbox_console.setChecked(True) self.checkbox_console.setChecked(True)
def _change_updating_app_status(self, app_name: str): def _change_label_status(self, status: str):
self.label_status.setText('{} {}...'.format(self.locale_keys['manage_window.status.upgrading'], app_name)) self.label_status.setText(status)
def apply_filters(self): def apply_filters(self):
if self.apps: if self.apps:
@@ -568,12 +554,12 @@ class ManageWindow(QWidget):
self.thread_update.root_password = pwd self.thread_update.root_password = pwd
self.thread_update.start() self.thread_update.start()
def _finish_update_selected(self, success: bool, updated: int): def _finish_update_selected(self, res: dict):
self.finish_action() self.finish_action()
if success: if res['success']:
if self._can_notify_user(): if self._can_notify_user():
util.notify_user('{} {}'.format(updated, self.locale_keys['notification.update_selected.success'])) util.notify_user('{} {}'.format(res['updated'], self.locale_keys['notification.update_selected.success']))
self.refresh_apps() self.refresh_apps()