From 50c3cf0718f31887604955eddb79d039d11105bd Mon Sep 17 00:00:00 2001 From: Bulat Kurbanov Date: Wed, 7 Jun 2023 22:07:35 +0200 Subject: [PATCH] Fix --- src/bots/approved_bot/modules/download.rs | 62 ++++++++++++----------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/src/bots/approved_bot/modules/download.rs b/src/bots/approved_bot/modules/download.rs index 0cf676b..ad1131c 100644 --- a/src/bots/approved_bot/modules/download.rs +++ b/src/bots/approved_bot/modules/download.rs @@ -464,13 +464,32 @@ async fn download_archive( .send() .await?; - let mut i = 15 * 60 / 5; + tokio::spawn(async move { + let mut i = 15 * 60 / 5; - while task.status != TaskStatus::Complete && i >= 0 { - task = match get_task(task.id).await { - Ok(v) => v, - Err(err) => { - bot + while task.status != TaskStatus::Complete && i >= 0 { + task = match get_task(task.id).await { + Ok(v) => v, + Err(err) => { + bot + .edit_message_text(message.chat.id, message.id, "Ошибка! Попробуйте позже :(") + .reply_markup(InlineKeyboardMarkup { + inline_keyboard: vec![], + }) + .send() + .await?; + + return Err(err); + }, + }; + + sleep(Duration::from_secs(5)).await; + + i = i - 1; + } + + if task.status != TaskStatus::Complete { + bot .edit_message_text(message.chat.id, message.id, "Ошибка! Попробуйте позже :(") .reply_markup(InlineKeyboardMarkup { inline_keyboard: vec![], @@ -478,34 +497,19 @@ async fn download_archive( .send() .await?; - return Err(err); - }, - }; + return Ok(()); + } - sleep(Duration::from_secs(5)).await; - - i = i - 1; - } - - if task.status != TaskStatus::Complete { bot - .edit_message_text(message.chat.id, message.id, "Ошибка! Попробуйте позже :(") - .reply_markup(InlineKeyboardMarkup { - inline_keyboard: vec![], - }) + .send_document( + message.chat.id, + InputFile::url(task.result_link.unwrap().parse().unwrap()) + ) .send() .await?; - return Ok(()); - } - - bot - .send_document( - message.chat.id, - InputFile::url(task.result_link.unwrap().parse().unwrap()) - ) - .send() - .await?; + Ok(()) + }); Ok(()) }