Report progress when importing a single Excel file

Cargo.toml

@@ -56,12 +56,13 @@ tower = {version = "0.4", features = ["util"]}
 default = ["embed-documentation"]
 embed-documentation = ["dep:include_dir", "dep:axum", "dep:tokio", "dep:mime_guess", "dep:portpicker", "dep:open"]
 
-# Compile some of the dev dependencies in release mode
-[profile.dev.package.insta]
-opt-level = 3
-
-[profile.dev.package.similar]
-opt-level = 3
+# Compile some of the dependencies in release mode if when we are ourself in
+# "dev" mode (like building debug binaries or running tests)
+[profile.dev.package]
+graphannis-core.opt-level = 3
+graphannis.opt-level = 3
+insta.opt-level = 3
+similar.opt-level = 3
 
 [profile.release]
 panic = 'abort'

src/importer/spreadsheet.rs

@@ -22,7 +22,7 @@
 
 pub const MODULE_NAME: &str = "import_spreadsheet";
 
 #[derive(Default, Deserialize)]
 #[serde(default)]
 pub struct ImportSpreadsheet {
     column_map: BTreeMap<String, BTreeSet<String>>,
@@ -71,7 +71,7 @@
                         }
                     }
                 }
             }
         }
         m
     };
@@ -87,14 +87,14 @@
             let start_col = match cell_range.get_coordinate_start_col().as_ref() {
                 Some(c) => c,
                 None => {
                     if let Some(sender) = tx {
                         let message = StatusMessage::Warning(format!(
                             "Could not parse start column of merged cell {}",
                             cell_range.get_range()
                         ));
                         sender.send(message)?;
                     }
                     continue;
                 }
             };
             let col_1i = start_col.get_num();
@@ -107,7 +107,7 @@
                             cell_range.get_range()
                         ));
                         sender.send(message)?;
                     }
                     start_col
                 }
             };
@@ -123,14 +123,14 @@
             let start_row = match cell_range.get_coordinate_start_row().as_ref() {
                 Some(r) => r,
                 None => {
                     if let Some(sender) = tx {
                         let message = StatusMessage::Warning(format!(
                             "Could not parse start row of merged cell {}",
                             cell_range.get_range()
                         ));
                         sender.send(message)?;
                     }
                     continue;
                 }
             };
             let start_1i = start_row.get_num();
@@ -143,7 +143,7 @@
                             cell_range.get_range()
                         ));
                         sender.send(message)?;
                     }
                     start_row
                 }
             };
@@ -159,7 +159,7 @@
                     cell_range.get_range()
                 ));
                 sender.send(message)?;
             }
         }
         m
     };
@@ -286,7 +286,7 @@
                     StatusMessage::Info(format!("No column `{name}` in file {}", &doc_path));
                 sender.send(message)?;
                 continue;
             }
         }
     }
     Ok(())
@@ -301,16 +301,27 @@
         let mut update = GraphUpdate::default();
         let column_map = &self.column_map;
         let all_files = get_all_files(input_path, vec!["xlsx"])?;
-        all_files.into_iter().try_for_each(|pb| {
-            import_workbook(
-                &mut update,
-                input_path,
-                pb.as_path(),
-                column_map,
-                &self.fallback,
-                &tx,
-            )
-        })?;
+        let number_of_files = all_files.len();
+        all_files
+            .into_iter()
+            .enumerate()
+            .try_for_each(|(job_nr, pb)| {
+                if let Some(tx) = &tx {
+                    tx.send(StatusMessage::Progress {
+                        id: self.step_id(Some(&pb)),
+                        total_work: number_of_files,
+                        finished_work: job_nr,
+                    })?;
+                }
+                import_workbook(
+                    &mut update,
+                    input_path,
+                    pb.as_path(),
+                    column_map,
+                    &self.fallback,
+                    &tx,
+                )
+            })?;
         Ok(update)
     }
 }
@@ -402,7 +413,7 @@
             let count = cs.count(query)?;
             assert_eq!(
                 count, expected_result,
                 "Result for query `{}` does not match",
                 query_s
             );
         }
@@ -414,8 +425,8 @@
         let import = run_spreadsheet_import(false, None);
         assert!(
             import.is_ok(),
             "Spreadsheet import failed with error: {:?}",
             import.err()
         );
     }