Skip to content

Commit 2fe42ba

Browse files
Merge pull request #488 from dwall-rs/dev
2 parents 62fcf5c + f4dfb72 commit 2fe42ba

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ tauri = { version = "2", default-features = false, features = [
2020
dwall = { version = "0", path = "../daemon" }
2121

2222
reqwest = { version = "0", default-features = false }
23-
futures-util = { version = "0", default-features = false }
2423
zip = { version = "6", default-features = false, features = ["deflate"] }
2524
open = { version = "5", default-features = false }
2625
tokio = { workspace = true, features = ["macros", "process"] }

src-tauri/src/infrastructure/network/download/http_service.rs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use std::sync::atomic::AtomicBool;
77
use std::sync::Arc;
88
use std::time::Duration;
99

10-
use futures_util::StreamExt;
1110
use reqwest::StatusCode;
1211
use tauri::Runtime;
1312
use tokio::fs;
@@ -242,27 +241,15 @@ impl HttpDownloadService {
242241
&self,
243242
context: DownloadContext<'_, R>,
244243
) -> DwallSettingsResult<()> {
245-
let mut stream = context.response.bytes_stream();
244+
let mut response = context.response;
246245

247-
while let Some(chunk_result) = stream.next().await {
246+
while let Some(chunk) = response.chunk().await? {
248247
// Check if download has been cancelled
249248
if context.task_manager.is_cancelled(&context.cancel_flag) {
250249
info!(theme_id = context.theme_id, "Download cancelled by user");
251250
return Err(DownloadError::Cancelled.into());
252251
}
253252

254-
let chunk = match chunk_result {
255-
Ok(chunk) => chunk,
256-
Err(e) => {
257-
error!(
258-
theme_id = context.theme_id,
259-
error = %e,
260-
"Failed to download chunk"
261-
);
262-
return Err(e.into());
263-
}
264-
};
265-
266253
if let Err(e) = context.file.write_all(&chunk).await {
267254
error!(
268255
theme_id = context.theme_id,

0 commit comments

Comments
 (0)