From 95c0634300ee25acf5d0fe83d23cdb131a0b8286 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Mon, 19 Aug 2024 12:28:46 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model=20:?= =?UTF-8?q?=20=E5=88=9D=E6=9C=9F=E5=8C=96=E5=87=A6=E7=90=86=E3=81=AE?= =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=83=BC=E3=83=88/=E5=AE=8C=E4=BA=86?= =?UTF-8?q?=E3=82=92=E9=80=9A=E7=9F=A5=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/webui_mainloop.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 79fa065e..485e5057 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -330,7 +330,9 @@ if __name__ == "__main__": match process: case "main": try: + print(json.dumps({"status":200, "endpoint": "/initialization/start", "result":True}), flush=True) 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) while True: main() From aa0902ee15445521d4e3f35f8d13e1b6108249f9 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Wed, 21 Aug 2024 01:18:02 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Backend=20:?= =?UTF-8?q?=20backend=20exe=20name=20change=20text.exe=20to=20backend.exe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- package.json | 2 +- src-tauri/tauri.conf.json | 6 +++--- src-ui/logics/useStartPython.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3619fecf..7684daaa 100644 --- a/.gitignore +++ b/.gitignore @@ -43,5 +43,5 @@ dist-ssr .venv # Customize -test-x86_64-pc-windows-msvc.spec +backend-x86_64-pc-windows-msvc.spec /build \ No newline at end of file diff --git a/package.json b/package.json index d24e53af..071b97dc 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "type": "module", "scripts": { "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-build": "vite build", "vite-preview": "vite preview", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 5f308373..0c9ec077 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -6,7 +6,7 @@ "distDir": "../dist" }, "package": { - "productName": "vrct", + "productName": "VRCT", "version": "0.0.0" }, "tauri": { @@ -22,7 +22,7 @@ "sidecar": true, "scope": [ { - "name": "bin/test", "sidecar": true,"args": true + "name": "bin/backend", "sidecar": true,"args": true } ] } @@ -51,7 +51,7 @@ "icons/icon.ico" ], "externalBin": [ - "bin/test" + "bin/backend" ] } } diff --git a/src-ui/logics/useStartPython.js b/src-ui/logics/useStartPython.js index 087ad717..6921bd4d 100644 --- a/src-ui/logics/useStartPython.js +++ b/src-ui/logics/useStartPython.js @@ -5,7 +5,7 @@ export const useStartPython = () => { const { receiveRoutes } = useReceiveRoutes(); const asyncStartPython = async () => { - const command = Command.sidecar("bin/test"); + const command = Command.sidecar("bin/backend"); command.on("error", error => console.error(`error: "${error}"`)); command.stdout.on("data", (line) => { let parsed_data = "";