Skip to content

chore(vfs/windows): test migration from VFS to classic sync on windows#9020

Merged
mgallien merged 3 commits intomasterfrom
bugfix/migrateOnDemandFoldersToClassic
Nov 22, 2025
Merged

chore(vfs/windows): test migration from VFS to classic sync on windows#9020
mgallien merged 3 commits intomasterfrom
bugfix/migrateOnDemandFoldersToClassic

Conversation

@mgallien
Copy link
Collaborator

@mgallien mgallien commented Nov 4, 2025 •
edited
Loading

Close #8953

@mgallien mgallien force-pushed the bugfix/migrateOnDemandFoldersToClassic branch 2 times, most recently from 610c427 to e5ee1aa Compare November 7, 2025 15:51
@mgallien mgallien force-pushed the bugfix/migrateOnDemandFoldersToClassic branch from e5ee1aa to bb6083f Compare November 17, 2025 15:01
@mgallien mgallien marked this pull request as ready for review November 17, 2025 15:11
@mgallien mgallien added this to the 4.1.0 milestone Nov 17, 2025
@mgallien mgallien force-pushed the bugfix/migrateOnDemandFoldersToClassic branch 3 times, most recently from fd57893 to 385aeb3 Compare November 19, 2025 09:00
nilsding
nilsding reviewed Nov 20, 2025
View reviewed changes
test/testsynccfapi.cpp
Comment on lines +1627 to +1637
QVERIFY(itemInstruction(completeSpy, "directory", CSYNC_INSTRUCTION_NEW));
QVERIFY(itemInstruction(completeSpy, "firstFile1.txt", CSYNC_INSTRUCTION_NEW));
QVERIFY(itemInstruction(completeSpy, "firstFile2.txt", CSYNC_INSTRUCTION_NEW));
QVERIFY(itemInstruction(completeSpy, "firstFile3.txt", CSYNC_INSTRUCTION_NEW));
QVERIFY(itemInstruction(completeSpy, "directory/subdir", CSYNC_INSTRUCTION_NEW));
QVERIFY(itemInstruction(completeSpy, "directory/file1", CSYNC_INSTRUCTION_NEW));
QVERIFY(itemInstruction(completeSpy, "directory/file2", CSYNC_INSTRUCTION_NEW));
QVERIFY(itemInstruction(completeSpy, "directory/file3", CSYNC_INSTRUCTION_NEW));
QVERIFY(itemInstruction(completeSpy, "directory/subdir/fileTxt1.txt", CSYNC_INSTRUCTION_NEW));
QVERIFY(itemInstruction(completeSpy, "directory/subdir/fileTxt2.txt", CSYNC_INSTRUCTION_NEW));
QVERIFY(itemInstruction(completeSpy, "directory/subdir/fileTxt3.txt", CSYNC_INSTRUCTION_NEW));
Copy link
Member

@nilsding nilsding Nov 20, 2025

Choose a reason for hiding this comment

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

might be worth to verify the item direction as well to catch potential regressions early enough

Copy link
Collaborator Author

@mgallien mgallien Nov 22, 2025

Choose a reason for hiding this comment

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

yes
this is a good idea
let me work on a follow up PR to add such a check (where it would make sense)

@nilsding
Copy link
Member

nilsding commented Nov 20, 2025

/backport to stable-4.0

@mgallien mgallien enabled auto-merge November 21, 2025 08:57
@mgallien mgallien force-pushed the bugfix/migrateOnDemandFoldersToClassic branch from 385aeb3 to 099a397 Compare November 21, 2025 08:57
@mgallien
fix(performance): fix a small performance issue
aa872b6 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien
chore(vfs/windows): test migration from VFS to classic sync on windows
50e7cab 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien
fix(vfs/windows): properly delete virtual folders to switch to classic
ac4698d 
when we switch back to classic, all virtual items have to be deleted to
get back to a clean state

virtual folders would have been left as is causing issues

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien force-pushed the bugfix/migrateOnDemandFoldersToClassic branch from 099a397 to ac4698d Compare November 22, 2025 16:22
@github-actions
Copy link

github-actions bot commented Nov 22, 2025

Artifact containing the AppImage: nextcloud-appimage-pr-9020.zip

Digest: sha256:dd3049a27d84b0509b222f7b7b8efba8caf889f41ebdb7105e8a7edda897ac51

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.

@mgallien mgallien merged commit d264b66 into master Nov 22, 2025
20 of 24 checks passed
@mgallien mgallien deleted the bugfix/migrateOnDemandFoldersToClassic branch November 22, 2025 17:00
@backportbot backportbot bot mentioned this pull request Nov 22, 2025
Merged
2 tasks
@sonarqubecloud
Copy link

sonarqubecloud bot commented Nov 22, 2025

Quality Gate Failed Quality Gate failed

Failed conditions
1 New Bugs (required ≤ 0)
E Maintainability Rating on New Code (required ≥ A)
27 New Code Smells (required ≤ 0)
E Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nilsding nilsding nilsding approved these changes

@Aiiaiiio Aiiaiiio Awaiting requested review from Aiiaiiio Aiiaiiio is a code owner

@camilasan camilasan Awaiting requested review from camilasan camilasan is a code owner

@i2h3 i2h3 Awaiting requested review from i2h3 i2h3 is a code owner

Assignees

No one assigned

Labels

3. to review

Projects

None yet

Milestone

33.0.0

Development

Successfully merging this pull request may close these issues.

[Bug]: 4.0.0 All files deleted from server on change from Virtual files to full sync

2 participants

@mgallien @nilsding