Improved error handling

src/Tools/psxcdgen_ex/Cargo.toml

@@ -8,4 +8,5 @@ edition = "2021"
 [dependencies]
 cdtypes     = {path = "../cdtypes"}
 paste       = "*"
+roxmltree   = "*"
 tool_helper = {path = "../tool_helper"}

src/Tools/psxcdgen_ex/src/config_reader/mod.rs

@@ -1,5 +1,6 @@
+use super::{Error, ErrorString};
 mod xml;
 
-pub fn parse_xml(xml: String) {
-    println!("Wuff: {}", xml);
+pub fn parse_xml(xml: String) -> Result<(), Error> {
+    Ok(xml::parse(xml)?)
 }

src/Tools/psxcdgen_ex/src/config_reader/xml.rs

@@ -0,0 +1,21 @@
+use super::ErrorString;
+
+pub fn parse(xml: String) -> Result<(), Error> {
+    roxmltree::Document::parse(xml.as_str())?;
+
+    Ok(())
+}
+
+pub struct Error(roxmltree::Error);
+
+impl ErrorString for Error {
+    fn to_string(self) -> String {
+        self.0.to_string()
+    }
+}
+
+impl std::convert::From<roxmltree::Error> for Error {
+    fn from(error: roxmltree::Error) -> Error {
+        Error(error)
+    }
+}

src/Tools/psxcdgen_ex/src/lib.rs

@@ -1,3 +1,5 @@
+pub use tool_helper::{Error, ErrorString};
+
 pub mod config_reader;
 pub mod encoder;
 pub mod file_writer;

src/Tools/psxcdgen_ex/src/main.rs

@@ -59,8 +59,7 @@ fn run_main() -> Result<(), Error> {
 }
 
 fn run_main_xml() -> Result<(), Error> {
-    config_reader::parse_xml(std::fs::read_to_string("../Tests/ISO_Planschbecken.xml")?);
-    Ok(())
+    config_reader::parse_xml(std::fs::read_to_string("../Tests/ISO_Planschbecken.xml")?)
 }
 
 fn main() {