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..a9e6499d4 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 = f"{destination}/{visit}" break else: try: @@ -132,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("/")