[claucambra]

Resolves

Second fix for #10579

Summary

Ensures cancellation propagates through File Provider uploads, downloads, and thumbnail fetches. Previously, cancellation did not consistently reach the surrounding operation or its supporting network requests, allowing cancelled operations to continue, update database state, and potentially report success

Checklist

• Sign-off message is added to all commits.
• The commit messages are following The Conventional Commits specification.
• The commit history is clean with no merge commits.
  • How to rebase your commits
  • How to squash commits with rebase
• Uploaded screenshots from before and after for UI changes.
• Test(s) added to branch, with before/after results included in PR description, for performance improvements where applicable.
• Documentation has been updated or is not required.
• Backports requested where applicable (critical bugfixes).
• Labels added where applicable (bug/enhancement).
• Milestone added for target version.

AI (if applicable)

• The content of this PR was partly or fully generated using AI
  • I have read the guidelines for AI-assisted contributions.
  • I have read Nextcloud's AI Contribution Policy.

[i2h3]

@claucambra Please rebase onto master and resolve the conflicts.

[claucambra]

@claucambra Please rebase onto master and resolve the conflicts.

Rebased and resolved now

[i2h3]

Reviewed at 8336b0f. Main points:

1. A cancelled fetch is persisted as .downloadError, which blocks later depth-1 metadata updates for that item (Item+Fetch.swift).
2. A chunked upload cancelled during assembly reports cancellation although the server committed the file (Upload.swift).
3. Upload cancellation has no tests; the new upload mock hooks are unused.

The rest are edge cases and test-robustness notes. The NetworkOperationCancellation helper and the thumbnail batching look correct to me (Darwin invokes cancellationHandler asynchronously, so no lock re-entrancy; registrations are sequential).

Hygiene: only 2 of 22 commits carry an Assisted-by: trailer while the PR declares AI assistance; please add it where it applies. At ~2.4k changed lines across uploads, downloads, thumbnails, capabilities and account waits, splitting the helper + uploads from the download changes would ease review. The failing classic-client PermissionsTest is unrelated.

Review prepared with AI assistance (Claude Code) and checked against the head commit.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[i2h3]

1. b4361ca clears deleted on unchanged rows in every non-paginated depth-1 read, which brings back local-only deletions (inline).
2. cancelledWaiterDoesNotWaitForAccountTimeout still hangs instead of failing if cancellation regresses (inline).
3. 4 of 40 commits mention Assisted-by: Codex:GPT-6, and in each a blank line separates it from Signed-off-by, so git parses only one of the two as a trailer. Please add the trailer to every commit with AI-assisted content, in the same block as Signed-off-by.

Review prepared with AI assistance (Claude Code) and checked against the head commit.

[i2h3]

This clears deleted on every unchanged .normal row in each non-paginated depth-1 read (working-set scan, change enumeration, directory fetch). Some tombstones are local-only on purpose while the server copy stays unchanged: deleting an ignored file (Item+Delete.swift:64-69) and consuming the excluded-from-sync marker of a bundle (Item+Delete.swift:49-61). The next read of their parent now reports them again through didUpdate, so a deleted ignored file comes back and an excluded bundle's server copy is re-reported at the path of the user's local copy. The paginated path already did this through addItemMetadataPreservingLocalState, but this change extends it to the frequent paths, and the cancellation fix does not need it. If the package case from my earlier comment needs a live child row, could fetchDirectoryContents upsert the listed child before beginDownload, as base did with addItemMetadata? A general tombstone change would fit its own PR, with tests that an ignored file and an excluded bundle stay deleted after their parent is read.

[i2h3]

If onCancel in awaitAccount stops resuming the waiter, which is what this test guards, task.value never returns: the timeout is UInt64.max, nothing calls signalAccountReady(), and awaiting an unstructured task's value does not react to .timeLimit cancelling the test. The Tests job has no timeout-minutes, so CI would hang rather than fail. Wrapping it as Task<Bool, Never> (true when CancellationError was thrown) so testTaskValue(of:) can bound it, plus defer { ext.signalAccountReady() } as in the next test, would make it fail instead.