Skip to content

Data directory name got duplicated when processing #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephen-riggs merged 2 commits into from
Feb 12, 2025
Merged

Data directory name got duplicated when processing #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c9b9bd
Data directory name got duplicated
stephen-riggs Feb 12, 2025
b821bfe
Add the slash into the path
stephen-riggs Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/murfey/client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
7 changes: 2 additions & 5 deletions src/murfey/client/tui/screens.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,7 @@
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}"

Check warning on line 95 in src/murfey/client/tui/screens.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/client/tui/screens.py#L95 

Added line #L95 was not covered by tests
break
else:
try:
Expand Down Expand Up @@ -132,7 +129,7 @@
else:
_default = ""
else:
_default = destination + f"/{visit}"
_default = f"{destination}/{visit}"

Check warning on line 132 in src/murfey/client/tui/screens.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/client/tui/screens.py#L132 

Added line #L132 was not covered by tests
return (
_default + f"/{extra_directory}"
if not _default.endswith("/")
Expand Down
Loading