Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qubesos/pr/103'

Browse Source 
* qubesos/pr/103:
  Fixed identation and other problems on merge
  Fix minor performance bug
  Removed unneeded manual sort
  Avoid lag on loading dialog
  Removed unneeded try/except
  Protect update() from accesing deleted domains
  Sort performance boost
This commit is contained in:
Marek Marczykowski-Górecki 2018-07-12 23:40:15 +02:00
commit bd7d3e576a
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 125 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
qubesmanager/qube_manager.py
View File

@ -139,15 +139,21 @@ class VmRowInTable(object):
widget will extract the data from VM object widget will extract the data from VM object
:return: None :return: None
""" """
self.info_widget.update_vm_state() try:
self.template_widget.update() self.info_widget.update_vm_state()
self.netvm_widget.update() self.template_widget.update()
self.internal_widget.update() self.netvm_widget.update()
self.ip_widget.update() self.internal_widget.update()
self.include_in_backups_widget.update() self.ip_widget.update()
self.last_backup_widget.update() self.include_in_backups_widget.update()
if update_size_on_disk: self.last_backup_widget.update()
self.size_widget.update() if update_size_on_disk:
self.size_widget.update()
except exc.QubesPropertyAccessError:
pass
#force re-sorting
self.table.setSortingEnabled(True)
vm_shutdown_timeout = 20000 # in msec vm_shutdown_timeout = 20000 # in msec
@ -307,9 +313,6 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
QtGui.QHeaderView.Interactive) QtGui.QHeaderView.Interactive)
self.table.horizontalHeader().setStretchLastSection(True) self.table.horizontalHeader().setStretchLastSection(True)
self.table.sortItems(self.columns_indices[self.sort_by_column],
self.sort_order)
self.context_menu = QtGui.QMenu(self) self.context_menu = QtGui.QMenu(self)
self.context_menu.addAction(self.action_settings) self.context_menu.addAction(self.action_settings)
@ -551,8 +554,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
vm_row = VmRowInTable(vm, row_no, self.table) vm_row = VmRowInTable(vm, row_no, self.table)
vms_in_table[vm.qid] = vm_row vms_in_table[vm.qid] = vm_row
row_no += 1 row_no += 1
if row_no % 5 == 0: self.qt_app.processEvents()
self.qt_app.processEvents()
self.vms_list = vms_list self.vms_list = vms_list
self.vms_in_table = vms_in_table self.vms_in_table = vms_in_table
@ -980,12 +982,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
settings_window = settings.VMSettingsWindow( settings_window = settings.VMSettingsWindow(
vm, self.qt_app, "basic") vm, self.qt_app, "basic")
settings_window.exec_() settings_window.exec_()
self.vms_in_table[vm.qid].update()
# vm could be deleted on renaming
try:
self.vms_in_table[vm.qid].update()
except exc.QubesPropertyAccessError:
pass
# noinspection PyArgumentList # noinspection PyArgumentList

232
qubesmanager/table_widgets.py
View File

