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

improvement: only changing the installed package status ( not refreshing the whole table ) | fix: flatpak downgrading error handling

Browse Source
This commit is contained in:
Vinicius Moreira
2019-09-24 15:17:09 -03:00
parent d3e5835a8b
commit 2a84ff4c32
15 changed files with 104 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
bauh/view/qt/apps_table.py
View File

@@ -136,6 +136,9 @@ class AppsTable(QTableWidget):
menu_row.popup(QCursor.pos())
menu_row.exec_()
def refresh(self, pkg: PackageView):
self._update_row(pkg, update_check_enabled=False, change_update_col=False)
def fill_async_data(self):
if self.window.pkgs:
@@ -146,7 +149,7 @@ class AppsTable(QTableWidget):
if self.download_icons:
self.network_man.get(QNetworkRequest(QUrl(app_v.model.icon_url)))
self._update_row(idx, app_v, change_update_col=False)
self._update_row(app_v, change_update_col=False)
app_v.status = PackageViewStatus.READY
self.window.resize_and_center()
@@ -199,7 +202,7 @@ class AppsTable(QTableWidget):
if self.disk_cache and app.model.supports_disk_cache():
if not icon_was_cached or not os.path.exists(app.model.get_disk_icon_path()):
self.window.manager.cache_to_disk(app=app.model, icon_bytes=icon_data['bytes'], only_icon=True)
self.window.manager.cache_to_disk(pkg=app.model, icon_bytes=icon_data['bytes'], only_icon=True)
def update_pkgs(self, pkg_views: List[PackageView], update_check_enabled: bool = True):
self.setRowCount(len(pkg_views) if pkg_views else 0)
@@ -207,16 +210,17 @@ class AppsTable(QTableWidget):
if pkg_views:
for idx, pkgv in enumerate(pkg_views):
self._update_row(idx, pkgv, update_check_enabled)
pkgv.table_index = idx
self._update_row(pkgv, update_check_enabled)
def _update_row(self, idx: int, pkg: PackageView, update_check_enabled: bool = True, change_update_col: bool = True):
self._set_col_name(idx, 0, pkg)
self._set_col_version(idx, 1, pkg)
self._set_col_description(idx, 2, pkg)
self._set_col_publisher(idx, 3, pkg)
self._set_col_type(idx, 4, pkg)
self._set_col_installed(idx, 5, pkg)
self._set_col_settings(idx, 6, pkg)
def _update_row(self, pkg: PackageView, update_check_enabled: bool = True, change_update_col: bool = True):
self._set_col_name(0, pkg)
self._set_col_version(1, pkg)
self._set_col_description(2, pkg)
self._set_col_publisher(3, pkg)
self._set_col_type(4, pkg)
self._set_col_installed(5, pkg)
self._set_col_settings(6, pkg)
if change_update_col:
col_update = None
@@ -224,7 +228,7 @@ class AppsTable(QTableWidget):
if update_check_enabled and pkg.model.update:
col_update = UpdateToggleButton(pkg, self.window, self.i18n, pkg.model.update)
self.setCellWidget(idx, 7, col_update)
self.setCellWidget(pkg.table_index, 7, col_update)
def _gen_row_button(self, text: str, style: str, callback) -> QWidget:
col = QWidget()
@@ -241,8 +245,7 @@ class AppsTable(QTableWidget):
return col
def _set_col_installed(self, row: int, col: int, pkg: PackageView):
def _set_col_installed(self, col: int, pkg: PackageView):
if pkg.model.installed:
if pkg.model.can_be_uninstalled():
def uninstall():
@@ -261,9 +264,9 @@ class AppsTable(QTableWidget):
else:
item = None
self.setCellWidget(row, col, item)
self.setCellWidget(pkg.table_index, col, item)
def _set_col_type(self, idx: int, col: int, pkg: PackageView):
def _set_col_type(self, col: int, pkg: PackageView):
pixmap = self.cache_type_icon.get(pkg.model.get_type())
@@ -276,9 +279,9 @@ class AppsTable(QTableWidget):
item.setPixmap(pixmap)
item.setAlignment(Qt.AlignCenter)
item.setToolTip('{}: {}'.format(self.i18n['type'], pkg.model.get_type().capitalize()))
self.setCellWidget(idx, col, item)
self.setCellWidget(pkg.table_index, col, item)
def _set_col_version(self, idx: int, col: int, pkg: PackageView):
def _set_col_version(self, col: int, pkg: PackageView):
label_version = QLabel(pkg.model.version if pkg.model.version else '?')
label_version.setAlignment(Qt.AlignCenter)
@@ -300,9 +303,9 @@ class AppsTable(QTableWidget):
label_version.setText(label_version.text() + ' > {}'.format(pkg.model.latest_version))
item.setToolTip(tooltip)
self.setCellWidget(idx, col, item)
self.setCellWidget(pkg.table_index, col, item)
def _set_col_name(self, idx: int, col: int, pkg: PackageView):
def _set_col_name(self, col: int, pkg: PackageView):
item = QTableWidgetItem()
item.setText(pkg.model.name if pkg.model.name else '...')
item.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled)
@@ -323,9 +326,9 @@ class AppsTable(QTableWidget):
icon = icon_data['icon'] if icon_data else QIcon(pkg.model.get_default_icon_path())
item.setIcon(icon)
self.setItem(idx, col, item)
self.setItem(pkg.table_index, col, item)
def _set_col_description(self, idx: int, col: int, pkg: PackageView):
def _set_col_description(self, col: int, pkg: PackageView):
item = QTableWidgetItem()
item.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled)
@@ -342,9 +345,9 @@ class AppsTable(QTableWidget):
if pkg.model.description:
item.setToolTip(pkg.model.description)
self.setItem(idx, col, item)
self.setItem(pkg.table_index, col, item)
def _set_col_publisher(self, idx: int, col: int, pkg: PackageView):
def _set_col_publisher(self, col: int, pkg: PackageView):
item = QLabel()
publisher = pkg.model.get_publisher()
@@ -368,9 +371,9 @@ class AppsTable(QTableWidget):
if publisher and full_publisher:
item.setToolTip(self.i18n['publisher'].capitalize() + ((': ' + full_publisher) if full_publisher else ''))
self.setCellWidget(idx, col, item)
self.setCellWidget(pkg.table_index, col, item)
def _set_col_settings(self, idx: int, col: int, pkg: PackageView):
def _set_col_settings(self, col: int, pkg: PackageView):
item = QToolBar()
if pkg.model.can_be_run():
@@ -394,7 +397,7 @@ class AppsTable(QTableWidget):
bt = IconButton(icon_path=resource.get_path('img/app_settings.svg'), action=handle_click, background='#12ABAB', tooltip=self.i18n['action.settings.tooltip'])
item.addWidget(bt)
self.setCellWidget(idx, col, item)
self.setCellWidget(pkg.table_index, col, item)
def change_headers_policy(self, policy: QHeaderView = QHeaderView.ResizeToContents):
header_horizontal = self.horizontalHeader()

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

