VFS. Display local file name clash error when syncing in VFS mode. #3239
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
er-vin
reviewed
Apr 30, 2021
src/libsync/propagatedownload.cpp
Outdated
| @@ -434,6 +438,11 @@ void PropagateDownloadFile::startAfterIsEncryptedIsChecked() | |||
| _item->_type = ItemTypeFile; | |||
| } | |||
| if (_item->_type == ItemTypeVirtualFile) { | |||
| if (propagator()->localFileNameClash(_item->_file)) { | |||
| done(SyncFileItem::NormalError, tr(localFileNameClashMessage).arg(QDir::toNativeSeparators(_item->_file))); | |||
There was a problem hiding this comment.
Won't work for translations, you need to have the string literal inside the tr(). Yes, that means having it twice in the source code, it's not too bad for user visible strings, they tend to diverge over time anyway.
There was a problem hiding this comment.
@er-vin Indeed. Thanks. Fixed, and, squashed everything already. Not a huge change anyways so should be easy to see the difference.
allexzander
force-pushed
the
bugfix/vfs-local-name-clash-error
branch
from
231b970 to
54a4280
Compare
|
/rebase |
Signed-off-by: allexzander <blackslayer4@gmail.com>
github-actions
bot
force-pushed
the
bugfix/vfs-local-name-clash-error
branch
from
54a4280 to
1952221
Compare
|
AppImage file: Nextcloud-PR-3239-19522210acf38a44ea77f48a7443954525485e26-x86_64.AppImage |
|
/backport to stable-3.2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: allexzander blackslayer4@gmail.com
This fixes #3198