diff --git a/prdoclib/src/commands/load.rs b/prdoclib/src/commands/load.rs index 4a5532e..ac57e56 100644 --- a/prdoclib/src/commands/load.rs +++ b/prdoclib/src/commands/load.rs @@ -53,7 +53,7 @@ impl LoadCmd { let yaml = self.schema.load(&file); if let Ok(value) = yaml { - Some(DocFileWrapper::new(file, filename, value)) + Some(DocFileWrapper::new(file, filename, Some(value))) } else { global_result &= false; None @@ -74,7 +74,7 @@ impl LoadCmd { /// Load one file and returns a wrapper pub fn load_file(&self, file: &PathBuf) -> Result { let filename = DocFileName::try_from(file)?; - let value = self.schema.load(&file)?; + let value = self.schema.load(&file).ok(); let wrapper = DocFileWrapper::new(file.clone(), filename, value); Ok(wrapper) } @@ -103,7 +103,7 @@ impl LoadCmd { if let Ok(filename) = filename_maybe { let yaml = self.schema.load(&file); if let Ok(value) = yaml { - let wrapper = DocFileWrapper::new(file.clone(), filename, value); + let wrapper = DocFileWrapper::new(file.clone(), filename, Some(value)); global_result &= true; log::debug!("OK {}", file.display()); diff --git a/prdoclib/src/docfile_wrapper.rs b/prdoclib/src/docfile_wrapper.rs index 12ffbe8..f60e8f9 100644 --- a/prdoclib/src/docfile_wrapper.rs +++ b/prdoclib/src/docfile_wrapper.rs @@ -19,12 +19,12 @@ pub struct DocFileWrapper { pub doc_filename: DocFileName, /// The content of the PRDoc - pub content: Value, + pub content: Option, } impl DocFileWrapper { /// Create a new wrapper - pub fn new(file: PathBuf, filename: DocFileName, content: Value) -> Self { + pub fn new(file: PathBuf, filename: DocFileName, content: Option) -> Self { let file = file.canonicalize().expect("Canonicalize works"); Self { file, doc_filename: filename, content } }