feat: respect separator

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## Added
+
+- respect separaotir for excel conversion
+
 
 ## [1.3.1] - 2024-02-14
 

src/commands.rs

@@ -21,6 +21,7 @@ pub fn figure() -> Result<String, String> {
         Some(Commands::Excel { source, target }) => from_exel::all(
             &std::string::String::combine_with_working_dir(source, cli.working_dir.clone()),
             &std::string::String::combine_with_working_dir(target, cli.working_dir),
+            &cli.sep,
         ),
         None => Ok("try qwit --help for information on how to use qwit".to_string()),
     };

src/from_exel/mod.rs

@@ -6,8 +6,8 @@ use self::read_n_x::read;
 mod operators;
 mod read_n_x;
 
-pub fn all(source: &PathBuf, target: &PathBuf) -> Result<String, String> {
-    read(source, target)
+pub fn all(source: &PathBuf, target: &PathBuf, sep: &str) -> Result<String, String> {
+    read(source, target, sep)
 }
 
 #[derive(Debug)]
@@ -16,6 +16,7 @@ struct CsvError(String);
 trait CsvRowOperator {
     fn operate(
         &mut self,
+        separator: String,
         rows: impl Iterator<Item = impl Iterator<Item = CsvValue>>,
     ) -> Result<(), CsvError>;
 }

src/from_exel/operators.rs

@@ -10,6 +10,7 @@ pub struct PrintOperator;
 impl CsvRowOperator for PrintOperator {
     fn operate(
         &mut self,
+        _separator: String,
         rows: impl Iterator<Item = impl Iterator<Item = CsvValue>>,
     ) -> Result<(), CsvError> {
         rows.for_each(|r| {
@@ -30,6 +31,7 @@ pub struct FileWritingOperator {
 impl CsvRowOperator for FileWritingOperator {
     fn operate(
         &mut self,
+        separator: String,
         rows: impl Iterator<Item = impl Iterator<Item = CsvValue>>,
     ) -> Result<(), CsvError> {
         rows.for_each(|r| {
@@ -39,7 +41,7 @@ impl CsvRowOperator for FileWritingOperator {
             values.iter().enumerate().for_each(|(n, v)| {
                 self.write(v);
                 if n != len {
-                    self.sep(";");
+                    self.sep(&separator);
                 }
             });
 

src/from_exel/read_n_x.rs

@@ -4,7 +4,7 @@ use calamine::{open_workbook_auto, Data, Range, Reader};
 
 use super::{operators::FileWritingOperator, CsvError, CsvRow, CsvRowOperator};
 
-pub fn read(source: &PathBuf, target: &PathBuf) -> Result<String, String> {
+pub fn read(source: &PathBuf, target: &PathBuf, sep: &str) -> Result<String, String> {
     // find source file
     let sce = PathBuf::from(source);
     match sce.extension().and_then(|s| s.to_str()) {
@@ -27,9 +27,13 @@ pub fn read(source: &PathBuf, target: &PathBuf) -> Result<String, String> {
             .unwrap();
         let target = BufWriter::new(target_file);
 
-        let res = write_range(range, FileWritingOperator { writer: target })
-            .map(|()| format!("Done writing sheet: {title}"))
-            .map_err(|err| err.0);
+        let res = write_range(
+            range,
+            FileWritingOperator { writer: target },
+            sep.to_owned(),
+        )
+        .map(|()| format!("Done writing sheet: {title}"))
+        .map_err(|err| err.0);
 
         match res {
             Ok(o) => println!("{o}"),
@@ -40,7 +44,11 @@ pub fn read(source: &PathBuf, target: &PathBuf) -> Result<String, String> {
     Ok("All Done".to_owned())
 }
 
-fn write_range(range: &Range<Data>, mut operator: impl CsvRowOperator) -> Result<(), CsvError> {
+fn write_range(
+    range: &Range<Data>,
+    mut operator: impl CsvRowOperator,
+    sep: String,
+) -> Result<(), CsvError> {
     let all_rows = range.rows().map(CsvRow::iterator);
-    operator.operate(all_rows)
+    operator.operate(sep, all_rows)
 }