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

fix: assorted fixes

Browse Source
This commit is contained in:
DecDuck
2025-01-20 11:42:09 +11:00
parent 92729701c3
commit 89ea34c94e
16 changed files with 166 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src-tauri/src/download_manager/download_manager_builder.rs
View File

@ -350,6 +350,8 @@ impl DownloadManagerBuilder {
meta: DownloadableMetadata::clone(key),
status: val.status(),
progress: val.progress().get_progress(),
current: val.progress().sum(),
max: val.progress().get_max(),
}
})
.collect();

25
src-tauri/src/download_manager/progress_object.rs
View File

@ -23,7 +23,7 @@ pub struct ProgressObject {
//last_update: Arc<RwLock<Instant>>,
last_update_time: Arc<AtomicInstant>,
bytes_last_update: Arc<AtomicUsize>,
rolling: RollingProgressWindow<256>,
rolling: RollingProgressWindow<250>,
}
pub struct ProgressHandle {
@ -46,6 +46,15 @@ impl ProgressHandle {
.fetch_add(amount, std::sync::atomic::Ordering::Relaxed);
calculate_update(&self.progress_object);
}
pub fn skip(&self, amount: usize) {
self.progress
.fetch_add(amount, std::sync::atomic::Ordering::Relaxed);
// Offset the bytes at last offset by this amount
self.progress_object
.bytes_last_update
.fetch_add(amount, Ordering::Relaxed);
// Dont' fire update
}
}
impl ProgressObject {
@ -97,15 +106,15 @@ impl ProgressObject {
}
#[throttle(1, Duration::from_millis(20))]
pub fn calculate_update(progress_object: &ProgressObject) {
let last_update_time = progress_object
pub fn calculate_update(progress: &ProgressObject) {
let last_update_time = progress
.last_update_time
.swap(Instant::now(), Ordering::SeqCst);
let time_since_last_update = Instant::now().duration_since(last_update_time).as_millis();
let current_bytes_downloaded = progress_object.sum();
let max = progress_object.get_max();
let bytes_at_last_update = progress_object
let current_bytes_downloaded = progress.sum();
let max = progress.get_max();
let bytes_at_last_update = progress
.bytes_last_update
.swap(current_bytes_downloaded, Ordering::Relaxed);
@ -115,8 +124,8 @@ pub fn calculate_update(progress_object: &ProgressObject) {
let bytes_remaining = max - current_bytes_downloaded; // bytes
progress_object.update_window(kilobytes_per_second);
push_update(progress_object, bytes_remaining);
progress.update_window(kilobytes_per_second);
push_update(progress, bytes_remaining);
}
#[throttle(1, Duration::from_millis(500))]