every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'models' into for_webui

Browse Source
This commit is contained in:
misyaguziya
2024-08-27 17:42:51 +09:00
parent 2135b1a561 aa0902ee15
commit 41199221f6
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -43,5 +43,5 @@ dist-ssr
.venv .venv
# Customize # Customize
test-x86_64-pc-windows-msvc.spec backend-x86_64-pc-windows-msvc.spec
/build /build

2
package.json
View File

@@ -5,7 +5,7 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"setup-python": "install.bat", "setup-python": "install.bat",
"build-python": "pyinstaller -F src-python/webui_mainloop.py --add-data ./fonts;fonts/ --add-data ./batch;batch/ --add-data .venv/Lib/site-packages/zeroconf;zeroconf/ --add-data .venv/Lib/site-packages/openvr;openvr/ --distpath src-tauri/bin --exclude-module pandas --exclude-module matplotlib --exclude-module PyQt5 --clean -n test-x86_64-pc-windows-msvc", "build-python": "pyinstaller -F src-python/webui_mainloop.py --add-data ./fonts;fonts/ --add-data ./batch;batch/ --add-data .venv/Lib/site-packages/zeroconf;zeroconf/ --add-data .venv/Lib/site-packages/openvr;openvr/ --distpath src-tauri/bin --exclude-module pandas --exclude-module matplotlib --exclude-module PyQt5 --clean -n backend-x86_64-pc-windows-msvc",
"vite": "vite", "vite": "vite",
"vite-build": "vite build", "vite-build": "vite build",
"vite-preview": "vite preview", "vite-preview": "vite preview",

2
src-python/webui_mainloop.py
View File

@@ -330,7 +330,9 @@ if __name__ == "__main__":
match process: match process:
case "main": case "main":
try: try:
print(json.dumps({"status":200, "endpoint": "/initialization/start", "result":True}), flush=True)
controller.init() controller.init()
print(json.dumps({"status":200, "endpoint": "/initialization/completed", "result":True}), flush=True)
print(json.dumps({"status":348, "log": "Initialization from Python."}), flush=True) print(json.dumps({"status":348, "log": "Initialization from Python."}), flush=True)
while True: while True:
main() main()

6
src-tauri/tauri.conf.json
View File

@@ -6,7 +6,7 @@
"distDir": "../dist" "distDir": "../dist"
}, },
"package": { "package": {
"productName": "vrct", "productName": "VRCT",
"version": "0.0.0" "version": "0.0.0"
}, },
"tauri": { "tauri": {
@@ -22,7 +22,7 @@
"sidecar": true, "sidecar": true,
"scope": [ "scope": [
{ {
"name": "bin/test", "sidecar": true,"args": true "name": "bin/backend", "sidecar": true,"args": true
} }
] ]
} }
@@ -51,7 +51,7 @@
"icons/icon.ico" "icons/icon.ico"
], ],
"externalBin": [ "externalBin": [
"bin/test" "bin/backend"
] ]
} }
} }

2
src-ui/logics/useStartPython.js
View File

@@ -5,7 +5,7 @@ export const useStartPython = () => {
const { receiveRoutes } = useReceiveRoutes(); const { receiveRoutes } = useReceiveRoutes();
const asyncStartPython = async () => { const asyncStartPython = async () => {
const command = Command.sidecar("bin/test"); const command = Command.sidecar("bin/backend");
command.on("error", error => console.error(`error: "${error}"`)); command.on("error", error => console.error(`error: "${error}"`));
command.stdout.on("data", (line) => { command.stdout.on("data", (line) => {
let parsed_data = ""; let parsed_data = "";