Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ tauri = { version = "2", default-features = false, features = [
dwall = { version = "0", path = "../daemon" }

reqwest = { version = "0", default-features = false }
futures-util = { version = "0", default-features = false }
zip = { version = "6", default-features = false, features = ["deflate"] }
open = { version = "5", default-features = false }
tokio = { workspace = true, features = ["macros", "process"] }
Expand Down
17 changes: 2 additions & 15 deletions src-tauri/src/infrastructure/network/download/http_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use std::sync::atomic::AtomicBool;
use std::sync::Arc;
use std::time::Duration;

use futures_util::StreamExt;
use reqwest::StatusCode;
use tauri::Runtime;
use tokio::fs;
Expand Down Expand Up @@ -242,27 +241,15 @@ impl HttpDownloadService {
&self,
context: DownloadContext<'_, R>,
) -> DwallSettingsResult<()> {
let mut stream = context.response.bytes_stream();
let mut response = context.response;

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

let chunk = match chunk_result {
Ok(chunk) => chunk,
Err(e) => {
error!(
theme_id = context.theme_id,
error = %e,
"Failed to download chunk"
);
return Err(e.into());
}
};

if let Err(e) = context.file.write_all(&chunk).await {
error!(
theme_id = context.theme_id,
Expand Down