pass next action point to python

Author: arch

contrib/OpenFunscripter/funscript_generator_linux.lua

@@ -1,13 +1,14 @@
 Settings = {}
-Settings.PythonScript = "/home/arch/repos/python-funscript-editor/funscript-editor.py"
+Settings.PythonScript = "/home/arch/Repos/public/Python-Funscript-Editor/funscript-editor.py"
 Settings.TmpFile = "/tmp/funscript_actions.csv"
 SetSettings(Settings)
 
--- Version: 1.0.0
+-- Version: 1.2.0
 function GetActions(video)
     local at = {}
     local pos = {}
-    local command = 'python3 "'..Settings.PythonScript..'" --generator -s '..tostring(CurrentTimeMs)..' -i "'..video..'" -o "'..Settings.TmpFile..'"'
+    local next_action = CurrentScript:GetClosestActionAfter(CurrentTimeMs)
+    local command = 'python3 "'..Settings.PythonScript..'" --generator -s '..( next_action == nil and tostring(CurrentTimeMs) or tostring(CurrentTimeMs)..' -e '..tostring(next_action.at))..' -i "'..video..'" -o "'..Settings.TmpFile..'"'
     print(command)
     os.execute(command)
     local f = io.open(Settings.TmpFile)

funscript_editor/__main__.py

@@ -11,11 +11,12 @@ def main():
     parser.add_argument("--generator", action = 'store_true', help = "Run only the generator")
     parser.add_argument("-i", "--input", type = str, help = "Video File")
     parser.add_argument("-o", "--output", type = str, default = "/tmp/funscript_actions.csv", help = "Output Path")
-    parser.add_argument("-s", "--start", type = int, default = 0, help = "Start Time in Milliseconds")
+    parser.add_argument("-s", "--start", type = float, default = 0.0, help = "Start Time in Milliseconds")
+    parser.add_argument("-e", "--end", type = float, default = -1.0, help = "End/Stop Time in Milliseconds")
     args = parser.parse_args()
 
     if os.getcwd() not in os.environ['PATH']:
         os.environ['PATH'] = os.getcwd() + os.sep + os.environ['PATH']
 
     if not args.generator: show_editor()
-    else: generate_funscript(args.input, args.start, args.output)
+    else: generate_funscript(args.input, args.start, args.end, args.output)

funscript_editor/algorithms/funscriptgenerator.py

@@ -31,6 +31,7 @@ class FunscriptGeneratorParameter:
     """ Funscript Generator Parameter Dataclass with default values """
     video_path: str # no default value
     start_frame: int = 0 # default is video start (input: set current video position)
+    end_frame: int = -1 # default is video end (-1)
     track_men: bool = True # set by userinput at start (message box)
     skip_frames: int = max((0, int(HYPERPARAMETER['skip_frames'])))
     max_playback_fps: int = max((0, int(SETTINGS['max_playback_fps'])))

funscript_editor/api.py

@@ -21,17 +21,22 @@ def show_editor() -> None:
     sys.exit(app.exec_())
 
 
-def generate_funscript(video_file: str, start_time: int, output_file: str) -> None:
+def generate_funscript(
+        video_file: str,
+        start_time: float,
+        end_time :float,
+        output_file: str) -> None:
     """ Generate a funscript with minimal UI
 
     Args:
         video_file (str): path to video file
-        start_time (int): start time in milliseconds
+        start_time (float): start time in milliseconds
+        end_time (float): end time in milliseconds (set -1.0 to use video end)
         output_file (str): path for the output file
     """
     setup_logging()
     logging.info("Python Funscript Generator %s", VERSION)
     app = QtWidgets.QApplication(sys.argv)
-    generator = MinimalFunscriptGenerator(video_file, start_time, output_file)
+    generator = MinimalFunscriptGenerator(video_file, start_time, end_time, output_file)
     generator.run()
     sys.exit(app.exec_())

funscript_editor/ui/minimal.py

@@ -19,10 +19,16 @@ class MinimalFunscriptGenerator(QtWidgets.QMainWindow):
 
     Args:
         video_file (str): path to video file
-        start_time (int): start position in video (timestamp in milliseconds)
+        start_time (float): start position in video (timestamp in milliseconds)
+        end_time (float): end position in video (timestamp in milliseconds) use -1.0 for video end.
+        output_file (str): csv output file path
     """
 
-    def __init__(self, video_file, start_time, output_file):
+    def __init__(self,
+            video_file: str,
+            start_time: float,
+            end_time: float,
+            output_file: str):
         super(MinimalFunscriptGenerator, self).__init__()
 
         if os.path.isdir(output_file):
@@ -62,12 +68,14 @@ def __init__(self, video_file, start_time, output_file):
                 QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No, QtWidgets.QMessageBox.No)
         trackMen = True if reply == QtWidgets.QMessageBox.Yes else False
 
-        start_frame = int(round(float(start_time)/(float(1000)/float(fps))))
+        start_frame = int(round(float(start_time)/(float(1000)/float(fps)))) if start_time > 0.0 else 0
+        end_frame = int(round(float(end_time)/(float(1000)/float(fps)))) if end_time > 0.0 else -1
 
         self.funscript_generator = FunscriptGenerator(
                 FunscriptGeneratorParameter(
                     video_path = video_file,
                     start_frame = start_frame,
+                    end_frame = end_frame,
                     track_men = trackMen
                 ),
                 self.funscript)