@@ -179,7 +179,7 @@ class DowngradeApp(AsyncAction):
success = False
try:
success = self.manager.downgrade(self.app.model, self.root_password, self)
except (requests.exceptions.ConnectionError, NoInternetException):
except (requests.exceptions.ConnectionError, NoInternetException) as e:
success = False
self.print(self.locale_keys['internet.required'])
finally:
@@ -215,7 +215,7 @@ class GetAppHistory(AsyncAction):
if self.app:
try:
self.notify_finished({'history': self.manager.get_history(self.app.model)})
except (requests.exceptions.ConnectionError, NoInternetException):
except (requests.exceptions.ConnectionError, NoInternetException) as e:
self.notify_finished({'error': self.locale_keys['internet.required']})
finally:
self.app = None
@@ -266,7 +266,7 @@ class InstallPackage(AsyncAction):
if self.pkg.model.supports_disk_cache():
icon_data = self.icon_cache.get(self.pkg.model.icon_url)
self.manager.cache_to_disk(app=self.pkg.model,
self.manager.cache_to_disk(pkg=self.pkg.model,
icon_bytes=icon_data.get('bytes') if icon_data else None,
only_icon=False)
except (requests.exceptions.ConnectionError, NoInternetException):

1
bauh/view/qt/view_model.py
View File

@@ -14,6 +14,7 @@ class PackageView:
self.model = model
self.update_checked = model.update
self.status = PackageViewStatus.LOADING
self.table_index = -1
def __repr__(self):
return '{} ( {} )'.format(self.model.name, self.model.get_type())

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

@@ -883,8 +883,11 @@ class ManageWindow(QWidget):
try:
Path(log_path).mkdir(parents=True, exist_ok=True)
with open(log_path + '/{}.log'.format(int(time.time())), 'w+') as f:
log_file = log_path + '/{}.log'.format(int(time.time()))
with open(log_file, 'w+') as f:
f.write(console_output)
self.textarea_output.appendPlainText(self.i18n['console.install_logs.path'].format('"{}"'.format(log_file)))
except:
self.textarea_output.appendPlainText("[warning] Could not write install log file to '{}'".format(log_path))
@@ -892,7 +895,9 @@ class ManageWindow(QWidget):
if self._can_notify_user():
util.notify_user(msg='{} ({}) {}'.format(res['pkg'].model.name, res['pkg'].model.get_type(), self.i18n['installed']))
self.refresh_apps(top_app=res['pkg'], pkg_types={res['pkg'].model.__class__})
self.ref_bt_installed.setVisible(False)
self.ref_bt_refresh.setVisible(True)
self.table_apps.refresh(res['pkg'])
else:
if self._can_notify_user():
util.notify_user('{}: {}'.format(res['pkg'].model.name, self.i18n['notification.install.failed']))