remove exception at programm close

Author: arch

funscript_editor/algorithms/funscriptgenerator.py

@@ -958,39 +958,44 @@ def create_funscript(self, idx_dict: dict) -> None:
 
     def run(self) -> None:
         """ The Funscript Generator Thread Function """
-        if self.params.direction == 'd' and not self.params.track_men:
-            self.finished("Tracking with 'd' and no men tracker is not implemented!", False)
-            return
-
-        if self.video_info.fps < 31.0 and self.params.skip_frames > 0:
-            self.logger.warning("The Video has less than 30 frames per seconds and you have set skip_frames to %d "\
-                    + "this can lead to inaccuracies when predicting the changepoint positions! (consider to set skip_frames to 0)" \
-                    , self.params.skip_frames)
-
-        if self.params.raw_output:
-            self.logger.warning("Raw output is enabled!")
-
-        # NOTE: score['y'] and score['x'] should have the same number size so it should be enouth to check one score length
-        with Listener(on_press=self.on_key_press) as listener:
-            status = self.tracking()
-
-            if self.params.use_kalman_filter:
-                self.apply_kalman_filter()
-
-            if len(self.score['y']) >= HYPERPARAMETER['min_frames']:
-                self.logger.info("Scale score")
-                self.scale_score(status, direction=self.params.direction)
-
-        if len(self.score['y']) < HYPERPARAMETER['min_frames']:
-            self.finished(status + ' -> Tracking time insufficient', False)
-            return
-
-        idx_dict = self.determin_change_points()
-
-        if False:
-            idx_list = [x for k in ['min', 'max'] for x in idx_dict[k]]
-            idx_list.sort()
-            self.plot_y_score('debug.png', idx_list)
-
-        self.create_funscript(idx_dict)
-        self.finished(status, True)
+        try:
+            if self.params.direction == 'd' and not self.params.track_men:
+                self.finished("Tracking with 'd' and no men tracker is not implemented!", False)
+                return
+
+            if self.video_info.fps < 31.0 and self.params.skip_frames > 0:
+                self.logger.warning("The Video has less than 30 frames per seconds and you have set skip_frames to %d "\
+                        + "this can lead to inaccuracies when predicting the changepoint positions! (consider to set skip_frames to 0)" \
+                        , self.params.skip_frames)
+
+            if self.params.raw_output:
+                self.logger.warning("Raw output is enabled!")
+
+            # NOTE: score['y'] and score['x'] should have the same number size so it should be enouth to check one score length
+            with Listener(on_press=self.on_key_press) as listener:
+                status = self.tracking()
+
+                if self.params.use_kalman_filter:
+                    self.apply_kalman_filter()
+
+                if len(self.score['y']) >= HYPERPARAMETER['min_frames']:
+                    self.logger.info("Scale score")
+                    self.scale_score(status, direction=self.params.direction)
+
+            if len(self.score['y']) < HYPERPARAMETER['min_frames']:
+                self.finished(status + ' -> Tracking time insufficient', False)
+                return
+
+            idx_dict = self.determin_change_points()
+
+            if False:
+                idx_list = [x for k in ['min', 'max'] for x in idx_dict[k]]
+                idx_list.sort()
+                self.plot_y_score('debug.png', idx_list)
+
+            self.create_funscript(idx_dict)
+            self.finished(status, True)
+        except Exception as ex:
+            self.logger.critical("The program crashed due to a fatal error. " \
+                    + "Please open an issue on github with the corresponding log file and application configuration", exc_info=ex)
+            self.finished("The program crashed due to a fatal error", False)

funscript_editor/ui/minimal.py

@@ -32,8 +32,7 @@ def __init__(self,
         super(MinimalFunscriptGenerator, self).__init__()
 
         if os.path.isdir(output_file):
-            self.__logger.error("The output TempFile path must be a file not a folder")
-            self.__show_message("The output TempFile path must be a file not a folder")
+            self.__show_message("The output TempFile path must be a file not a folder", error=True)
             sys.exit()
 
         if os.path.exists(output_file):
@@ -51,17 +50,15 @@ def __init__(self,
                     'Do you want to generate the funscript actions by tracking features in the Video? ',
                     QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No, QtWidgets.QMessageBox.No)
             if reply != QtWidgets.QMessageBox.Yes:
-                logging.info('abort')
+                logging.info('Abort Funscript Generator')
                 sys.exit()
 
         if video_file is None or video_file == "":
-            self.__logger.error("Video file was not specified!")
-            self.__show_message("Video file was not specified!")
+            self.__show_message("Video file was not specified!", error=True)
             sys.exit()
 
         if not os.path.exists(video_file):
-            self.__logger.error("Video file not found: %s", video_file)
-            self.__show_message("Video file not found ({})".format(video_file))
+            self.__show_message("Video file not found ({})".format(video_file), error=True)
             sys.exit()
 
         reply = QtWidgets.QMessageBox.question(None, 'Track Men', 'Do you want to track the Men? ',
@@ -88,11 +85,13 @@ def __init__(self,
     __logger = logging.getLogger(__name__)
 
 
-    def __show_message(self, message :str) -> None:
+    def __show_message(self, message :str, error: bool = False) -> None:
+        if error: self.__logger.error(message)
+        else: self.__logger.info(message)
         msg = QtWidgets.QMessageBox()
         msg.setIcon(QtWidgets.QMessageBox.Information)
         msg.setText(message+' ')
-        msg.setWindowTitle("Funscript Generator Info")
+        msg.setWindowTitle("Funscript Generator " + str("Error" if error else "Info"))
         msg.exec_()
 
 
@@ -102,8 +101,7 @@ def __funscript_generated(self, funscript, msg, success) -> None:
             f.write('at;pos\n')
             for item in funscript.get_actions():
                 f.write('{at};{pos}\n'.format(at=item['at'], pos=item['pos']))
-        logging.info('Completed with status message: "%s"', msg)
-        if not success: self.__show_message(msg)
+        if not success: self.__show_message(msg, error=True)
         sys.exit()
 
 

funscript_editor/ui/video_player.py

@@ -551,7 +551,6 @@ def send_mouse_pos(self, x :int, y :int) -> None:
 
     def run(self) -> None:
         """ Video Player Thread Function """
-        self.player.wait_until_playing()
         while not self.quit:
             try:
                 time.sleep(0.01)
@@ -561,5 +560,3 @@ def run(self) -> None:
         self.__logger.info("quit video player")
         self.player.terminate()
 
-
-