leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve tracking of progress operations

Browse source
This commit is contained in:
Jeremy Soller 2024-11-14 16:07:45 -07:00
parent 6a79e8178f
commit bbfe5cbdf3
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/app.rs
View file

@ -43,7 +43,7 @@ use notify_debouncer_full::{
use slotmap::Key as SlotMapKey; use slotmap::Key as SlotMapKey;
use std::{ use std::{
any::TypeId, any::TypeId,
collections::{BTreeMap, HashMap, HashSet, VecDeque}, collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque},
env, fmt, fs, io, env, fmt, fs, io,
num::NonZeroU16, num::NonZeroU16,
path::PathBuf, path::PathBuf,
@ -523,7 +523,7 @@ pub struct App {
notification_opt: Option<Arc<Mutex<notify_rust::NotificationHandle>>>, notification_opt: Option<Arc<Mutex<notify_rust::NotificationHandle>>>,
pending_operation_id: u64, pending_operation_id: u64,
pending_operations: BTreeMap<u64, (Operation, f32, Arc<AtomicBool>)>, pending_operations: BTreeMap<u64, (Operation, f32, Arc<AtomicBool>)>,
progress_operations: usize, progress_operations: BTreeSet<u64>,
complete_operations: BTreeMap<u64, Operation>, complete_operations: BTreeMap<u64, Operation>,
failed_operations: BTreeMap<u64, (Operation, f32, String)>, failed_operations: BTreeMap<u64, (Operation, f32, String)>,
search_id: widget::Id, search_id: widget::Id,
@ -702,7 +702,7 @@ impl App {
let id = self.pending_operation_id; let id = self.pending_operation_id;
self.pending_operation_id += 1; self.pending_operation_id += 1;
if operation.show_progress_notification() { if operation.show_progress_notification() {
self.progress_operations += 1; self.progress_operations.insert(id);
} }
self.pending_operations self.pending_operations
.insert(id, (operation, 0.0, Arc::new(AtomicBool::new(false)))); .insert(id, (operation, 0.0, Arc::new(AtomicBool::new(false))));
@ -1414,7 +1414,7 @@ impl Application for App {
notification_opt: None, notification_opt: None,
pending_operation_id: 0, pending_operation_id: 0,
pending_operations: BTreeMap::new(), pending_operations: BTreeMap::new(),
progress_operations: 0, progress_operations: BTreeSet::new(),
complete_operations: BTreeMap::new(), complete_operations: BTreeMap::new(),
failed_operations: BTreeMap::new(), failed_operations: BTreeMap::new(),
search_id: widget::Id::unique(), search_id: widget::Id::unique(),
@ -2336,11 +2336,13 @@ impl Application for App {
Message::PendingCancel(id) => { Message::PendingCancel(id) => {
if let Some((_, _, cancelled)) = self.pending_operations.get(&id) { if let Some((_, _, cancelled)) = self.pending_operations.get(&id) {
cancelled.store(true, Ordering::SeqCst); cancelled.store(true, Ordering::SeqCst);
self.progress_operations.remove(&id);
} }
} }
Message::PendingCancelAll => { Message::PendingCancelAll => {
for (_id, (_, _, cancelled)) in self.pending_operations.iter() { for (id, (_, _, cancelled)) in self.pending_operations.iter() {
cancelled.store(true, Ordering::SeqCst); cancelled.store(true, Ordering::SeqCst);
self.progress_operations.remove(&id);
} }
} }
Message::PendingComplete(id) => { Message::PendingComplete(id) => {
@ -2370,7 +2372,7 @@ impl Application for App {
.iter() .iter()
.any(|(_id, (op, _, _))| op.show_progress_notification()) .any(|(_id, (op, _, _))| op.show_progress_notification())
{ {
self.progress_operations = 0; self.progress_operations.clear();
} }
// Potentially show a notification // Potentially show a notification
commands.push(self.update_notification()); commands.push(self.update_notification());
@ -2381,7 +2383,7 @@ impl Application for App {
return Task::batch(commands); return Task::batch(commands);
} }
Message::PendingDismiss => { Message::PendingDismiss => {
self.progress_operations = 0; self.progress_operations.clear();
} }
Message::PendingError(id, err) => { Message::PendingError(id, err) => {
if let Some((op, progress, cancelled)) = self.pending_operations.remove(&id) { if let Some((op, progress, cancelled)) = self.pending_operations.remove(&id) {
@ -2390,6 +2392,7 @@ impl Application for App {
if !cancelled.load(Ordering::SeqCst) { if !cancelled.load(Ordering::SeqCst) {
self.dialog_pages.push_back(DialogPage::FailedOperation(id)); self.dialog_pages.push_back(DialogPage::FailedOperation(id));
} }
self.progress_operations.remove(&id);
} }
// Manually rescan any trash tabs after any operation is completed // Manually rescan any trash tabs after any operation is completed
return self.rescan_trash(); return self.rescan_trash();
@ -3792,7 +3795,7 @@ impl Application for App {
} }
fn footer(&self) -> Option<Element<Message>> { fn footer(&self) -> Option<Element<Message>> {
if self.progress_operations == 0 { if self.progress_operations.is_empty() {
return None; return None;
} }
@ -3815,7 +3818,7 @@ impl Application for App {
count += 1; count += 1;
} }
} }
while count < self.progress_operations { while count < self.progress_operations.len() {
total_progress += 100.0; total_progress += 100.0;
count += 1; count += 1;
} }