update installer

Author: arch

contrib/main.lua

@@ -0,0 +1,79 @@
+
+configFile = ofs.ExtensionDir() .. "/config"
+pythonFunscriptGenerator = ofs.ExtensionDir .. "/funscript-editor/funscript-editor.exe"
+
+function funscript_generator()
+    local tmpFile = ofs.ExtensionDir() .. "/funscript_actions.csv"
+    local video = player.CurrentVideo()
+    local script = ofs.Script(ofs.ActiveIdx())
+    local currentTimeMs = player.CurrentTime() * 1000
+
+    print("funscriptGenerator", pythonFunscriptGenerator)
+    print("tmpFile: ", tmpFile)
+    print("video: ", video)
+    print("currentScriptIdx: ", ofs.ActiveIdx())
+    print("currentTimeMs: ", currentTimeMs)
+
+    local next_action = ofs.ClosestActionAfter(script, currentTimeMs)
+    if next_action and next_action.at < currentTimeMs + 500.0 then
+        next_action = ofs.ClosestActionAfter(script, next_action.at)
+    end
+
+    if next_action then
+        print("nextAction: ", next_action.at) -- TODO is this in seconds?
+    else
+        print("nextAction: nil")
+    end
+
+    local command = '"'
+            ..pythonFunscriptGenerator
+            ..'" --generator -s '
+            ..( next_action == nil and tostring(currentTimeMs) or tostring(currentTimeMs)..' -e '..tostring(next_action.at) )
+            ..' -i "'
+            ..video
+            ..'" -o "'
+            ..tmpFile
+            ..'"'
+
+
+    print(command)
+    ofs.SilentCmd(command, false)
+
+    local f = io.open(tmpFile)
+    if not f then
+        print('lua: funscript generator output file not found')
+        return
+    end
+
+    script = ofs.Script(ofs.ActiveIdx())
+    local k = 1
+    for line in f:lines() do
+        -- first line is header
+        if k > 1 then
+            for at, pos in string.gmatch(line, "(%w+);(%w+)") do
+                ofs.AddAction(script, at, pos, true)
+            end
+        end
+        k = k + 1
+    end
+    f:close()
+
+    -- save changes
+    ofs.Commit(script)
+end
+
+
+
+function init()
+    ofs.Bind("funscript_generator", "execute the funcript generator")
+end
+
+
+function update(delta)
+
+end
+
+
+function gui()
+
+end

contrib/windows_installer.py

@@ -24,8 +24,7 @@ def download_url(url, output_path):
         urllib.request.urlretrieve(url, filename=output_path, reporthook=t.update_to)
 
 
-# NOTE: this file is currently not working for this installer!
-lua_extension_url = "https://raw.githubusercontent.com/michael-mueller-git/Python-Funscript-Editor/main/contrib/OpenFunscripter/extensions/Funscript%20Generator%20Windows/main.lua"
+lua_extension_url = "https://raw.githubusercontent.com/michael-mueller-git/Python-Funscript-Editor/main/contrib/main.lua"
 
 if platform.system() != "Windows":
     print("ERROR: This installer only work on Windows")
@@ -53,6 +52,13 @@ def download_url(url, output_path):
 extension_dir = os.path.join(ofs_extension_dir, "Funscript Generator Windows")
 zip_file = os.path.join(extension_dir, "funscript-editor-v" +  str(latest) + ".zip")
 dest_dir = os.path.join(os.path.dirname(zip_file), "funscript-editor")
+version_file = os.path.join(os.path.dirname(zip_file), "funscript-editor", "funscript_editor", "VERSION.txt")
+
+if os.path.exists(version_file):
+    with open(version_file, 'r') as f:
+        if str(f.read()).lower() == "v"+str(latest):
+            print("You have already the latest version installed")
+            sys.exit()
 
 os.makedirs(os.path.dirname(zip_file), exist_ok = True)
 if not os.path.exists(zip_file):