feat(core-error): change error handling in parse_dar2oar

SARDONYX-sard · Nov 10, 2023 · 2c6095b · 2c6095b
1 parent 6950905
commit 2c6095b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/dar2oar_core/src/condition_parser/mod.rs b/dar2oar_core/src/condition_parser/mod.rs
@@ -8,31 +8,33 @@ mod has;
 mod macros;
 
 use self::conditions::parse_conditions;
+pub use self::dar_interface::ParseError;
 use crate::conditions::ConditionSet;
 use crate::dar_syntax::{convert_error, syntax::parse_condition};
-use anyhow::bail;
+use crate::error::{ConvertError, Result};
 
-pub fn parse_dar2oar(input: &str) -> anyhow::Result<Vec<ConditionSet>> {
+pub fn parse_dar2oar(input: &str) -> Result<Vec<ConditionSet>> {
     let (remain, dar_syn) = match parse_condition(input) {
         Ok(syn) => {
             tracing::debug!("Input => Parsed DAR:\n{:?}", syn);
             syn
         }
         Err(err) => {
             let err = match err {
-                nom::Err::Incomplete(_) => bail!("Error Incomplete"),
+                nom::Err::Incomplete(_) => return Err(ConvertError::IncompleteConversion),
                 nom::Err::Error(err) => err,
                 nom::Err::Failure(err) => err,
             };
-            bail!(convert_error(input, err));
+            return Err(ConvertError::InvalidDarSyntax(convert_error(input, err)));
         }
     };
 
-    if !remain.is_empty() {
-        bail!("DAR syntax error. Unconverted this.:\n{}", remain);
+    match remain.is_empty() {
+        true => {
+            let oar = parse_conditions(dar_syn)?;
+            tracing::debug!("Parsed DAR => Serialized OAR:\n{:?}", &oar);
+            Ok(oar.try_into()?)
+        }
+        false => Err(ConvertError::InvalidDarSyntax(remain.into())),
     }
-
-    let oar = parse_conditions(dar_syn)?;
-    tracing::debug!("Parsed DAR => Serializable OAR:\n{:?}", oar);
-    Ok(oar.try_into()?)
 }
diff --git a/dar2oar_core/src/error.rs b/dar2oar_core/src/error.rs
@@ -12,6 +12,14 @@ pub enum ConvertError {
     NotFoundFileName,
     #[error("This is not valid utf8")]
     InvalidUtf8,
+    #[error("Incomplete conversion")]
+    IncompleteConversion,
+    #[error("DAR syntax error.:\n{0}")]
+    InvalidDarSyntax(String),
+    #[error(transparent)]
+    ConditionError(#[from] crate::conditions::ConditionError),
+    #[error(transparent)]
+    ParseError(#[from] crate::condition_parser::ParseError),
     #[error(transparent)]
     AnyhowError(#[from] anyhow::Error),
     /// Convert json error.