Feature/automate windows file name compatibility #7850
+200
−92
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
enforce trailing and leading space rules for new files and only for new files but on all platforms, not only windows Signed-off-by: Matthieu Gallien <[email protected]>
to ensure compatibility with Widnows, we will remove automatically the leading space characters in file name of new files or folders Signed-off-by: Matthieu Gallien <[email protected]>
Signed-off-by: Matthieu Gallien <[email protected]>
for now simple rule to guess if the server has windows naming enforced if windows naming is enforced, we enforce it for new files if not, we do not care for now limited to spaces removal more to come Signed-off-by: Matthieu Gallien <[email protected]>
|
Artifact containing the AppImage: nextcloud-appimage-pr-7850.zip SHA256 checksum: To test this change/fix you can download the above artifact file, unzip it, and run it. Please make sure to quit your existing Nextcloud app and backup your data. |
nilsding
requested changes
Feb 13, 2025
| QCOMPARE(completeSpy.findItem(fileWithSpaces1)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| QCOMPARE(completeSpy.findItem(fileWithSpaces2)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| QCOMPARE(completeSpy.findItem(fileWithSpaces3)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| QCOMPARE(completeSpy.findItem(fileWithSpaces4)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| QCOMPARE(completeSpy.findItem(fileWithSpaces5)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| QCOMPARE(completeSpy.findItem(fileWithSpaces6)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| #else | ||
| QCOMPARE(completeSpy.findItem(fileWithSpaces1)->_status, SyncFileItem::Status::Success); |
There was a problem hiding this comment.
why did these get removed?
running the tests on e.g. linux these items still end up with a status of Success
2025-02-13T07:43:29.5350432Z FAIL! : TestSyncVirtualFiles::testCreateFileWithTrailingSpaces_acceptAndRejectInvalidFileName() Compared values are not the same
2025-02-13T07:43:29.5350569Z Actual (completeSpy.findItem(fileWithSpaces1)->_status): Success
2025-02-13T07:43:29.5350719Z Expected (SyncFileItem::Status::FileNameInvalid) : FileNameInvalid
2025-02-13T07:43:29.5350832Z Loc: [/__w/desktop/desktop/test/testsyncvirtualfiles.cpp(838)]
Comment on lines
+2075
to
+2081
| QCOMPARE(completeSpy.findItem(fileWithSpaces1)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| QCOMPARE(completeSpy.findItem(fileWithSpaces2)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| QCOMPARE(completeSpy.findItem(fileWithSpaces3)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| QCOMPARE(completeSpy.findItem(fileWithSpaces4)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| QCOMPARE(completeSpy.findItem(fileWithSpaces5)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| QCOMPARE(completeSpy.findItem(fileWithSpaces6)->_status, SyncFileItem::Status::FileNameInvalid); | ||
| QCOMPARE(completeSpy.findItem(extraFileNameWithSpaces)->_status, SyncFileItem::Status::FileNameInvalid); |
There was a problem hiding this comment.
these end up as Success too on the Linux tests even with the setLocalDiscoveryEnforceWindowsFileNameCompatibility option enabled on the syncEngine -- in the SyncEngine::startSync method this property gets set on the DiscoveryPhase object that is used by the discovery jobs only depending on the account caps...
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.
No description provided.