fix raw data and always save raw data to cache dir

Author: arch

.gitignore

@@ -16,3 +16,4 @@ build-dir
 .flatpak-builder
 repo
 *.flatpak
+funscript_editor/cache

funscript_editor/definitions.py

@@ -12,10 +12,14 @@
 ###############
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
+CACHE_DIR = os.path.join(ROOT_DIR, 'cache')
 CONFIG_DIR = os.path.join(ROOT_DIR, 'config')
 UI_DIR = os.path.join(ROOT_DIR, 'ui')
 ICON_PATH = os.path.join(CONFIG_DIR, 'icon.png')
 DOCS_URL = "https://github.com/michael-mueller-git/Python-Funscript-Editor/tree/{tag}/docs/app/docs"
+RAW_TRACKING_DATA_CAHCE_FILE = os.path.join(CACHE_DIR, 'raw_tracking_data.json')
+
+os.makedirs(CACHE_DIR, exist_ok=True)
 
 if os.path.exists(os.path.join(ROOT_DIR, '..', 'docs')):
     APP_DOCUMENTATION_DIR = os.path.join(ROOT_DIR, '..', 'docs', 'app', 'site')

funscript_editor/ui/funscript_generator_window.py

@@ -178,17 +178,45 @@ def __cut_completed(self, cut_values):
     def __scaling_completed(self, score):
         self.score = score
         self.__logger.info('scaling completed')
+
+        # 1. Now first save the raw tracking data
+
+        print("score", score)
+        for metric in self.funscripts:
+            for idx, val in enumerate(self.score[metric]):
+                print("add", idx, val)
+                self.funscripts[metric].add_action(
+                        round(val),
+                        FFmpegStream.frame_to_millisec(self.get_absolute_framenumber(idx), self.video_info.fps),
+                        True
+                    )
+
+        raw_tracking_data_json_output = {
+            'version': 1,
+            'actions': {}
+        }
+
+        for key in self.funscripts:
+            raw_tracking_data_json_output['actions'][key] = []
+            for item in self.funscripts[key].get_actions():
+                print("transfere", item)
+                raw_tracking_data_json_output['actions'][key].append(item)
+
+        os.makedirs(definitions.CACHE_DIR, exist_ok=True)
+        with open(definitions.RAW_TRACKING_DATA_CAHCE_FILE, 'w') as f:
+            print("dump", raw_tracking_data_json_output)
+            json.dump(raw_tracking_data_json_output, f)
+
+        # 2. Continue with selected user option on raw data
+
         if not self.raw_output:
+            self.__logger.info("Post Processing Data")
+            #NOTE: delete the raw data from funscript
+            for key in self.funscripts:
+                self.funscripts[key].clear_actions()
             self.__next_postprocessing(None, [], [])
         else:
             self.__logger.info("Raw Output")
-            for metric in self.funscripts:
-                for idx, val in enumerate(self.score[metric]):
-                    self.funscripts[metric].add_action(
-                            round(val),
-                            FFmpegStream.frame_to_millisec(self.get_absolute_framenumber(idx), self.video_info.fps)
-                        )
-
             self.__funscript_generated(self.funscripts, "OK", True)
 
 
@@ -199,7 +227,8 @@ def __next_postprocessing(self, last_metric, idx_keep, val_keep):
             for idx, val in zip(idx_keep, val_keep):
                 self.funscripts[last_metric].add_action(
                         round(val),
-                        FFmpegStream.frame_to_millisec(self.get_absolute_framenumber(idx), self.video_info.fps)
+                        FFmpegStream.frame_to_millisec(self.get_absolute_framenumber(idx), self.video_info.fps),
+                        True
                     )
 
         found_last = last_metric is None