Give --module and --businessobject flags priority

nithinphilips · Sep 3, 2024 · 6b15df3 · 6b15df3
1 parent 978ed61
commit 6b15df3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -2,6 +2,12 @@ Change Log
 ==========
 Odel Change Log
 
+v1.3.1
+------
+* Fix: If both ``--module`` and ``--businessobject`` CLI flags are set, do not
+  parse the file name, even if it's parseable. Use the user specified values
+  instead.
+
 v1.3.0
 ------
 * Enhanced support for 4.x TRIRIGA.

diff --git a/odel/Cargo.toml b/odel/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "odel"
-version = "1.3.0"
+version = "1.3.1"
 authors = ["Nithin Philips <[email protected]>"]
 edition = "2018"
 license = "GPLv3"

diff --git a/odel/src/main.rs b/odel/src/main.rs
@@ -399,30 +399,28 @@ fn parse_trim_files(files: &[&str],
             .file_name().ok_or_else(|| anyhow!("Error reading path"))?
             .to_str().ok_or_else(|| anyhow!("Error reading path"))?;
 
+        // This is not correct.
+        // If --module and --businessobject CLI flags are specified, we must not parse.
         let fc =
-            if let Some(mut fcc) = parse_filename(data_file) {
-                fcc.trimmed_filename = file_trim_strategy(file_name_only, FILE_NAME_MAX_LEN);
-                fcc
-            } else {
+            if module.is_some() && business_object.is_some() {
                 FileComponents {
-                    module: module
-                        .ok_or_else (|| anyhow!("The object type information could not be extracted \
-                    from file name `{}`. Specify it using --module, --businessobject and  \
-                    (optionally) --form.",
-                    data_file))?
-                        .to_string(),
-                    business_object: business_object
-                        .ok_or_else(|| anyhow!("The object type information could not be extracted \
-                    from file name `{}`. Specify it using --module, --businessobject and \
-                    (optionally) --form.", data_file))?
-                        .to_string(),
+                    module: String::from(module.unwrap()),
+                    business_object: String::from(business_object.unwrap()),
                     form: match form {
                         Some(s) => Some(s.to_string()),
                         None => None
                     },
                     filename: data_file.to_string(),
                     trimmed_filename: file_trim_strategy(file_name_only, FILE_NAME_MAX_LEN)
                 }
+            } else if let Some(mut fcc) = parse_filename(data_file) {
+                fcc.trimmed_filename = file_trim_strategy(file_name_only, FILE_NAME_MAX_LEN);
+                fcc
+            } else {
+                bail!("The object type information could not be extracted \
+                    from file name `{}`. Specify it using --module, --businessobject and  \
+                    (optionally) --form.",
+                    data_file);
             };
         result.push(fc);
     }