improve OFS integration

Author: arch

contrib/OpenFunscripter/funscript_generator_linux.lua

@@ -3,11 +3,14 @@ Settings.PythonScript = "/home/arch/Repos/public/Python-Funscript-Editor/funscri
 Settings.TmpFile = "/tmp/funscript_actions.csv"
 SetSettings(Settings)
 
--- Version: 1.2.0
+-- Version: 1.3.0
 function GetActions(video)
     local at = {}
     local pos = {}
     local next_action = CurrentScript:GetClosestActionAfter(CurrentTimeMs)
+    if not next_action == nil and next_action.at < CurrentTimeMs + 500.0 then
+        next_action = CurrentScript:GetClosestActionAfter(next_action.at)
+    end
     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)

…/OpenFunscripter/funscript_generator.lua …scripter/funscript_generator_windows.luacontrib/OpenFunscripter/funscript_generator.lua renamed to contrib/OpenFunscripter/funscript_generator_windows.lua contrib/OpenFunscripter/funscript_generator.lua renamed to contrib/OpenFunscripter/funscript_generator_windows.lua

@@ -3,11 +3,14 @@ Settings.FunscriptGenerator = 'C:/Users/win10/Desktop/funscript-editor/funscript
 Settings.TmpFile = 'C:/Users/win10/AppData/Local/Temp/funscript_actions.csv' -- file where to temporary store the result (must be a file not a directory!)
 SetSettings(Settings)
 
--- Version: 1.1.0
+-- Version: 1.3.0
 function GetActions(video)
     local at = {}
     local pos = {}
     local next_action = CurrentScript:GetClosestActionAfter(CurrentTimeMs)
+    if not next_action == nil and next_action.at < CurrentTimeMs + 500.0 then
+        next_action = CurrentScript:GetClosestActionAfter(next_action.at)
+    end
     local command = '""'..Settings.FunscriptGenerator..'" --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)

funscript_editor/utils/config.py

@@ -27,7 +27,8 @@ def read_version() -> str:
     version_file = os.path.join(ROOT_DIR, 'VERSION.txt')
     if os.path.exists(version_file):
         with open(version_file, 'r') as f:
-            return f.read().replace('v', '').strip()
+            version = f.read().lower().replace('v', '').strip()
+            if version != "": return version
     return "0.0.0"
 
 #: the package version