Skip to content
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

Handle family move error #1068

Merged
merged 2 commits into from
Jul 27, 2024
Merged

Handle family move error #1068

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
a9b2f13
Gracefully handle errors when attempting moving a shared folder into …
samschott Jul 22, 2024
5fa8853
update changelog
samschott Jul 22, 2024
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## v1.9.5

#### Changed:

* Add a useful error message when attempting moving a shared folder into a family
folder.

## v1.9.4:

#### Changed:
Expand Down
15 changes: 7 additions & 8 deletions src/maestral/errorhandling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,14 +274,13 @@
else:
text = "You cannot move this folder into the Dropbox Vault."
err_cls = SyncError
# TODO: uncomment when updating to dropbox >= 11.27.0
# elif error.is_cant_move_into_family():
# family_error = error.get_cant_move_into_family()
# if family_error.is_is_shared_folder():
# text = "You cannot move a shared folder into the Family folder."
# else:
# text = "You cannot move this folder into the Family folder."
# err_cls = SyncError
elif error.is_cant_move_into_family():
family_error = error.get_cant_move_into_family()
if family_error.is_is_shared_folder():
text = "You cannot move a shared folder into the Family folder."

Check warning on line 280 in src/maestral/errorhandling.py

View check run for this annotation

Codecov / codecov/patch

src/maestral/errorhandling.py#L278-L280 

Added lines #L278 - L280 were not covered by tests
else:
text = "You cannot move this folder into the Family folder."
err_cls = SyncError

Check warning on line 283 in src/maestral/errorhandling.py

View check run for this annotation

Codecov / codecov/patch

src/maestral/errorhandling.py#L282-L283 

Added lines #L282 - L283 were not covered by tests

elif isinstance(error, (files.CreateFolderError, files.CreateFolderEntryError)):
title = "Could not create folder"
Expand Down
Loading