add typer
This commit is contained in:
@@ -37,7 +37,7 @@ from typing import Optional
|
|||||||
from fastapi import Request
|
from fastapi import Request
|
||||||
from fastapi.responses import RedirectResponse
|
from fastapi.responses import RedirectResponse
|
||||||
from starlette.middleware.base import BaseHTTPMiddleware
|
from starlette.middleware.base import BaseHTTPMiddleware
|
||||||
#import typer
|
import typer
|
||||||
|
|
||||||
#typer_app = typer.Typer()
|
#typer_app = typer.Typer()
|
||||||
|
|
||||||
@@ -61,9 +61,11 @@ from starlette.middleware.base import BaseHTTPMiddleware
|
|||||||
|
|
||||||
SOCKET_PATH = 'tcp://localhost:9976'
|
SOCKET_PATH = 'tcp://localhost:9976'
|
||||||
|
|
||||||
EXPORT_PATH = Path("C:/uploader/export")
|
WORK_DIR = Path("C:/uploader")
|
||||||
PROCESS_PATH = Path("C:/uploader/to_process")
|
|
||||||
ANON_PATH = Path("C:/uploader/anon")
|
EXPORT_PATH = WORK_DIR / Path("export/")
|
||||||
|
PROCESS_PATH = WORK_DIR / Path("to_process/")
|
||||||
|
ANON_PATH = WORK_DIR / Path("anon/")
|
||||||
|
|
||||||
EXPORT_PATH.mkdir(exist_ok=True, parents=True)
|
EXPORT_PATH.mkdir(exist_ok=True, parents=True)
|
||||||
PROCESS_PATH.mkdir(exist_ok=True, parents=True)
|
PROCESS_PATH.mkdir(exist_ok=True, parents=True)
|
||||||
@@ -636,13 +638,27 @@ def main_page():
|
|||||||
|
|
||||||
asyncio.create_task(watch_for_refresh())
|
asyncio.create_task(watch_for_refresh())
|
||||||
|
|
||||||
if __name__ in {"__main__", "__mp_main__"}:
|
|
||||||
freeze_support()
|
|
||||||
|
|
||||||
if use_zmq:
|
def launch_app(work_dir: Path = typer.Option(WORK_DIR, help="Working directory"), nng: bool = typer.Option(use_nng, help="Use nng")):
|
||||||
app.on_startup(read_loop)
|
global WORK_DIR, EXPORT_PATH, PROCESS_PATH, ANON_PATH, use_nng
|
||||||
|
|
||||||
|
WORK_DIR = work_dir
|
||||||
|
EXPORT_PATH = WORK_DIR / Path("export/")
|
||||||
|
PROCESS_PATH = WORK_DIR / Path("to_process/")
|
||||||
|
ANON_PATH = WORK_DIR / Path("anon/")
|
||||||
|
|
||||||
|
logger.error(ANON_PATH)
|
||||||
|
|
||||||
|
if nng:
|
||||||
|
use_nng = True
|
||||||
|
|
||||||
if use_nng:
|
if use_nng:
|
||||||
app.on_startup(read_nng_messages)
|
app.on_startup(read_nng_messages)
|
||||||
|
|
||||||
ui.run(storage_secret="123456", reload=False, show=False)
|
ui.run(storage_secret="123456", reload=False, show=False)
|
||||||
|
|
||||||
|
if __name__ in {"__main__", "__mp_main__"}:
|
||||||
|
freeze_support()
|
||||||
|
|
||||||
|
|
||||||
|
typer.run(launch_app)
|
||||||
|
|||||||
Reference in New Issue
Block a user