Merge pull request #4 from olback/add_ecad_formats

add support for easyeda & kicad

Author: olback

cli.yml

@@ -28,6 +28,7 @@ args:
         takes_value: true
         multiple: false
         conflicts_with:
+            - input
             - id
             - generate
     - output:
@@ -58,10 +59,10 @@ args:
             # - designspark_pcb_pro
             # - diptrace
             - eagle
-            # - easyeda
+            - easyeda
             # - easy_pc
             # - ecadstar
-            # - kicad
+            - kicad
             # - orcad_allegro16
             # - pads
             # - proteus

src/cse.rs

@@ -115,8 +115,10 @@ impl CSE {
 
             match &self.config.settings.format {
                 Format::EAGLE => format::eagle::Extractor::extract(&mut files, filename, &mut item)?,
-                // ! NOTE: DO NOT ADD A _ => {} CATCHER HERE!
+                Format::EASYEDA => format::easyeda::Extractor::extract(&mut files, filename, &mut item)?,
+                Format::KICAD => format::kicad::Extractor::extract(&mut files, filename, &mut item)?,
                 Format::ZIP => return Err(LLError::new("This should be unreachable!"))
+                // ! NOTE: DO NOT ADD A _ => {} CATCHER HERE!
             };
 
         }

src/format/eagle.rs

@@ -6,17 +6,8 @@ impl ExtractorTrait for Extractor {
 
     fn extract<S: Into<String>>(files: &mut Files, file_path: S, item: &mut ZipFile) -> LLResult<()> {
 
-        let fp = file_path.into();
+        generic_extractor("eagle", files, file_path, item)
 
-        if fp.to_lowercase().contains("eagle") {
-            let path = PathBuf::from(fp);
-            let base_name = path.file_name().unwrap().to_string_lossy().to_string();
-            let mut f_data = Vec::<u8>::new();
-            item.read_to_end(&mut f_data)?;
-            files.insert(base_name, f_data);
-        }
-
-        Ok(())
     }
 
 }

src/format/easyeda.rs

@@ -0,0 +1,13 @@
+use super::extractor_prelude::*;
+
+pub struct Extractor;
+
+impl ExtractorTrait for Extractor {
+
+    fn extract<S: Into<String>>(files: &mut Files, file_path: S, item: &mut ZipFile) -> LLResult<()> {
+
+        generic_extractor("easyeda", files, file_path, item)
+
+    }
+
+}

src/format/extractor_prelude.rs

@@ -7,7 +7,21 @@ pub(super) use std::{io::Read, path::PathBuf};
 pub type Files = HashMap::<String, Vec<u8>>;
 
 pub trait ExtractorTrait {
-    fn extract<S: Into<String>>(files: &mut Files, filepath: S, file: &mut ZipFile) -> LLResult<()>;
+    fn extract<S: Into<String>>(files: &mut Files, file_path: S, item: &mut ZipFile) -> LLResult<()>;
 }
 
+pub(super) fn generic_extractor<S: Into<String>>(match_path: &str, files: &mut Files, file_path: S, item: &mut ZipFile) -> LLResult<()> {
 
+    let fp = file_path.into();
+
+    if fp.to_lowercase().contains(match_path) {
+        let path = PathBuf::from(fp);
+        let base_name = path.file_name().unwrap().to_string_lossy().to_string();
+        let mut f_data = Vec::<u8>::new();
+        item.read_to_end(&mut f_data)?;
+        files.insert(base_name, f_data);
+    }
+
+    Ok(())
+
+}

src/format/kicad.rs

@@ -0,0 +1,13 @@
+use super::extractor_prelude::*;
+
+pub struct Extractor;
+
+impl ExtractorTrait for Extractor {
+
+    fn extract<S: Into<String>>(files: &mut Files, file_path: S, item: &mut ZipFile) -> LLResult<()> {
+
+        generic_extractor("kicad", files, file_path, item)
+
+    }
+
+}

src/format/mod.rs

@@ -1,4 +1,6 @@
 pub mod eagle;
+pub mod easyeda;
+pub mod kicad;
 
 pub(super) mod extractor_prelude;
 pub use extractor_prelude::{
@@ -9,6 +11,8 @@ pub use extractor_prelude::{
 #[derive(Debug, Clone, PartialEq)]
 pub enum Format {
     EAGLE,
+    EASYEDA,
+    KICAD,
     ZIP
 }
 
@@ -20,6 +24,8 @@ impl Format {
 
         match f.as_str() {
             "eagle" => Self::EAGLE,
+            "easyeda" => Self::EASYEDA,
+            "kicad" => Self::KICAD,
             "zip" => Self::ZIP,
             _ => {
                 eprintln!("Unknown format. Defaulting to ZIP!");

src/main.rs

@@ -48,7 +48,7 @@ fn real_main() -> LLResult<()> {
             Err(e) => Err(e)
         }
 
-    } else if conf.settings.watch_path.is_some() {
+    } else if conf.settings.watch_path.is_some() && conf.input.is_empty() {
 
         let p = conf.settings.watch_path.clone().unwrap();
         let mut w = Watcher::new(p, component_search_engine)?;
@@ -77,6 +77,10 @@ fn real_main() -> LLResult<()> {
 
     } else {
 
+        if conf.settings.watch_path.is_some() {
+            println!("Ignoring watch command since input was supplied");
+        }
+
         let e = match conf.treat_input_as_id {
             true => {
                 Epw::from_id(conf.input.parse::<u32>()?)