diff --git a/main.py b/main.py index 1fcf802..e4b8b0e 100644 --- a/main.py +++ b/main.py @@ -11,6 +11,7 @@ from app.path_settings import ( render_path_editor, ) from app.path_store import set_user_path +from app.pipeline.config import join_path from app.pipeline.service import run_batch from app.samba_access import check_access_and_list_files @@ -46,9 +47,10 @@ def main() -> None: edited_path = render_path_editor() if edited_path is not None: + edited_input_dir = join_path(edited_path, "Input") ok, message, _ = check_access_and_list_files( smb_base_path=SFM_SMB_BASE_PATH, - input_dir=edited_path, + input_dir=edited_input_dir, samba_user=samba_user, samba_password=samba_password, ) @@ -60,7 +62,9 @@ def main() -> None: else: st.error(_format_access_error(message)) resolved_input_dir = get_resolved_input_dir(user_id) + processing_input_dir = join_path(resolved_input_dir, "Input") st.caption(f"Текущий путь: `{resolved_input_dir}`") + st.caption(f"Папка чтения XML: `{processing_input_dir}`") if st.button( "Запустить обработку xml в excel", @@ -71,7 +75,7 @@ def main() -> None: launcher_name = samba_user.strip() or user_id batch_result = run_batch( smb_base_path=SFM_SMB_BASE_PATH, - input_dir=resolved_input_dir, + input_dir=processing_input_dir, samba_user=samba_user, samba_password=samba_password, launcher=launcher_name, @@ -99,7 +103,7 @@ def main() -> None: if st.button("Проверить доступ к папке", use_container_width=True): ok, message, files = check_access_and_list_files( smb_base_path=SFM_SMB_BASE_PATH, - input_dir=resolved_input_dir, + input_dir=processing_input_dir, samba_user=samba_user, samba_password=samba_password, )