Update deps

This commit is contained in:
2023-06-02 19:03:26 +02:00
parent 345bdc85ae
commit 780a8bd899
4 changed files with 125 additions and 155 deletions

View File

@@ -194,7 +194,7 @@ pub async fn start_download_futures(
if file_type == "epub" || file_type == "fb2" {
futures.push(download_chain(
book,
file_type.clone(),
file_type,
source_config,
true
))
@@ -202,9 +202,8 @@ pub async fn start_download_futures(
}
while let Some(result) = futures.next().await {
match result {
Some(v) => return Some(v),
None => (),
if let Some(v) = result {
return Some(v)
}
}

View File

@@ -4,6 +4,7 @@ use axum::{
http::{header, HeaderMap, StatusCode, header::AUTHORIZATION},
response::{IntoResponse, AppendHeaders},
};
use base64::{engine::general_purpose, Engine};
use tokio_util::io::ReaderStream;
use crate::{config, services::{book_library::get_book, filename_getter::get_filename_by_book, downloader::book_download}};
@@ -48,9 +49,11 @@ pub async fn download(
let stream = ReaderStream::new(reader);
let body = StreamBody::new(stream);
let encoder = general_purpose::STANDARD_NO_PAD;
let headers = AppendHeaders([
(header::CONTENT_DISPOSITION, format!("attachment; filename={filename_ascii}")),
(header::HeaderName::from_static("x-filename-b64"), base64::encode(filename))
(header::HeaderName::from_static("x-filename-b64"), encoder.encode(filename))
]);
Ok((headers, body))