fix a few issues

This commit is contained in:
Ross
2024-12-02 13:33:00 +00:00
parent e6931f3c8a
commit 92289831c6
2 changed files with 122 additions and 9 deletions
+30 -9
View File
@@ -30,6 +30,7 @@ import watchfiles
from functools import partial
from local_folder_picker import local_folder_picker
from typing import Optional
@@ -60,15 +61,14 @@ from starlette.middleware.base import BaseHTTPMiddleware
SOCKET_PATH = 'tcp://localhost:9976'
EXPORT_PATH = Path("./test/export")
PROCESS_PATH = Path("./test/to_process")
ANON_PATH = Path("./test/anon")
EXPORT_PATH = Path("C:/uploader/export")
PROCESS_PATH = Path("C:/uploader/to_process")
ANON_PATH = Path("C:/uploader/anon")
EXPORT_PATH.mkdir(exist_ok=True, parents=True)
PROCESS_PATH.mkdir(exist_ok=True, parents=True)
EXPORT_PATH.mkdir(exist_ok=True, parents=True)
BASE_SITE_URL = "http://localhost:8000"
BASE_SITE_URL = "https://www.penracourses.org.uk"
LOGIN_URL = f"{BASE_SITE_URL}/accounts/login/"
@@ -82,6 +82,15 @@ REFRESH_TRIGGERED = False
DELETE_FILES_ON_UPLOAD = False
DEBUG = False
if DEBUG:
BASE_SITE_URL = "http://localhost:8000"
EXPORT_PATH = Path("./test/export")
PROCESS_PATH = Path("./test/to_process")
ANON_PATH = Path("./test/anon")
rqst = None
@@ -196,10 +205,11 @@ async def upload_files_start(progress, upload_queue):
loaded_files_ui.refresh()
uploaded_files_ui.refresh()
async def load_files_start(progress_bar, queue):
async def load_files_start(progress_bar, queue, custom_path=None):
global loaded_files, loaded_series, loaded_series_data
progress_bar.visible = True
new_loaded_files, new_loaded_series, new_loaded_series_data = await run.cpu_bound(load_files, queue)
new_loaded_files, new_loaded_series, new_loaded_series_data = await run.cpu_bound(load_files, queue, custom_path)
loaded_files.update(new_loaded_files)
loaded_series.update(new_loaded_series)
@@ -268,12 +278,13 @@ def uploaded_files_ui() -> None:
for file, data in uploaded_files.items():
ui.item(f"{file} - {data}")
def load_files(q: Queue):
def load_files(q: Queue, src_path: Path | None = None):
loaded_files: dict = {}
loaded_series = defaultdict(list)
loaded_series_data = {}
# Move files
src_path = EXPORT_PATH
if src_path is None:
src_path = EXPORT_PATH
to_process = []
for file in src_path.iterdir():
@@ -581,9 +592,19 @@ def main_page():
progressbar = ui.linear_progress(value=0).props('instant-feedback')
anon_progress.visible = False
async def load_files_from_folder() -> None:
folder = await local_folder_picker("~")
logger.error(folder)
if folder is not None:
ui.notify(f"Selected folder: {folder}")
await load_files_start(anon_progress, queue, folder)
#return dir
else:
ui.notify("No folder selected", color='negative')
with ui.expansion('Extra', icon='build').classes('w-full'):
ui.button("Load files", on_click=partial(load_files_start, anon_progress, queue))
ui.button("Load files from folder", on_click=partial(load_files_start, anon_progress, queue))
ui.button("Load files from folder", on_click=load_files_from_folder)
ui.button("Reload anon", on_click=partial(reload_anonymized_start, anon_progress, queue))
with ui.expansion('File status', icon='view_list').classes('w-full'):