fix: Overhaul of error handling

contentauth · Feb 7, 2025 · 077a285 · 077a285
1 parent 85201a7
commit 077a285
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 25 deletions.
diff --git a/cli/src/cawg_parser.rs b/cli/src/cawg_parser.rs
@@ -17,7 +17,7 @@ use tokio::runtime::Runtime;
 
 /// Update/decorate the displayed JSON assertions for a more human-readable JSON output.
 fn decorate_cawg_assertion_from_detailed_report(
-    reader: Reader,
+    reader: &Reader,
     json_content: &mut Value,
     tokio_runtime: &Runtime,
 ) -> Result<(), Error> {
@@ -91,7 +91,7 @@ fn decorate_cawg_assertion_from_detailed_report(
 
 /// Update/decorate the displayed JSON assertions for a more human-readable JSON output.
 fn decorate_json_assertions(
-    reader: Reader,
+    reader: &Reader,
     json_content: &mut Value,
     tokio_runtime: &Runtime,
 ) -> Result<(), Error> {
@@ -292,48 +292,57 @@ fn get_cawg_details_for_manifest(
 
 /// Update/decorate the detailed displayed JSON string for a more human-readable JSON output.
 pub(crate) fn decorate_json_detailed_display(
-    reader: Reader,
-    extracted_report: String,
+    reader: &Reader,
     tokio_runtime: &Runtime,
-) -> String {
+) -> Result<String, Error> {
+    let json_report = reader.json_report();
+    let extracted_report = match json_report {
+        Ok(extracted_json_report) => extracted_json_report,
+        Err(err) => {
+            let message = format!("Could not parse JSON report: {:?}", err);
+            return Err(crate::Error::JsonSerializationError(message));
+        }
+    };
+
     let mut report_json_map: Map<String, Value> = match serde_json::from_str(&extracted_report) {
         Ok(report_json_map) => report_json_map,
         Err(err) => {
-            eprintln!("Could not parse extracted JSON report: {:?}", err);
-            return String::new();
+            let message = format!("Could not parse extracted JSON detailed report: {:?}", err);
+            return Err(crate::Error::JsonSerializationError(message));
         }
     };
 
     let manifests = match report_json_map.get_mut("manifests") {
         Some(manifests) => manifests,
         None => {
-            eprintln!("No parsable JSON in manifest store (key: manifests)");
-            return String::new();
+            return Err(crate::Error::JsonSerializationError(
+                "No parsable JSON in manifest store (key: manifests)".to_string(),
+            ));
         }
     };
 
     match decorate_cawg_assertion_from_detailed_report(reader, manifests, tokio_runtime) {
         Ok(_) => (),
         Err(err) => {
-            eprintln!("Could not decorate detailed JSON for display: {:?}", err);
-            return String::new();
+            let message = format!("Could not decorate detailed JSON for display: {:?}", err);
+            return Err(crate::Error::JsonSerializationError(message));
         }
     };
 
     match serde_json::to_string_pretty(&report_json_map) {
-        Ok(decorated_result) => decorated_result,
+        Ok(decorated_result) => Ok(decorated_result),
         Err(err) => {
-            eprintln!(
+            let message = format!(
                 "Could not decorate displayed detailed JSON with additional details: {:?}",
                 err
             );
-            String::new()
+            return Err(crate::Error::JsonSerializationError(message));
         }
     }
 }
 
 /// Update/decorate the displayed JSON string for a more human-readable JSON output.
-pub(crate) fn decorate_json_display(reader: Reader, tokio_runtime: &Runtime) -> String {
+pub(crate) fn decorate_json_display(reader: &Reader, tokio_runtime: &Runtime) -> String {
     let mut reader_content = match reader.json_value_map() {
         Ok(mapped_json) => mapped_json,
         Err(_) => {

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -681,16 +681,14 @@ fn main() -> Result<()> {
         )
     } else if args.detailed {
         let reader = Reader::from_file(&args.path).map_err(special_errs)?;
-
-        let json_report = reader.json_report();
-        let extracted_json_report = match json_report {
-            Ok(extracted_json_report) => extracted_json_report,
-            Err(err) => format!("Could not parse JSON report: {:?}", err),
+        let decorated_details_manifest = decorate_json_detailed_display(&reader, &tokio_runtime);
+        match decorated_details_manifest {
+            Ok(decorated_details_manifest) => println!("{}", decorated_details_manifest),
+            Err(_) => {
+                // fall back to raw display of data (unparsed CAWG)
+                println!("{:#?}", reader)
+            }
         };
-
-        let decorated_details_manifest =
-            decorate_json_detailed_display(reader, extracted_json_report, &tokio_runtime);
-        println!("{}", decorated_details_manifest);
     } else if let Some(Commands::Fragment {
         fragments_glob: Some(fg),
     }) = &args.command
@@ -703,7 +701,8 @@ fn main() -> Result<()> {
         }
     } else {
         let reader: Reader = Reader::from_file(&args.path).map_err(special_errs)?;
-        let stringified_decorated_json = decorate_json_display(reader, &tokio_runtime);
+
+        let stringified_decorated_json = decorate_json_display(&reader, &tokio_runtime);
         println!("{}", stringified_decorated_json);
     }