Simplify transfer-failing logic #1546
Merged
Conversation
This file contains hidden or 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
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors error handling in transfer services by introducing a centralized TryFail method to eliminate duplicate code. The changes consolidate repetitive error-handling logic that was previously scattered across multiple catch blocks in both UploadService and DownloadService.
- Introduces public
TryFail(Guid id, Exception exception)method to both Upload and Download service interfaces - Adds private
TryFail(Guid id, string exception, TransferStates state)overload inUploadServicefor custom error messages - Refactors exception handling in catch blocks and task continuations to use the new methods
- Implements idempotent behavior ensuring transfer state is only updated once
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/slskd/Transfers/Uploads/UploadService.cs | Adds TryFail methods and refactors exception handling in catch blocks (NotFoundException, OperationCanceled/Timeout, generic exceptions) and failure paths in task continuations and enqueue operations |
| src/slskd/Transfers/Downloads/DownloadService.cs | Refactors existing TryFail method to wrap Update call in try-catch for consistent error handling with proper return values |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
Closes #1541