Change local collision to follow the ownCloud convention #11117
Merged
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
TheOneRing
reviewed
Aug 15, 2023
src/gui/folderman.cpp
Outdated
| @@ -786,8 +786,8 @@ QString FolderMan::checkPathValidityForNewFolder(const QString &path) const | |||
|
|
|||
| QString FolderMan::findGoodPathForNewSyncFolder(const QString &basePath, const QString &newFolder) const | |||
| { | |||
| // reserve 3 characters to allow appending of a number 0-100 | |||
| const QString normalisedPath = FileSystem::createPortableFileName(basePath, FileSystem::pathEscape(newFolder), 3); | |||
| // reserve 3 characters to allow appending of a number 0-100, plus 2 for " (" and 1 for ")" | |||
There was a problem hiding this comment.
we could use std::stringview(" (100)").size() to have a compile time placeholder?
TheOneRing
reviewed
Aug 15, 2023
src/gui/folderman.cpp
Outdated
| if (!QFileInfo::exists(folder) | ||
| && FolderMan::instance()->checkPathValidityForNewFolder(folder).isEmpty()) { | ||
| return canonicalPath(folder); | ||
| } | ||
| folder = normalisedPath + QString::number(attempt); | ||
| folder = normalisedPath + QStringLiteral(" (") + QString::number(attempt) + QStringLiteral(")"); |
There was a problem hiding this comment.
Suggested change
| folder = normalisedPath + QStringLiteral(" (") + QString::number(attempt) + QStringLiteral(")"); | |
| folder = normalisedPath + QStringLiteral(" (%1)").arg(QString::number(attempt)); |
?
|
Looks like we have unit tests for this :D |
If the default folder name exists, a different one was offered in the form of "ownCloud2". This is now changed to follow the ownCloud convention, and "ownCloud (2)" is now offered.
erikjv
force-pushed
the
work/change-local-collision-name
branch
from
6de1497 to
1fa982f
Compare
|
Kudos, SonarCloud Quality Gate passed! |
TheOneRing
approved these changes
Aug 15, 2023
|
Tested with
|
2 tasks
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.
If the default folder name exists, a different one was offered in the form of "ownCloud2". This is now changed to follow the ownCloud convention, and "ownCloud (2)" is now offered.