Fixes loading from database if a serialized ron DocSpan exists.

Author: tcr

edit-server/src/db/queries.rs

@@ -68,6 +68,7 @@ pub fn get_single_page(db: &SqliteConnection, input_id: &str) -> Option<Doc<RtfS
     post.map_err::<Error, _>(|x| x.into())
         .map(|x| x.body.to_string())
         .and_then(|x| {
+            eprintln!("loading... {:?}", x);
             Ok(oatie::deserialize::doc_ron(&x).or(serde_json::from_str::<Doc<RtfSchema>>(&x))?)
         })
         .ok()

oatie/src/deserialize.rs

@@ -467,18 +467,23 @@ pub fn doc_ron(input: &str) -> Result<crate::doc::Doc<crate::rtf::RtfSchema>, Er
     match ron::de::from_str::<crate::doc::Doc<crate::rtf::RtfSchema>>(input) {
         Ok(value) => Ok(value),
         Err(err) => {
+            // V3a Possibly a DocSpan not a Doc?
+            if let Ok(value) = ron::de::from_str::<crate::doc::DocSpan<crate::rtf::RtfSchema>>(input) {
+                return Ok(Doc(value));
+            }
+
             // Try V2 encoding.
             if let Ok(value) = v2::docspan_ron(&input) {
-                Ok(Doc(value))
-            } else {
-                // Try V1 encoding.
-                if let Ok(value) = v1::docspan_ron(&input) {
-                    Ok(Doc(value))
-                } else {
-                    // Throw original ron error if error is encountered.
-                    Err(err.into())
-                }
+                return Ok(Doc(value));
+            }
+
+            // Try V1 encoding.
+            if let Ok(value) = v1::docspan_ron(&input) {
+                return Ok(Doc(value));
             }
+
+            // Throw original ron error if error is encountered.
+            Err(err.into())
         }
     }
 }
@@ -489,16 +494,16 @@ pub fn doc_json(input: &str) -> Result<crate::doc::Doc<crate::rtf::RtfSchema>, E
         Err(err) => {
             // Try V2 encoding.
             if let Ok(value) = v2::docspan_json(&input) {
-                Ok(Doc(value))
-            } else {
-                // Try V1 encoding.
-                if let Ok(value) = v1::docspan_json(&input) {
-                    Ok(Doc(value))
-                } else {
-                    // Throw original ron error if error is encountered.
-                    Err(err.into())
-                }
+                return Ok(Doc(value));
+            }
+
+            // Try V1 encoding.
+            if let Ok(value) = v1::docspan_json(&input) {
+                return Ok(Doc(value));
             }
+            
+            // Throw original ron error if error is encountered.
+            Err(err.into())
         }
     }
 }