Skip to content

refactor: extract shared read_error_body helper for upload providers - #5

Closed
devin-ai-integration[bot] wants to merge 1 commit into
mainfrom
refactor/shared-upload-http-error-reader
Closed

refactor: extract shared read_error_body helper for upload providers#5
devin-ai-integration[bot] wants to merge 1 commit into
mainfrom
refactor/shared-upload-http-error-reader

Conversation

@devin-ai-integration

Copy link
Copy Markdown
Contributor

Summary

Every storage-provider upload module (local, onedrive, qiniu, s3, upyun) repeated the same two lines on the HTTP error path to pull the status and body out of a failed response:

let status = response.status();
let body = response.text().await.unwrap_or_default();

This centralizes that into one shared helper so the "best-effort read, empty string on decode failure" decision lives in a single place.

New crates/cloudreve-sync/src/uploader/providers/http.rs:

pub(super) async fn read_error_body(response: Response) -> (StatusCode, String) {
    let status = response.status();
    let body = response.text().await.unwrap_or_default();
    (status, body)
}

Each provider's error branch now reads:

if !response.status().is_success() {
    let (status, body) = read_error_body(response).await;
    // ...provider-specific error formatting unchanged...
}

Applied to 9 call sites across the 5 provider files. The provider-specific error parsing/formatting (format_s3_error, QiniuError, UpyunError, OneDriveError, etc.) is left exactly as-is — only the extraction boilerplate is deduplicated, so behavior is unchanged.

Added two wiremock-backed unit tests covering the populated-body and empty-body cases.

Testing

  • cargo test -p cloudreve-sync — all pass (including the 2 new tests)
  • cargo clippy -p cloudreve-sync — no new warnings introduced

Link to Devin session: https://app.devin.ai/sessions/0f3275d1c9ef4100b2eb4ac3bfab22fe
Requested by: @cedev-1

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
@cedev-1 cedev-1 self-assigned this Jul 21, 2026
@devin-ai-integration

Copy link
Copy Markdown
Contributor Author

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

  • Address comments on this PR. Add '(aside)' to your comment to have me ignore it.
  • Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

  • Disable automatic comment, CI, and merge conflict monitoring

@cedev-1 cedev-1 closed this Jul 21, 2026
@cedev-1
cedev-1 deleted the refactor/shared-upload-http-error-reader branch July 26, 2026 07:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant