refactor(lib): update to an optional worksheet name

Author: Matéo Fernandez

avro_schema.json

@@ -12,7 +12,8 @@
           "fields": [
             {
               "name": "name",
-              "type": "string"
+              "type": ["string", "null"],
+              "default": null
             },
             {
               "name": "autofit",
@@ -46,10 +47,10 @@
                           "type": "record",
                           "name": "Format",
                           "fields": [
-                            {"name": "fontName", "type": ["null", "string"], "default": null},
-                            {"name": "fontSize", "type": ["null", "int"], "default": null},
-                            {"name": "bold", "type": ["null", "boolean"], "default": null},
-                            {"name": "numFormat", "type": ["null", "string"], "default": null}
+                            {"name": "fontName", "type": ["string", "null"], "default": null},
+                            {"name": "fontSize", "type": ["int", "null"], "default": null},
+                            {"name": "bold", "type": ["boolean", "null"], "default": null},
+                            {"name": "numFormat", "type": ["string", "null"], "default": null}
                           ]
                         }
                       ],

src/excel/workbook.rs

@@ -16,17 +16,20 @@ impl WorkbookDto {
         let mut workbook = rust_xlsxwriter::Workbook::new();
 
         for worksheet_data in self.worksheets.iter() {
+            let worksheet = workbook.add_worksheet().set_formula_result_default("");
+
+            // set custom name if present
+            let worksheet = match &worksheet_data.name {
+                Some(custom_name) => worksheet.set_name(custom_name)?,
+                None => worksheet,
+            };
+
             info!(
                 "Add worksheet \"{}\" with {} cells to workbook",
-                worksheet_data.name,
+                worksheet.name(),
                 worksheet_data.cells.len(),
             );
 
-            let worksheet = workbook
-                .add_worksheet()
-                .set_name(worksheet_data.name.clone())?
-                .set_formula_result_default("");
-
             for cell in worksheet_data.cells.iter() {
                 if let Err(error) = cell.write_cell(worksheet) {
                     error!("Could not write in cell, found: {:?}", error);
@@ -45,7 +48,7 @@ impl WorkbookDto {
 #[derive(Debug, Serialize, Deserialize, Builder)]
 pub struct WorksheetDto {
     #[builder(into)]
-    pub name: String,
+    pub name: Option<String>,
     pub autofit: bool,
     #[builder(default)]
     cells: Vec<Cell>,

src/parser/html.rs

@@ -18,7 +18,7 @@ impl HtmlParser {
 
         let mut worksheets: Vec<WorksheetDto> = Vec::new();
 
-        for (table_index, table) in document.select(&selectors.table).enumerate() {
+        for table in document.select(&selectors.table) {
             let mut cells: Vec<Cell> = Vec::new();
 
             for (row_index, row) in table.select(&selectors.row).enumerate() {
@@ -49,11 +49,7 @@ impl HtmlParser {
                 }
             }
 
-            let worksheet = WorksheetDto::builder()
-                .name(format!("Feuille {}", table_index + 1))
-                .autofit(true)
-                .cells(cells)
-                .build();
+            let worksheet = WorksheetDto::builder().autofit(true).cells(cells).build();
 
             worksheets.push(worksheet);
         }