Skip to content

Commit 82e0763

Browse files
author
arch
committed
add stop_time for windows
1 parent 334bad5 commit 82e0763

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

build.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ del funscript-editor.spec 2>NUL
55
pyinstaller --add-data="funscript_editor/config/*;funscript_editor/config" --hidden-import "pynput.keyboard._win32" --hidden-import "pynput.mouse._win32" funscript-editor.py
66
xcopy /s "assets" "dist/funscript-editor"
77
copy /Y "funscript_editor\\VERSION.txt" "dist\\funscript-editor\\funscript_editor"
8+
powershell Compress-Archive -LiteralPath "dist/funscript-editor" -DestinationPath "dist/funscript-editor.zip"
89

contrib/OpenFunscripter/funscript_generator.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ SetSettings(Settings)
77
function GetActions(video)
88
local at = {}
99
local pos = {}
10-
local command = '""'..Settings.FunscriptGenerator..'" --generator -s '..tostring(CurrentTimeMs)..' -i "'..video..'" -o "'..Settings.TmpFile..'"'
10+
local next_action = CurrentScript:GetClosestActionAfter(CurrentTimeMs)
11+
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..'"'
1112
print(command)
1213
os.execute(command)
1314
local f = io.open(Settings.TmpFile)

contrib/OpenFunscripter/funscript_generator_linux.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function GetActions(video)
88
local at = {}
99
local pos = {}
1010
local next_action = CurrentScript:GetClosestActionAfter(CurrentTimeMs)
11-
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..'"'
11+
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..'"'
1212
print(command)
1313
os.execute(command)
1414
local f = io.open(Settings.TmpFile)

0 commit comments

Comments
 (0)