Desktop: OneNote importer: Handle the case where an entity GUID is missing (#13789)

Author: personalizedrefrigerator

packages/onenote-converter/parser/src/fsshttpb_onestore/object_space.rs

@@ -7,7 +7,7 @@ use crate::fsshttpb_onestore::revision_role::RevisionRole;
 use crate::onestore;
 use crate::shared::cell_id::CellId;
 use crate::shared::exguid::ExGuid;
-use parser_utils::errors::{ErrorKind, Result};
+use parser_utils::errors::Result;
 use std::collections::HashMap;
 
 pub(crate) type GroupData<'a> = HashMap<(ExGuid, u64), &'a ObjectGroupData>;
@@ -59,11 +59,14 @@ impl<'b> ObjectSpace {
         let object_space_id = cell_id.1;
 
         let cell_manifest_id = ObjectSpace::find_cell_manifest_id(mapping.id, packaging)
-            .ok_or_else(|| ErrorKind::MalformedOneStoreData("cell manifest id not found".into()))?;
+            .ok_or_else(|| parser_error!(MalformedOneStoreData, "cell manifest id not found"))?;
         let revision_manifest_id = storage_index
             .find_revision_mapping_id(cell_manifest_id)
             .ok_or_else(|| {
-                ErrorKind::MalformedOneStoreData("no revision manifest id found".into())
+                parser_error!(
+                    MalformedOneStoreData,
+                    "No revision manifest id found. (Unable to find revision?)."
+                )
             })?;
 
         let mut objects = HashMap::new();

packages/onenote-converter/parser/src/one/property_set/section_node.rs

@@ -7,7 +7,8 @@ use crate::one::property_set::PropertySetId;
 use crate::onestore::object::Object;
 use crate::shared::exguid::ExGuid;
 use crate::shared::guid::Guid;
-use parser_utils::errors::{ErrorKind, Result};
+use parser_utils::errors::Result;
+use parser_utils::log_warn;
 
 /// A section.
 ///
@@ -18,6 +19,7 @@ use parser_utils::errors::{ErrorKind, Result};
 #[allow(dead_code)]
 pub(crate) struct Data {
     //pub(crate) context_id: ExGuid, // Removed -- but may be necessary
+    /// Used for creating links to sections. If not present, defaults to `Guid::nil`.
     pub(crate) entity_guid: Guid,
     pub(crate) page_series: Vec<ExGuid>,
     pub(crate) created_at: Timestamp,
@@ -32,13 +34,14 @@ pub(crate) fn parse(object: Rc<Object>) -> Result<Data> {
 
     let object = object.as_ref();
     let entity_guid = simple::parse_guid(PropertyType::NotebookManagementEntityGuid, object)?
-        .ok_or_else(|| ErrorKind::MalformedOneNoteFileData("section has no guid".into()))?;
+        .unwrap_or_else(|| {
+            log_warn!("Section: Missing entity GUID");
+            Guid::nil()
+        });
     let page_series =
         ObjectReference::parse_vec(PropertyType::ElementChildNodes, object)?.unwrap_or_default();
     let created_at = Timestamp::parse(PropertyType::TopologyCreationTimeStamp, object)?
-        .ok_or_else(|| {
-            ErrorKind::MalformedOneNoteFileData("section has no creation timestamp".into())
-        })?;
+        .ok_or_else(|| parser_error!(MalformedOneNoteData, "Section has no creation timestamp"))?;
 
     let data = Data {
         //context_id,