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

Jump to bottom

Only check for leading/trailing space for files on Windows. #6871

Merged
merged 4 commits into from
Sep 27, 2024
Merged

Only check for leading/trailing space for files on Windows. #6871

merged 4 commits into from
Sep 27, 2024

Conversation

camilasan
Copy link
Member

@camilasan camilasan commented Jul 1, 2024 •
edited
Loading

Fix for #6807.

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jul 5, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
16 New Code Smells (required ≤ 0)
E Maintainability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@camilasan camilasan force-pushed the bugfix/trailing-space branch from 37ddeae to ddcee24 Compare July 9, 2024 13:23
@camilasan camilasan requested review from mgallien and claucambra July 9, 2024 13:24
@camilasan camilasan marked this pull request as ready for review July 9, 2024 13:24
@camilasan camilasan force-pushed the bugfix/trailing-space branch from ddcee24 to a200ba4 Compare July 9, 2024 13:25
mgallien
mgallien requested changes Jul 9, 2024
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you see how automated tests could be modified to validate your changes ?

@camilasan camilasan force-pushed the bugfix/trailing-space branch 4 times, most recently from d40c2b3 to 045e1c6 Compare July 28, 2024 17:49
@camilasan camilasan changed the title Only check trailing space for files/folders on Windows. Only check for leading/trailing space for files on Windows. Jul 28, 2024
@camilasan camilasan enabled auto-merge July 29, 2024 11:12
@camilasan camilasan force-pushed the bugfix/trailing-space branch 2 times, most recently from a11110c to d997f10 Compare July 30, 2024 10:43
@camilasan camilasan disabled auto-merge July 30, 2024 10:43
@camilasan
Copy link
Member Author

/backport to stable-3.13

@camilasan camilasan force-pushed the bugfix/trailing-space branch from d997f10 to a55e17c Compare September 4, 2024 14:54
@tobiasKaminsky tobiasKaminsky linked an issue Sep 5, 2024 that may be closed by this pull request
[Bug]: Mac: Upload of folder with trailing space failed silently #6807
Closed
8 tasks
@tobiasKaminsky
Copy link
Member

/backport to stable-3.14

@mgallien mgallien force-pushed the bugfix/trailing-space branch from a55e17c to f5fabe1 Compare September 26, 2024 11:20
@camilasan camilasan force-pushed the bugfix/trailing-space branch 2 times, most recently from 38ce58e to 995a979 Compare September 26, 2024 12:40
mgallien
mgallien requested changes Sep 26, 2024
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see my comments

test/testsyncvirtualfiles.cpp Outdated Show resolved Hide resolved
test/testsyncvirtualfiles.cpp Outdated Show resolved Hide resolved
test/testlocaldiscovery.cpp Outdated Show resolved Hide resolved
test/testlocaldiscovery.cpp Outdated Show resolved Hide resolved
test/testlocaldiscovery.cpp Outdated Show resolved Hide resolved
test/testlocaldiscovery.cpp Outdated Show resolved Hide resolved
@camilasan camilasan force-pushed the bugfix/trailing-space branch from 9617fe5 to 991442c Compare September 26, 2024 15:34
@camilasan @mgallien
Only check leading/trailing spaces for files on Windows.
b8ca158 
Fix for #6807.

Signed-off-by: Camila Ayres <[email protected]>
@camilasan @mgallien
Add test testCreateLocalPathsWithLeadingAndTrailingSpaces_syncOnSuppo…
2e75001 
…rtingOs.

- Fix discovery tests for files with invalid names.
- Now leading/trailing spaces trigger an error only on Windows.

Signed-off-by: Camila Ayres <[email protected]>
@mgallien mgallien force-pushed the bugfix/trailing-space branch from 991442c to 1d9b6e2 Compare September 27, 2024 07:06
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6871-1d9b6e2e793a5c16fe3a3f066d5aa014c933f92f-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.

@mgallien mgallien merged commit 47d16d3 into master Sep 27, 2024
11 of 14 checks passed
@mgallien mgallien deleted the bugfix/trailing-space branch September 27, 2024 07:26
This was referenced Sep 27, 2024
Merged
Merged
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Sep 27, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
28 New Code Smells (required ≤ 0)
E Maintainability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@mgallien
Copy link
Collaborator

/backport to stable-3.12

@backportbot backportbot bot mentioned this pull request Sep 27, 2024
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@claucambra claucambra claucambra approved these changes

@mgallien mgallien mgallien approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: Mac: Upload of folder with trailing space failed silently
6 participants
@camilasan @tobiasKaminsky @nextcloud-desktop-bot @mgallien @claucambra @joshtrichards