@ -24,8 +24,6 @@ from PyQt4 import QtGui # pylint: disable=import-error
from PyQt4 import QtCore # pylint: disable=import-error from PyQt4 import QtCore # pylint: disable=import-error
# pylint: disable=too-few-public-methods # pylint: disable=too-few-public-methods
from qubesadmin import exc
power_order = QtCore.Qt.DescendingOrder power_order = QtCore.Qt.DescendingOrder
update_order = QtCore.Qt.AscendingOrder update_order = QtCore.Qt.AscendingOrder
@ -70,23 +68,21 @@ class VmTypeWidget(VmIconWidget):
def __init__(self, value, vm): def __init__(self, value, vm):
super(VmTypeWidget.VmTypeItem, self).__init__() super(VmTypeWidget.VmTypeItem, self).__init__()
self.value = value self.value = value
self.vm = vm self.qid = vm.qid
self.name = vm.name
def set_value(self, value): def set_value(self, value):
self.value = value self.value = value
#pylint: disable=too-many-return-statements #pylint: disable=too-many-return-statements
def __lt__(self, other): def __lt__(self, other):
try: if self.qid == 0:
if self.vm.qid == 0: return True
return True elif other.qid == 0:
elif other.vm.qid == 0:
return False
elif self.value == other.value:
return self.vm.name < other.vm.name
return self.value < other.value
except exc.QubesPropertyAccessError:
return False return False
elif self.value == other.value:
return self.name < other.name
return self.value < other.value
def __init__(self, vm, parent=None): def __init__(self, vm, parent=None):
(icon_path, tooltip) = self.get_vm_icon(vm) (icon_path, tooltip) = self.get_vm_icon(vm)
@ -120,23 +116,21 @@ class VmLabelWidget(VmIconWidget):
def __init__(self, value, vm): def __init__(self, value, vm):
super(VmLabelWidget.VmLabelItem, self).__init__() super(VmLabelWidget.VmLabelItem, self).__init__()
self.value = value self.value = value
self.vm = vm self.qid = vm.qid
self.name = vm.name
def set_value(self, value): def set_value(self, value):
self.value = value self.value = value
#pylint: disable=too-many-return-statements #pylint: disable=too-many-return-statements
def __lt__(self, other): def __lt__(self, other):
try: if self.qid == 0:
if self.vm.qid == 0: return True
return True elif other.qid == 0:
elif other.vm.qid == 0:
return False
elif self.value == other.value:
return self.vm.name < other.vm.name
return self.value < other.value
except exc.QubesPropertyAccessError:
return False return False
elif self.value == other.value:
return self.name < other.name
return self.value < other.value
def __init__(self, vm, parent=None): def __init__(self, vm, parent=None):
icon_path = self.get_vm_icon_path(vm) icon_path = self.get_vm_icon_path(vm)
@ -158,16 +152,12 @@ class VmNameItem(QtGui.QTableWidgetItem):
self.setTextAlignment(QtCore.Qt.AlignVCenter) self.setTextAlignment(QtCore.Qt.AlignVCenter)
self.qid = vm.qid self.qid = vm.qid
#pylint: disable=too-many-return-statements
def __lt__(self, other): def __lt__(self, other):
try: if self.qid == 0:
if self.qid == 0: return True
return True elif other.qid == 0:
elif other.qid == 0:
return False
return super(VmNameItem, self).__lt__(other)
except exc.QubesPropertyAccessError:
return False return False
return super(VmNameItem, self).__lt__(other)
class VmStatusIcon(QtGui.QLabel): class VmStatusIcon(QtGui.QLabel):
@ -185,12 +175,16 @@ class VmStatusIcon(QtGui.QLabel):
def set_on_icon(self): def set_on_icon(self):
if self.vm.get_power_state() == "Running": if self.vm.get_power_state() == "Running":
icon = QtGui.QIcon(":/on.png") icon = QtGui.QIcon(":/on.png")
self.status = 3
elif self.vm.get_power_state() in ["Paused", "Suspended"]: elif self.vm.get_power_state() in ["Paused", "Suspended"]:
icon = QtGui.QIcon(":/paused.png") icon = QtGui.QIcon(":/paused.png")
self.status = 2
elif self.vm.get_power_state() in ["Transient", "Halting", "Dying"]: elif self.vm.get_power_state() in ["Transient", "Halting", "Dying"]:
icon = QtGui.QIcon(":/transient.png") icon = QtGui.QIcon(":/transient.png")
self.status = 1
else: else:
icon = QtGui.QIcon(":/off.png") icon = QtGui.QIcon(":/off.png")
self.status = 0
icon_sz = QtCore.QSize(row_height * 0.5, row_height * 0.5) icon_sz = QtCore.QSize(row_height * 0.5, row_height * 0.5)
icon_pixmap = icon.pixmap(icon_sz) icon_pixmap = icon.pixmap(icon_sz)
@ -200,19 +194,19 @@ class VmStatusIcon(QtGui.QLabel):
class VmInfoWidget(QtGui.QWidget): class VmInfoWidget(QtGui.QWidget):
class VmInfoItem(QtGui.QTableWidgetItem): class VmInfoItem(QtGui.QTableWidgetItem):
def __init__(self, upd_info_item, vm): def __init__(self, on_icon, upd_info_item, vm):
super(VmInfoWidget.VmInfoItem, self).__init__() super(VmInfoWidget.VmInfoItem, self).__init__()
self.on_icon = on_icon
self.upd_info_item = upd_info_item self.upd_info_item = upd_info_item
self.vm = vm self.vm = vm
self.qid = vm.qid
self.name = vm.name
def __lt__(self, other): def __lt__(self, other):
# pylint: disable=too-many-return-statements # pylint: disable=too-many-return-statements
try: if self.qid == 0:
if self.vm.qid == 0: return True
return True elif other.qid == 0:
elif other.vm.qid == 0:
return False
except exc.QubesPropertyAccessError:
return False return False
self_val = self.upd_info_item.value self_val = self.upd_info_item.value
@ -221,21 +215,17 @@ class VmInfoWidget(QtGui.QWidget):
if self.tableWidget().\ if self.tableWidget().\
horizontalHeader().sortIndicatorOrder() == update_order: horizontalHeader().sortIndicatorOrder() == update_order:
# the result will be sorted by upd, sorting order: Ascending # the result will be sorted by upd, sorting order: Ascending
self_val += 1 if self.vm.is_running() else 0 self_val += 1 if self.on_icon.status > 0 else 0
other_val += 1 if other.vm.is_running() else 0 other_val += 1 if other.on_icon.status > 0 else 0
if self_val == other_val: if self_val == other_val:
return self.vm.name < other.vm.name return self.name < other.name
return self_val > other_val return self_val > other_val
elif self.tableWidget().\ elif self.tableWidget().\
horizontalHeader().sortIndicatorOrder() == power_order: horizontalHeader().sortIndicatorOrder() == power_order:
# the result will be sorted by power state, # the result will be sorted by power state,
# sorting order: Descending # sorting order: Descending
self_val = -(self_val/10 + if self.on_icon.status == other.on_icon.status:
10*(1 if self.vm.is_running() else 0)) return self.name < other.name
other_val = -(other_val/10 +
10*(1 if other.vm.is_running() else 0))
if self_val == other_val:
return self.vm.name < other.vm.name
return self_val > other_val return self_val > other_val
else: else:
# it would be strange if this happened # it would be strange if this happened
@ -268,7 +258,8 @@ class VmInfoWidget(QtGui.QWidget):
self.blk_icon.setVisible(False) self.blk_icon.setVisible(False)
self.error_icon.setVisible(False) self.error_icon.setVisible(False)
self.table_item = self.VmInfoItem(self.upd_info.table_item, vm) self.table_item = self.VmInfoItem(self.on_icon,\
self.upd_info.table_item, vm)
def update_vm_state(self): def update_vm_state(self):
self.on_icon.update() self.on_icon.update()
@ -280,6 +271,8 @@ class VmTemplateItem(QtGui.QTableWidgetItem):
super(VmTemplateItem, self).__init__() super(VmTemplateItem, self).__init__()
self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.vm = vm self.vm = vm
self.qid = vm.qid
self.name = vm.name
self.setTextAlignment(QtCore.Qt.AlignVCenter) self.setTextAlignment(QtCore.Qt.AlignVCenter)
self.update() self.update()
@ -295,16 +288,13 @@ class VmTemplateItem(QtGui.QTableWidgetItem):
self.setText(self.vm.klass) self.setText(self.vm.klass)
def __lt__(self, other): def __lt__(self, other):
try: if self.qid == 0:
if self.vm.qid == 0: return True
return True elif other.qid == 0:
elif other.vm.qid == 0:
return False
elif self.text() == other.text():
return self.vm.name < other.vm.name
return super(VmTemplateItem, self).__lt__(other)
except exc.QubesPropertyAccessError:
return False return False
elif self.text() == other.text():
return self.name < other.name
return super(VmTemplateItem, self).__lt__(other)
class VmNetvmItem(QtGui.QTableWidgetItem): class VmNetvmItem(QtGui.QTableWidgetItem):
@ -312,6 +302,8 @@ class VmNetvmItem(QtGui.QTableWidgetItem):
super(VmNetvmItem, self).__init__() super(VmNetvmItem, self).__init__()
self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.vm = vm self.vm = vm
self.qid = vm.qid
self.name = vm.name
self.setTextAlignment(QtCore.Qt.AlignVCenter) self.setTextAlignment(QtCore.Qt.AlignVCenter)
self.update() self.update()
@ -322,16 +314,13 @@ class VmNetvmItem(QtGui.QTableWidgetItem):
self.setText(self.vm.netvm.name) self.setText(self.vm.netvm.name)
def __lt__(self, other): def __lt__(self, other):
try: if self.qid == 0:
if self.vm.qid == 0: return True
return True elif other.qid == 0:
elif other.vm.qid == 0:
return False
elif self.text() == other.text():
return self.vm.name < other.vm.name
return super(VmNetvmItem, self).__lt__(other)
except exc.QubesPropertyAccessError:
return False return False
elif self.text() == other.text():
return self.name < other.name
return super(VmNetvmItem, self).__lt__(other)
class VmInternalItem(QtGui.QTableWidgetItem): class VmInternalItem(QtGui.QTableWidgetItem):
@ -340,24 +329,22 @@ class VmInternalItem(QtGui.QTableWidgetItem):
self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.vm = vm self.vm = vm
self.qid = vm.qid
self.name = vm.name
self.update() self.update()
def update(self): def update(self):
self.internal = self.vm.features.get('internal', False) self.internal = self.vm.features.get('internal', False)
self.setText("Yes" if self.internal else "") self.setText("Yes" if self.internal else "")
def __lt__(self, other): def __lt__(self, other):
try: if self.qid == 0:
if self.vm.qid == 0: return True
return True elif other.qid == 0:
elif other.vm.qid == 0:
return False
elif self.internal == other.internal:
return self.vm.name < other.vm.name
return super(VmInternalItem, self).__lt__(other)
except exc.QubesPropertyAccessError:
return False return False
elif self.internal == other.internal:
return self.name < other.name
return super(VmInternalItem, self).__lt__(other)
# features man qvm-features # features man qvm-features
@ -367,6 +354,8 @@ class VmUpdateInfoWidget(QtGui.QWidget):
super(VmUpdateInfoWidget.VmUpdateInfoItem, self).__init__() super(VmUpdateInfoWidget.VmUpdateInfoItem, self).__init__()
self.value = 0 self.value = 0
self.vm = vm self.vm = vm
self.qid = vm.qid
self.name = vm.name
self.set_value(value) self.set_value(value)
def set_value(self, value): def set_value(self, value):
@ -378,16 +367,13 @@ class VmUpdateInfoWidget(QtGui.QWidget):
self.value = 0 self.value = 0
def __lt__(self, other): def __lt__(self, other):
try: if self.qid == 0:
if self.vm.qid == 0: return True
return True elif other.qid == 0:
elif other.vm.qid == 0:
return False
elif self.value == other.value:
return self.vm.name < other.vm.name
return self.value < other.value
except exc.QubesPropertyAccessError:
return False return False
elif self.value == other.value:
return self.name < other.name
return self.value < other.value
def __init__(self, vm, show_text=True, parent=None): def __init__(self, vm, show_text=True, parent=None):
super(VmUpdateInfoWidget, self).__init__(parent) super(VmUpdateInfoWidget, self).__init__(parent)
@ -475,6 +461,8 @@ class VmSizeOnDiskItem(QtGui.QTableWidgetItem):
self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.vm = vm self.vm = vm
self.qid = vm.qid
self.name = vm.name
self.value = 0 self.value = 0
self.update() self.update()
self.setTextAlignment(QtCore.Qt.AlignVCenter) self.setTextAlignment(QtCore.Qt.AlignVCenter)
@ -488,16 +476,13 @@ class VmSizeOnDiskItem(QtGui.QTableWidgetItem):
self.setText(str(self.value) + " MiB") self.setText(str(self.value) + " MiB")
def __lt__(self, other): def __lt__(self, other):
try: if self.qid == 0:
if self.vm.qid == 0: return True
return True elif other.qid == 0:
elif other.vm.qid == 0:
return False
elif self.value == other.value:
return self.vm.name < other.vm.name
return self.value < other.value
except exc.QubesPropertyAccessError:
return False return False
elif self.value == other.value:
return self.name < other.name
return self.value < other.value
class VmIPItem(QtGui.QTableWidgetItem): class VmIPItem(QtGui.QTableWidgetItem):
@ -506,6 +491,8 @@ class VmIPItem(QtGui.QTableWidgetItem):
self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.vm = vm self.vm = vm
self.qid = vm.qid
self.name = vm.name
self.update() self.update()
def update(self): def update(self):
@ -513,16 +500,13 @@ class VmIPItem(QtGui.QTableWidgetItem):
self.setText(self.ip if self.ip is not None else 'n/a') self.setText(self.ip if self.ip is not None else 'n/a')
def __lt__(self, other): def __lt__(self, other):
try: if self.qid == 0:
if self.vm.qid == 0: return True
return True elif other.qid == 0:
elif other.vm.qid == 0:
return False
elif self.ip == other.ip:
return self.vm.name < other.vm.name
return super(VmIPItem, self).__lt__(other)
except exc.QubesPropertyAccessError:
return False return False
elif self.ip == other.ip:
return self.name < other.name
return super(VmIPItem, self).__lt__(other)
class VmIncludeInBackupsItem(QtGui.QTableWidgetItem): class VmIncludeInBackupsItem(QtGui.QTableWidgetItem):
@ -531,25 +515,26 @@ class VmIncludeInBackupsItem(QtGui.QTableWidgetItem):
self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.vm = vm self.vm = vm
self.name = vm.name
self.qid = vm.qid
self.update() self.update()
def update(self): def update(self):
if getattr(self.vm, 'include_in_backups', None): if getattr(self.vm, 'include_in_backups', None):
self.setText("Yes") self.setText("Yes")
self.include_in_backups = True
else: else:
self.setText("") self.setText("")
self.include_in_backups = False
def __lt__(self, other): def __lt__(self, other):
try: if self.qid == 0:
if self.vm.qid == 0: return True
return True elif other.qid == 0:
elif other.vm.qid == 0:
return False
elif self.vm.include_in_backups == other.vm.include_in_backups:
return self.vm.name < other.vm.name
return self.vm.include_in_backups < other.vm.include_in_backups
except exc.QubesPropertyAccessError:
return False return False
elif self.include_in_backups == other.include_in_backups:
return self.name < other.name
return self.include_in_backups < other.include_in_backups
class VmLastBackupItem(QtGui.QTableWidgetItem): class VmLastBackupItem(QtGui.QTableWidgetItem):
@ -558,6 +543,8 @@ class VmLastBackupItem(QtGui.QTableWidgetItem):
self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) self.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.vm = vm self.vm = vm
self.qid = vm.qid
self.name = vm.name
self.update() self.update()
def update(self): def update(self):
@ -571,17 +558,14 @@ class VmLastBackupItem(QtGui.QTableWidgetItem):
#pylint: disable=too-many-return-statements #pylint: disable=too-many-return-statements
def __lt__(self, other): def __lt__(self, other):
try: if self.qid == 0:
if self.vm.qid == 0: return True
return True elif other.qid == 0:
elif other.vm.qid == 0:
return False
elif self.backup_timestamp == other.backup_timestamp:
return self.vm.name < other.vm.name
elif not self.backup_timestamp:
return False
elif not other.backup_timestamp:
return True
return self.backup_timestamp < other.backup_timestamp
except exc.QubesPropertyAccessError:
return False return False
elif self.backup_timestamp == other.backup_timestamp:
return self.name < other.name
elif not self.backup_timestamp:
return False
elif not other.backup_timestamp:
return True
return self.backup_timestamp < other.backup_timestamp