From 341d49e86be678783c6496d06a105a6a54745ef3 Mon Sep 17 00:00:00 2001 From: Bulat Kurbanov Date: Sun, 6 Aug 2023 23:13:19 +0200 Subject: [PATCH] Update --- src/bots/approved_bot/modules/download.rs | 18 +++++++++++++++++- .../approved_bot/services/batch_downloader.rs | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/bots/approved_bot/modules/download.rs b/src/bots/approved_bot/modules/download.rs index 0d1e01c..71345d9 100644 --- a/src/bots/approved_bot/modules/download.rs +++ b/src/bots/approved_bot/modules/download.rs @@ -454,7 +454,7 @@ async fn download_archive( tokio::spawn(async move { let mut i = 15 * 60 / 5; - while task.status != TaskStatus::Complete && i >= 0 { + while task.status == TaskStatus::InProgress && i >= 0 { task = match get_task(task.id).await { Ok(v) => v, Err(err) => { @@ -470,6 +470,18 @@ async fn download_archive( }, }; + bot + .edit_message_text( + message.chat.id, + message.id, + format!("Подготовка архива: {}", task.status_description) + ) + .reply_markup(InlineKeyboardMarkup { + inline_keyboard: vec![], + }) + .send() + .await?; + sleep(Duration::from_secs(5)).await; i -= 1; @@ -485,6 +497,10 @@ async fn download_archive( .await?; return Ok(()); + } else { + bot + .delete_message(message.chat.id, message.id) + .await?; } let downloaded_data = match download_file_by_link( diff --git a/src/bots/approved_bot/services/batch_downloader.rs b/src/bots/approved_bot/services/batch_downloader.rs index 2c41ae3..d362221 100644 --- a/src/bots/approved_bot/services/batch_downloader.rs +++ b/src/bots/approved_bot/services/batch_downloader.rs @@ -19,6 +19,7 @@ pub enum TaskStatus { InProgress, Archiving, Complete, + Failled } #[derive(Serialize)]