Skip to content

Commit fe972bf

Browse files
author
arch
committed
allow spaces in path
1 parent 404648c commit fe972bf

File tree

13 files changed

+28
-10
lines changed

13 files changed

+28
-10
lines changed

build.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ rmdir /Q /S "build" >/NUL
33
rmdir /Q /S "dist/funscript-editor" >NUL
44
del funscript-editor.spec >NUL
55
pyinstaller --add-data="funscript_editor/config/*;funscript_editor/config" --hidden-import "pynput.keyboard._win32" --hidden-import "pynput.mouse._win32" funscript-editor.py
6-
xcopy /s "assets" "dist/funscript-editor"
6+
xcopy /s "assets" "dist/funscript-editor"
7+
copy /Y "funscript_editor\\VERSION.txt" "dist\\funscript-editor\\funscript_editor"
8+

contrib/OpenFunscripter/funscript_generator.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Settings = {}
2-
Settings.FunscriptGenerator = "C:\\Users\\win10\\Desktop\\funscript-editor\\funscript-editor.exe"
3-
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!)
2+
Settings.FunscriptGenerator = 'C:/Users/win10/Desktop/funscript editor/funscript-editor.exe' -- Path to your Python Funscript Editor installation
3+
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!)
44
SetSettings(Settings)
55

66
function GetActions(video)
77
local at = {}
88
local pos = {}
9-
local command = Settings.FunscriptGenerator..' --generator -s '..tostring(CurrentTimeMs)..' -i "'..video..'" -o "'..Settings.TmpFile..'"'
9+
local command = '""'..Settings.FunscriptGenerator..'" --generator -s '..tostring(CurrentTimeMs)..' -i "'..video..'" -o "'..Settings.TmpFile..'"'
1010
print(command)
1111
os.execute(command)
1212
local f = io.open(Settings.TmpFile)

docs/app/docs/user-guide/ofs-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Currently we use a hacky lua script to communicate between the Python Funscript
88
2. Extract the Archiv to an Path without special character or spaces.
99
3. Copy the `funscript_generator.lua` script ([`Repository/contrib/OpenFunscripter`](https://github.com/michael-mueller-git/Python-Funscript-Editor/tree/main/contrib/OpenFunscripter)) to `data/lua` in your OFS directory.
1010
4. Open the `funscript_generator.lua` file and adjust the `Settings.FunscriptGenerator` and `Settings.TmpFile` variable.
11-
- `Settings.FunscriptGenerator`: Point to the extracted Python Funscript Editor program. Use `\\` instead of `/` symbols in the path string!
11+
- `Settings.FunscriptGenerator`: Point to the extracted Python Funscript Editor program.
1212
- `Settings.TmpFile`: Specifies a temporary file location where to store the result (must be a file not a directory!). The file does not have to exist at the moment. The specified file will be generated from the Python Funscript Editor and will be overwritten automatically at the next time the generator is started!
1313
5. Now launch OFS.
1414
6. Navigate to `View : Special functions : Custom Functions` and select the `funscript_generator.lua` entry. Click the Button `Bind Script` (This may trigger the funscript generator, just ignore it for now).

docs/app/site/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,5 +204,5 @@ <h4 class="modal-title" id="keyboardModalLabel">Keyboard Shortcuts</h4>
204204

205205
<!--
206206
MkDocs version : 1.1.2
207-
Build Date UTC : 2021-06-26 14:27:54.584497+00:00
207+
Build Date UTC : 2021-06-26 15:52:42.322241+00:00
208208
-->

docs/app/site/search/search_index.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/app/site/sitemap.xml.gz

0 Bytes
Binary file not shown.

docs/app/site/user-guide/ofs-integration/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ <h2 id="installation-windows">Installation (Windows)</h2>
118118
<li>Extract the Archiv to an Path without special character or spaces.</li>
119119
<li>Copy the <code>funscript_generator.lua</code> script (<a href="https://github.com/michael-mueller-git/Python-Funscript-Editor/tree/main/contrib/OpenFunscripter"><code>Repository/contrib/OpenFunscripter</code></a>) to <code>data/lua</code> in your OFS directory.</li>
120120
<li>Open the <code>funscript_generator.lua</code> file and adjust the <code>Settings.FunscriptGenerator</code> and <code>Settings.TmpFile</code> variable.</li>
121-
<li><code>Settings.FunscriptGenerator</code>: Point to the extracted Python Funscript Editor program. Use <code>\\</code> instead of <code>/</code> symbols in the path string!</li>
121+
<li><code>Settings.FunscriptGenerator</code>: Point to the extracted Python Funscript Editor program.</li>
122122
<li><code>Settings.TmpFile</code>: Specifies a temporary file location where to store the result (must be a file not a directory!). The file does not have to exist at the moment. The specified file will be generated from the Python Funscript Editor and will be overwritten automatically at the next time the generator is started!</li>
123123
<li>Now launch OFS.</li>
124124
<li>Navigate to <code>View : Special functions : Custom Functions</code> and select the <code>funscript_generator.lua</code> entry. Click the Button <code>Bind Script</code> (This may trigger the funscript generator, just ignore it for now).</li>

docs/code/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*.rst
2+
!index.rst
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)