flibusta-apps/batch_downloader
1
0
Fork 0
mirror of https://github.com/flibusta-apps/batch_downloader.git synced 2025-12-06 14:25:36 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix content size

Browse Source
This commit is contained in:
Bulat Kurbanov
2024-04-14 22:06:04 +02:00
parent 8fa2406cb2
commit 12767afb66
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/services/task_creator.rs
View File

@@ -94,7 +94,7 @@ pub async fn set_progress_description(key: String, description: String) {
pub async fn upload_to_minio( pub async fn upload_to_minio(
archive: SpooledTempFile, archive: SpooledTempFile,
filename: String, filename: String,
) -> Result<String, Box<dyn std::error::Error + Send + Sync>> { ) -> Result<(String, u64), Box<dyn std::error::Error + Send + Sync>> {
let minio = get_minio(); let minio = get_minio();
let is_bucket_exist = match minio.bucket_exists(&config::CONFIG.minio_bucket).await { let is_bucket_exist = match minio.bucket_exists(&config::CONFIG.minio_bucket).await {
@@ -121,7 +121,10 @@ pub async fn upload_to_minio(
} }
let link = match minio let link = match minio
.presigned_get_object(PresignedArgs::new(&config::CONFIG.minio_bucket, filename)) .presigned_get_object(PresignedArgs::new(
&config::CONFIG.minio_bucket,
filename.clone(),
))
.await .await
{ {
Ok(v) => v, Ok(v) => v,
@@ -130,7 +133,15 @@ pub async fn upload_to_minio(
} }
}; };
Ok(link) let obj_size = match minio
.stat_object(&config::CONFIG.minio_bucket, filename.clone())
.await
{
Ok(v) => v.unwrap().size().try_into().unwrap(),
Err(_) => todo!(),
};
Ok((link, obj_size))
} }
pub async fn create_archive( pub async fn create_archive(
@@ -241,7 +252,7 @@ pub async fn create_archive_task(key: String, data: CreateTask) {
set_progress_description(key.clone(), "Сборка архива...".to_string()).await; set_progress_description(key.clone(), "Сборка архива...".to_string()).await;
let (archive_result, content_size) = let (archive_result, _inside_content_size) =
match create_archive(key.clone(), books, data.file_format).await { match create_archive(key.clone(), books, data.file_format).await {
Ok(v) => v, Ok(v) => v,
Err(err) => { Err(err) => {
@@ -253,7 +264,7 @@ pub async fn create_archive_task(key: String, data: CreateTask) {
set_progress_description(key.clone(), "Загрузка архива...".to_string()).await; set_progress_description(key.clone(), "Загрузка архива...".to_string()).await;
let link = match upload_to_minio(archive_result, final_filename.clone()).await { let (link, content_size) = match upload_to_minio(archive_result, final_filename.clone()).await {
Ok(v) => v, Ok(v) => v,
Err(err) => { Err(err) => {
set_task_error(key.clone(), "Failed uploading archive!".to_string()).await; set_task_error(key.clone(), "Failed uploading archive!".to_string()).await;