"fix" upload count not tracking right

Satellite-im · Jan 22, 2024 · 51de925 · 51de925
1 parent fd53289
commit 51de925
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/common/src/upload_file_channel.rs b/common/src/upload_file_channel.rs
@@ -11,7 +11,7 @@ pub enum UploadFileAction<T> {
     Cancelling,
     UploadFiles(Vec<PathBuf>),
     Uploading((String, String, String)),
-    Finishing,
+    Finishing(PathBuf, bool),
     Finished(T),
     Error,
 }

diff --git a/common/src/warp_runner/manager/commands/constellation_commands.rs b/common/src/warp_runner/manager/commands/constellation_commands.rs
@@ -511,6 +511,12 @@ async fn handle_upload_progress(
                             percentage_number as usize
                         )
                     }
+                    // ConstellationProgressStream only ends (atm) when all files in the queue are done uploading
+                    // This causes pending file count to not be updated which is way we send a message here too
+                    if current_percentage == 100 {
+                        let _ = tx_upload_file
+                            .send(UploadFileAction::Finishing(file_path.clone(), false));
+                    }
                 }
             }
             Progression::ProgressComplete { name, total } => {
@@ -589,7 +595,7 @@ async fn handle_upload_progress(
             }
         };
     }
-    let _ = tx_upload_file.send(UploadFileAction::Finishing);
+    let _ = tx_upload_file.send(UploadFileAction::Finishing(file_path, true));
     log::info!("{:?} file uploaded!", filename);
 }
 

diff --git a/ui/src/layouts/storage/functions.rs b/ui/src/layouts/storage/functions.rs
@@ -553,10 +553,12 @@ pub fn start_upload_file_listener(
                         upload_progress_bar::change_progress_percentage(&window, progress.clone());
                         upload_progress_bar::change_progress_description(&window, msg);
                     }
-                    UploadFileAction::Finishing => {
+                    UploadFileAction::Finishing(file, finish) => {
                         *files_been_uploaded.write_silent() = true;
-                        if !files_in_queue_to_upload.read().is_empty() {
-                            files_in_queue_to_upload.with_mut(|i| i.remove(0));
+                        if !files_in_queue_to_upload.read().is_empty()
+                            && (finish || files_in_queue_to_upload.read().len() > 1)
+                        {
+                            files_in_queue_to_upload.with_mut(|i| i.retain(|p| !p.eq(&file)));
                             upload_progress_bar::update_files_queue_len(
                                 &window,
                                 files_in_queue_to_upload.read().len(),