mirror of
https://github.com/Drop-OSS/drop-app.git
synced 2025-11-13 08:12:44 +10:00
Adding checks for the stopper callback
Signed-off-by: quexeky <git@quexeky.dev>
This commit is contained in:
@ -1,4 +1,4 @@
|
|||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{atomic::Ordering, Arc, Mutex};
|
||||||
|
|
||||||
use log::info;
|
use log::info;
|
||||||
|
|
||||||
@ -74,3 +74,16 @@ pub async fn start_game_download(
|
|||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn stop_specific_game_download(state: tauri::State<'_, Mutex<AppState>>, game_id: String) -> Result<(), String> {
|
||||||
|
let lock = state.lock().unwrap();
|
||||||
|
let download_agent = lock.game_downloads.get(&game_id).unwrap();
|
||||||
|
|
||||||
|
let callback = download_agent.callback.clone();
|
||||||
|
drop(lock);
|
||||||
|
|
||||||
|
callback.store(true, Ordering::Release);
|
||||||
|
|
||||||
|
return Ok(())
|
||||||
|
}
|
||||||
@ -5,7 +5,7 @@ use crate::DB;
|
|||||||
use gxhash::{gxhash128, GxHasher};
|
use gxhash::{gxhash128, GxHasher};
|
||||||
use log::info;
|
use log::info;
|
||||||
use md5::{Context, Digest};
|
use md5::{Context, Digest};
|
||||||
use std::{fs::{File, OpenOptions}, hash::Hasher, io::{self, Seek, SeekFrom, Write}, path::PathBuf, sync::{atomic::{AtomicBool, Ordering}, Arc}};
|
use std::{fs::{File, OpenOptions}, hash::Hasher, io::{self, BufWriter, Error, ErrorKind, Seek, SeekFrom, Write}, path::PathBuf, sync::{atomic::{AtomicBool, Ordering}, Arc}};
|
||||||
use urlencoding::encode;
|
use urlencoding::encode;
|
||||||
|
|
||||||
pub struct DropFileWriter {
|
pub struct DropFileWriter {
|
||||||
@ -26,10 +26,11 @@ impl DropFileWriter {
|
|||||||
Ok(self.hasher.compute())
|
Ok(self.hasher.compute())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// TODO: Implement error handling
|
||||||
impl Write for DropFileWriter {
|
impl Write for DropFileWriter {
|
||||||
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
|
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
|
||||||
if self.callback.load(Ordering::Acquire) {
|
if self.callback.load(Ordering::Acquire) {
|
||||||
|
return Err(Error::new(ErrorKind::Interrupted, "Interrupt command recieved"));
|
||||||
}
|
}
|
||||||
self.hasher.write_all(buf).unwrap();
|
self.hasher.write_all(buf).unwrap();
|
||||||
self.file.write(buf)
|
self.file.write(buf)
|
||||||
@ -71,7 +72,7 @@ pub fn download_game_chunk(ctx: DropDownloadContext, callback: Arc<AtomicBool>)
|
|||||||
.send()
|
.send()
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
let mut file: DropFileWriter = DropFileWriter::new(ctx.path);
|
let mut file: DropFileWriter = DropFileWriter::new(ctx.path, callback);
|
||||||
|
|
||||||
if ctx.offset != 0 {
|
if ctx.offset != 0 {
|
||||||
file
|
file
|
||||||
@ -79,12 +80,19 @@ pub fn download_game_chunk(ctx: DropDownloadContext, callback: Arc<AtomicBool>)
|
|||||||
.expect("Failed to seek to file offset");
|
.expect("Failed to seek to file offset");
|
||||||
}
|
}
|
||||||
|
|
||||||
// let mut stream = BufWriter::with_capacity(1024, file);
|
// Writing everything to disk directly is probably slightly faster because it balances out the writes,
|
||||||
|
// but this is better than the performance loss from constantly reading the callbacks
|
||||||
|
|
||||||
// Writing directly to disk to avoid write spikes that delay everything
|
let mut writer = BufWriter::with_capacity(1024 * 1024, file);
|
||||||
|
|
||||||
|
match response.copy_to(&mut writer) {
|
||||||
response.copy_to(&mut file).unwrap();
|
Ok(_) => {},
|
||||||
|
Err(_) => { println!("Stopped printing chunk {}", ctx.file_name); return; }
|
||||||
|
};
|
||||||
|
let file = match writer.into_inner() {
|
||||||
|
Ok(inner) => inner,
|
||||||
|
Err(_) => panic!("Failed to get BufWriter inner"),
|
||||||
|
};
|
||||||
let res = hex::encode(file.finish().unwrap().0);
|
let res = hex::encode(file.finish().unwrap().0);
|
||||||
if res != ctx.checksum {
|
if res != ctx.checksum {
|
||||||
info!("Checksum failed. Original: {}, Calculated: {} for {}", ctx.checksum, res, ctx.file_name);
|
info!("Checksum failed. Original: {}, Calculated: {} for {}", ctx.checksum, res, ctx.file_name);
|
||||||
|
|||||||
@ -4,13 +4,12 @@ mod library;
|
|||||||
mod remote;
|
mod remote;
|
||||||
mod unpacker;
|
mod unpacker;
|
||||||
mod downloads;
|
mod downloads;
|
||||||
mod utils;
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests;
|
mod tests;
|
||||||
|
|
||||||
use auth::{auth_initiate, generate_authorization_header, recieve_handshake};
|
use auth::{auth_initiate, generate_authorization_header, recieve_handshake};
|
||||||
use db::{DatabaseInterface, DATA_ROOT_DIR};
|
use db::{DatabaseInterface, DATA_ROOT_DIR};
|
||||||
use downloads::download_commands::{queue_game_download, start_game_downloads};
|
use downloads::download_commands::{queue_game_download, start_game_downloads, stop_specific_game_download};
|
||||||
use env_logger::Env;
|
use env_logger::Env;
|
||||||
use http::{header::*, response::Builder as ResponseBuilder};
|
use http::{header::*, response::Builder as ResponseBuilder};
|
||||||
use library::{fetch_game, fetch_library, Game};
|
use library::{fetch_game, fetch_library, Game};
|
||||||
@ -115,7 +114,8 @@ pub fn run() {
|
|||||||
fetch_game,
|
fetch_game,
|
||||||
// Downloads
|
// Downloads
|
||||||
queue_game_download,
|
queue_game_download,
|
||||||
start_game_downloads
|
start_game_downloads,
|
||||||
|
stop_specific_game_download
|
||||||
])
|
])
|
||||||
.plugin(tauri_plugin_shell::init())
|
.plugin(tauri_plugin_shell::init())
|
||||||
.setup(|app| {
|
.setup(|app| {
|
||||||
|
|||||||
@ -18,6 +18,6 @@ fn test_progress_parallel() {
|
|||||||
p.run_contexts_parallel_background((1..100).collect(), 10);
|
p.run_contexts_parallel_background((1..100).collect(), 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_fn(int: usize) {
|
fn test_fn(int: usize, callback: Arc<AtomicBool>) {
|
||||||
println!("{}", int);
|
println!("{}", int);
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user