From 2c9b9bdef51e49782e3bd77cab27c87106c1c8f1 Mon Sep 17 00:00:00 2001 From: yxd92326 Date: Wed, 12 Feb 2025 14:58:36 +0000 Subject: [PATCH 1/2] Data directory name got duplicated --- src/murfey/client/__init__.py | 3 +-- src/murfey/client/tui/screens.py | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/murfey/client/__init__.py b/src/murfey/client/__init__.py index 4cc6b7108..14693da75 100644 --- a/src/murfey/client/__init__.py +++ b/src/murfey/client/__init__.py @@ -319,8 +319,7 @@ def run(): software_versions=machine_data.get("software_versions", {}), # sources=[Path(args.source)], # watchers=source_watchers, - default_destination=args.destination - or f"{machine_data.get('rsync_module') or 'data'}/{datetime.now().year}", + default_destination=args.destination or str(datetime.now().year), demo=args.demo, processing_only_mode=server_routing_prefix_found, ) diff --git a/src/murfey/client/tui/screens.py b/src/murfey/client/tui/screens.py index 06b6890da..bb4df2344 100644 --- a/src/murfey/client/tui/screens.py +++ b/src/murfey/client/tui/screens.py @@ -92,10 +92,7 @@ def determine_default_destination( elif machine_data.get("data_directories"): for data_dir in machine_data["data_directories"]: if source.resolve() == Path(data_dir): - _default = ( - destination - + f"{machine_data.get('rsync_module') or 'data'}/{visit}" - ) + _default = destination + str(visit) break else: try: From b821bfeedf0694799b2c6aa603c9407e56bbacbd Mon Sep 17 00:00:00 2001 From: yxd92326 Date: Wed, 12 Feb 2025 15:12:36 +0000 Subject: [PATCH 2/2] Add the slash into the path --- src/murfey/client/tui/screens.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/murfey/client/tui/screens.py b/src/murfey/client/tui/screens.py index bb4df2344..a9e6499d4 100644 --- a/src/murfey/client/tui/screens.py +++ b/src/murfey/client/tui/screens.py @@ -92,7 +92,7 @@ def determine_default_destination( elif machine_data.get("data_directories"): for data_dir in machine_data["data_directories"]: if source.resolve() == Path(data_dir): - _default = destination + str(visit) + _default = f"{destination}/{visit}" break else: try: @@ -129,7 +129,7 @@ def determine_default_destination( else: _default = "" else: - _default = destination + f"/{visit}" + _default = f"{destination}/{visit}" return ( _default + f"/{extra_directory}" if not _default.endswith("/")