Merge pull request #7 from AmineDiro/fix/output-dir

fix: output dir

Author: AmineDiro

Dockerfile

@@ -7,10 +7,11 @@ RUN cargo chef prepare --recipe-path recipe.json
 
 # Build dependencies using recipe.json
 FROM chef AS builder
+RUN apt-get update -y && apt-get install -y clang
 COPY --from=planner /app/recipe.json recipe.json
 
 # Build dependencies - this layer is cached if dependencies don't change
-RUN cargo chef cook --release --recipe-path recipe.json
+RUN cargo +nightly chef cook --release --recipe-path recipe.json
 
 # Build application
 COPY . .

ferrules-cli/src/main.rs

@@ -51,6 +51,7 @@ struct Args {
     ///
     /// If not specified, defaults to the current working directory.
     #[arg(
+        short = 'o',
         long,
         env = "FERRULES_OUTPUT_DIR",
         help = "Specify the directory to store parsing result"
@@ -74,14 +75,6 @@ struct Args {
     )]
     save_images: bool,
 
-    /// Path to the layout model. If not specified, a default model will be used.
-    #[arg(
-        long,
-        env = "FERRULES_LAYOUT_MODEL_PATH",
-        help = "Specify the path to the layout model for document parsing"
-    )]
-    layout_model_path: Option<PathBuf>,
-
     /// Use CoreML for layout inference (default: true)
     #[arg(
         long,

ferrules-core/src/lib.rs

@@ -70,6 +70,14 @@ fn save_doc_images(imgs_dir: &Path, doc: &ParsedDocument) -> anyhow::Result<()>
     Ok(())
 }
 
+fn recreate_result_dir(result_dir_name: &Path) -> anyhow::Result<PathBuf> {
+    if std::fs::create_dir(result_dir_name).is_err() {
+        std::fs::remove_dir_all(result_dir_name)?;
+        std::fs::create_dir(result_dir_name)?;
+    };
+    Ok(result_dir_name.to_owned())
+}
+
 pub fn create_dirs<P: AsRef<Path>>(
     output_dir: Option<P>,
     doc_name: &str,
@@ -78,13 +86,13 @@ pub fn create_dirs<P: AsRef<Path>>(
 ) -> anyhow::Result<(PathBuf, Option<PathBuf>)> {
     let result_dir_name = format!("{}-results", sanitize_doc_name(doc_name));
     let res_dir_path = match output_dir {
-        Some(p) => p.as_ref().to_owned().join(&result_dir_name),
+        Some(p) => {
+            let result_dir_path = p.as_ref().to_owned().join(&result_dir_name);
+            recreate_result_dir(&result_dir_path)?
+        }
         None => {
-            if std::fs::create_dir(&result_dir_name).is_err() {
-                std::fs::remove_dir_all(&result_dir_name)?;
-                std::fs::create_dir(&result_dir_name)?;
-            };
-            format!("./{}", &result_dir_name).into()
+            let res_dir_path = PathBuf::from(format!("./{}", &result_dir_name));
+            recreate_result_dir(&res_dir_path)?
         }
     };
     if save_imgs {