Refactored QThread classes for more clarity and less code duplication

qubesmanager/common_threads.py

@@ -25,34 +25,33 @@ from qubesadmin import exc
 
 
 # pylint: disable=too-few-public-methods
-class RemoveVMThread(QtCore.QThread):
+class QubesThread(QtCore.QThread):
     def __init__(self, vm):
         QtCore.QThread.__init__(self)
         self.vm = vm
         self.msg = None
-        self.is_error = False
+        self.msg_is_success = False
 
+
+# pylint: disable=too-few-public-methods
+class RemoveVMThread(QubesThread):
     def run(self):
         try:
             del self.vm.app.domains[self.vm.name]
         except (exc.QubesException, KeyError) as ex:
             self.msg = ("Error removing qube!", str(ex))
-            self.is_error = True
 
 
 # pylint: disable=too-few-public-methods
-class CloneVMThread(QtCore.QThread):
+class CloneVMThread(QubesThread):
-    def __init__(self, src_vm, dst_name):
+    def __init__(self, vm, dst_name):
-        QtCore.QThread.__init__(self)
+        super(CloneVMThread, self).__init__(vm)
-        self.src_vm = src_vm
         self.dst_name = dst_name
-        self.msg = None
-        self.is_error = False
 
     def run(self):
         try:
-            self.src_vm.app.clone_vm(self.src_vm, self.dst_name)
+            self.vm.app.clone_vm(self.vm, self.dst_name)
             self.msg = ("Sucess", "The qube was cloned sucessfully.")
+            self.msg_is_success = True
         except exc.QubesException as ex:
             self.msg = ("Error while cloning qube!", str(ex))
-            self.is_error = True

qubesmanager/qube_manager.py

@@ -249,29 +249,16 @@ class VmShutdownMonitor(QtCore.QObject):
 
 
 # pylint: disable=too-few-public-methods
-class StartVMThread(QtCore.QThread):
+class StartVMThread(common_threads.QubesThread):
-    def __init__(self, vm):
-        QtCore.QThread.__init__(self)
-        self.vm = vm
-        self.msg = None
-        self.is_error = False
-
     def run(self):
         try:
             self.vm.start()
         except exc.QubesException as ex:
             self.msg = ("Error starting Qube!", str(ex))
-            self.is_error = True
 
 
 # pylint: disable=too-few-public-methods
-class UpdateVMThread(QtCore.QThread):
+class UpdateVMThread(common_threads.QubesThread):
-    def __init__(self, vm):
-        QtCore.QThread.__init__(self)
-        self.vm = vm
-        self.msg = None
-        self.is_error = False
-
     def run(self):
         try:
             if self.vm.qid == 0:
@@ -301,24 +288,19 @@ class UpdateVMThread(QtCore.QThread):
                         user="root", wait=False)
         except (ChildProcessError, exc.QubesException) as ex:
             self.msg = ("Error on qube update!", str(ex))
-            self.is_error = True
 
 
 # pylint: disable=too-few-public-methods
-class RunCommandThread(QtCore.QThread):
+class RunCommandThread(common_threads.QubesThread):
     def __init__(self, vm, command_to_run):
-        QtCore.QThread.__init__(self)
+        super(RunCommandThread, self).__init__(vm)
-        self.vm = vm
         self.command_to_run = command_to_run
-        self.msg = None
-        self.is_error = False
 
     def run(self):
         try:
             self.vm.run(self.command_to_run)
         except (ChildProcessError, exc.QubesException) as ex:
             self.msg = ("Error while running command!", str(ex))
-            self.is_error = True
 
 
 class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
@@ -521,17 +503,16 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
 
                 if thread.msg:
                     (title, msg) = thread.msg
-                    if thread.is_error:
+                    if thread.msg_is_success:
-                        QtGui.QMessageBox.warning(
-                            None,
-                            self.tr(title),
-                            self.tr(msg))
-                    else:
                         QtGui.QMessageBox.information(
                             None,
                             self.tr(title),
                             self.tr(msg))
-
+                    else:
+                        QtGui.QMessageBox.warning(
+                            None,
+                            self.tr(title),
+                            self.tr(msg))
 
                 self.threads_list.remove(thread)
                 return