update: BaseApi & DownLoadFWApi

Author: dustin007442

thonnycontrib/quecpython/api.py

@@ -12,7 +12,6 @@ class BaseApi(object):
 
     # status code
     OK = 0x00
-    ERROR = 0x01
     EXIT = 0x02
 
     # transmission payload
@@ -28,16 +27,10 @@ def emit(self, data):
             payload=self.Payload(code=self.OK, data=data, exec=None)
         )
 
-    def error(self, e):
+    def exit(self, exec_=None):
         pub.sendMessage(
             self.UPDATE_TOPIC,
-            payload=self.Payload(code=self.ERROR, data=None, exec=e)
-        )
-
-    def exit(self):
-        pub.sendMessage(
-            self.UPDATE_TOPIC,
-            payload=self.Payload(code=self.EXIT, data=None, exec=None)
+            payload=self.Payload(code=self.EXIT, data=None, exec=exec_)
         )
 
     def run(self):
@@ -47,8 +40,8 @@ def __call__(self):
         try:
             self.run()
         except Exception as e:
-            self.error(e)
-        finally:
+            self.exit(exec_=e)
+        else:
             self.exit()
 
 
@@ -65,6 +58,8 @@ def run(self):
         for data in fw_download_handler.download():
             self.emit(data)
 
-    def error(self, e):
-        error_message = '{}\nsee log: {}'.format(str(e), DownloadLogFile.log_file_path)
-        super().error(Exception(error_message))
+    def exit(self, exec_=None):
+        if exec_ is not None:
+            error_message = '{}\nsee log: {}'.format(str(exec_), DownloadLogFile.log_file_path)
+            exec_ = Exception(error_message)
+        super().exit(exec_=exec_)

thonnycontrib/quecpython/view.py

@@ -263,21 +263,22 @@ def update_progress(self, payload):
             self.bar["value"] = payload.data
             self.log_stringvar.set('downloading...')
             self.update()
-        elif payload.code == DownLoadFWApi.ERROR:
-            messagebox.showerror(
-                title='Error',
-                message='Download Firmware Error!\n{}'.format(str(payload.exec)),
-                master=self
-            )
         elif payload.code == DownLoadFWApi.EXIT:
-            self.log_stringvar.set('download process exited.')
-            self.fw_file_choose_button.config(state=tk.ACTIVE)
-            self.fw_download_button.config(state=tk.ACTIVE)
-            messagebox.showinfo(
-                title='Information',
-                message='Download Firmware Progress Finished!',
-                master=self
-            )
+            if payload.exec:
+                messagebox.showerror(
+                    title='Error',
+                    message='Download Firmware Error!\n{}'.format(str(payload.exec)),
+                    master=self
+                )
+            else:
+                self.log_stringvar.set('download process exited.')
+                self.fw_file_choose_button.config(state=tk.ACTIVE)
+                self.fw_download_button.config(state=tk.ACTIVE)
+                messagebox.showinfo(
+                    title='Information',
+                    message='Download Firmware Progress Finished!',
+                    master=self
+                )
         else:
             # nothing
             pass