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.

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

Improve handling of file name clashes #4970

Merged
merged 2 commits into from
Sep 26, 2022
Merged

Conversation

claucambra
Copy link
Collaborator

@claucambra claucambra commented Sep 21, 2022

This PR introduces two changes:

  1. File name clashes are treated as warnings and not sync-stopping errors, much like invalid filenames
  2. Clicking on an activity for a file name clash opens the relevant file in the web UI, where the file name clash can be resolved

Closes #4963

@codecov
Copy link

codecov bot commented Sep 21, 2022

Codecov Report

Merging #4970 (664a80c) into master (38bc1e2) will not change coverage.
The diff coverage is 0.00%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #4970   +/-   ##
=======================================
  Coverage   57.12%   57.12%           
=======================================
  Files         138      138           
  Lines       17232    17232           
=======================================
  Hits         9844     9844           
  Misses       7388     7388           
Impacted Files Coverage Δ
src/libsync/bulkpropagatorjob.cpp 73.10% <ø> (ø)
src/libsync/owncloudpropagator.cpp 85.88% <ø> (ø)
src/libsync/progressdispatcher.cpp 51.17% <ø> (ø)
src/libsync/propagatedownload.cpp 64.46% <0.00%> (-0.30%) ⬇️
src/libsync/syncfileitem.h 37.50% <ø> (ø)
src/libsync/syncresult.cpp 9.57% <0.00%> (ø)
src/libsync/vfs/cfapi/cfapiwrapper.cpp 74.65% <0.00%> (+0.22%) ⬆️
src/libsync/propagateremotemkdir.h 50.00% <0.00%> (+50.00%) ⬆️

@claucambra claucambra force-pushed the bugfix/file-name-clash branch from 86adc7f to 8dd042f Compare September 26, 2022 10:09
… enum treated as warning

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
…the clash can be resolved

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
@claucambra claucambra force-pushed the bugfix/file-name-clash branch from 8dd042f to 664a80c Compare September 26, 2022 10:10
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-4970-664a80cbb5c9327dd956f2aa74703277cee7659f-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarqubecloud
Copy link

Please retry analysis of this Pull-Request directly on SonarCloud.

@claucambra claucambra merged commit 6a117be into master Sep 26, 2022
@claucambra claucambra deleted the bugfix/file-name-clash branch September 26, 2022 11:23
@mgallien mgallien added this to the 3.7.0 milestone Oct 3, 2022
@claucambra
Copy link
Collaborator Author

/backport to stable-3.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants