Merge branch 'rename' into for_webui
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
|
|
||||||
a = Analysis(
|
a = Analysis(
|
||||||
['src-python\\webui_mainloop.py'],
|
['src-python\\mainloop.py'],
|
||||||
pathex=[],
|
pathex=[],
|
||||||
binaries=[],
|
binaries=[],
|
||||||
datas=[('./fonts', 'fonts/'), ('.venv/Lib/site-packages/zeroconf', 'zeroconf/'), ('.venv/Lib/site-packages/openvr', 'openvr/'), ('.venv/Lib/site-packages/pykakasi', 'pykakasi/'), ('.venv/Lib/site-packages/faster_whisper', 'faster_whisper/')],
|
datas=[('./fonts', 'fonts/'), ('.venv/Lib/site-packages/zeroconf', 'zeroconf/'), ('.venv/Lib/site-packages/openvr', 'openvr/'), ('.venv/Lib/site-packages/pykakasi', 'pykakasi/'), ('.venv/Lib/site-packages/faster_whisper', 'faster_whisper/')],
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
|
|
||||||
a = Analysis(
|
a = Analysis(
|
||||||
['src-python\\webui_mainloop.py'],
|
['src-python\\mainloop.py'],
|
||||||
pathex=[],
|
pathex=[],
|
||||||
binaries=[],
|
binaries=[],
|
||||||
datas=[('./fonts', 'fonts/'), ('.venv_cuda/Lib/site-packages/zeroconf', 'zeroconf/'), ('.venv_cuda/Lib/site-packages/openvr', 'openvr/'), ('.venv_cuda/Lib/site-packages/pykakasi', 'pykakasi/'), ('.venv_cuda/Lib/site-packages/faster_whisper', 'faster_whisper/')],
|
datas=[('./fonts', 'fonts/'), ('.venv_cuda/Lib/site-packages/zeroconf', 'zeroconf/'), ('.venv_cuda/Lib/site-packages/openvr', 'openvr/'), ('.venv_cuda/Lib/site-packages/pykakasi', 'pykakasi/'), ('.venv_cuda/Lib/site-packages/faster_whisper', 'faster_whisper/')],
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import time
|
|||||||
from typing import Any
|
from typing import Any
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
from queue import Queue
|
from queue import Queue
|
||||||
from webui_controller import Controller
|
from controller import Controller
|
||||||
from utils import printLog, printResponse, errorLogging, encodeBase64
|
from utils import printLog, printResponse, errorLogging, encodeBase64
|
||||||
|
|
||||||
controller = Controller()
|
controller = Controller()
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
import sys
|
|
||||||
import json
|
|
||||||
import time
|
|
||||||
|
|
||||||
def main():
|
|
||||||
received_data = sys.stdin.readline().strip()
|
|
||||||
received_data = json.loads(received_data)
|
|
||||||
|
|
||||||
with open('process.log', 'a') as f:
|
|
||||||
f.write(f"received_data: {received_data}\n")
|
|
||||||
|
|
||||||
if received_data:
|
|
||||||
response_data = {
|
|
||||||
"status": "ok",
|
|
||||||
"id": received_data["id"],
|
|
||||||
"data": received_data["data"],
|
|
||||||
}
|
|
||||||
response = json.dumps(response_data)
|
|
||||||
time.sleep(2)
|
|
||||||
print(response, flush=True)
|
|
||||||
|
|
||||||
|
|
||||||
# with open('process.log', 'a') as f:
|
|
||||||
# f.write(f"Received data: {received_data}\n")
|
|
||||||
# f.write(f"Response: {response}\n")
|
|
||||||
|
|
||||||
# # 標準出力に結果を出力
|
|
||||||
# for i in range(10):
|
|
||||||
# print(str(i), flush=True)
|
|
||||||
# time.sleep(1)
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
try:
|
|
||||||
print(json.dumps({"init_key_from_py": "Initialization from Python."}), flush=True)
|
|
||||||
while True:
|
|
||||||
main()
|
|
||||||
except Exception:
|
|
||||||
import traceback
|
|
||||||
with open('error.log', 'a') as f:
|
|
||||||
traceback.print_exc(file=f)
|
|
||||||
Reference in New Issue
Block a user