Ryan/drop-app
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop-app.git synced 2025-11-17 10:11:13 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat(downloads): Download cancelling

Browse Source 
Signed-off-by: quexeky <git@quexeky.dev>
This commit is contained in:
quexeky
2024-11-21 16:46:05 +11:00
parent 18b914918c
commit 450bca9c5b
6 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src-tauri/src/downloads/download_manager.rs
View File

@ -7,7 +7,7 @@ use std::{
thread::spawn,
};
use log::info;
use log::{info, warn};
use super::{
download_agent::{GameDownloadAgent, GameDownloadError},
@ -78,6 +78,7 @@ pub enum DownloadManagerSignal {
/// Tells the Manager to stop the current
/// download and return
Finish,
Cancel(String),
/// Any error which occurs in the agent
Error(GameDownloadError),
}
@ -146,6 +147,9 @@ impl DownloadManagerBuilder {
DownloadManagerSignal::Error(e) => {
self.manage_error_signal(e);
},
DownloadManagerSignal::Cancel(id) => {
self.manage_cancel_signal(id);
},
};
}
}
@ -220,10 +224,11 @@ impl DownloadManagerBuilder {
spawn(move || {
match download_agent.download() {
Ok(_) => {
sender.send(DownloadManagerSignal::Completed(download_agent.id.clone()));
sender.send(DownloadManagerSignal::Completed(download_agent.id.clone())).unwrap();
},
Err(_) => {
todo!() // Account for if the setup_download function fails
Err(e) => {
warn!("Download failed");
//todo!() // Account for if the setup_download function fails
},
};
});
@ -244,6 +249,22 @@ impl DownloadManagerBuilder {
*lock = GameDownloadStatus::Error;
self.set_status(DownloadManagerStatus::Error);
}
fn manage_cancel_signal(&mut self, game_id: String) {
if let Some(current_flag) = &self.active_control_flag {
current_flag.set(DownloadThreadControlFlag::Stop);
self.active_control_flag = None;
*self.progress.lock().unwrap() = None;
}
self.download_agent_registry.remove(&game_id);
let mut lock = self.download_queue.lock().unwrap();
let index = match lock.iter().position(|interface| interface.id == game_id) {
Some(index) => index,
None => return,
};
lock.remove(index);
self.sender.send(DownloadManagerSignal::Go).unwrap();
info!("{:?}", self.download_agent_registry.iter().map(|x| x.0.clone()).collect::<String>());
}
fn set_status(&self, status: DownloadManagerStatus) {
*self.status.lock().unwrap() = status;
}