Browse Source

chore: update version to 0.0.5.2

appflowy 2 years ago
parent
commit
4961236012

+ 1 - 1
frontend/Makefile.toml

@@ -22,7 +22,7 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 CARGO_MAKE_CRATE_FS_NAME = "dart_ffi"
 CARGO_MAKE_CRATE_NAME = "dart-ffi"
 LIB_NAME = "dart_ffi"
-CURRENT_APP_VERSION = "0.0.5.1"
+CURRENT_APP_VERSION = "0.0.5.2"
 FEATURES = "flutter"
 PRODUCT_NAME = "AppFlowy"
 # CRATE_TYPE: https://doc.rust-lang.org/reference/linkage.html

+ 3 - 0
shared-lib/flowy-folder-data-model/src/revision/app_rev.rs

@@ -17,10 +17,13 @@ pub struct AppRevision {
 
     pub belongings: Vec<ViewRevision>,
 
+    #[serde(default)]
     pub version: i64,
 
+    #[serde(default)]
     pub modified_time: i64,
 
+    #[serde(default)]
     pub create_time: i64,
 }
 

+ 2 - 0
shared-lib/flowy-folder-data-model/src/revision/trash_rev.rs

@@ -8,8 +8,10 @@ pub struct TrashRevision {
 
     pub name: String,
 
+    #[serde(default)]
     pub modified_time: i64,
 
+    #[serde(default)]
     pub create_time: i64,
 
     pub ty: TrashTypeRevision,

+ 2 - 1
shared-lib/flowy-folder-data-model/src/revision/view_rev.rs

@@ -9,7 +9,6 @@ pub fn gen_view_id() -> String {
 pub struct ViewRevision {
     pub id: String,
 
-    // Maybe app_id or vi
     #[serde(rename = "belong_to_id")]
     pub app_id: String,
 
@@ -24,8 +23,10 @@ pub struct ViewRevision {
 
     pub belongings: Vec<ViewRevision>,
 
+    #[serde(default)]
     pub modified_time: i64,
 
+    #[serde(default)]
     pub create_time: i64,
 
     #[serde(default)]

+ 2 - 0
shared-lib/flowy-folder-data-model/src/revision/workspace_rev.rs

@@ -14,7 +14,9 @@ pub struct WorkspaceRevision {
 
     pub apps: Vec<AppRevision>,
 
+    #[serde(default)]
     pub modified_time: i64,
 
+    #[serde(default)]
     pub create_time: i64,
 }

+ 14 - 0
shared-lib/flowy-sync/src/client_folder/folder_pad.rs

@@ -482,6 +482,20 @@ mod tests {
         assert_eq!(folder, folder_from_delta);
     }
 
+    #[test]
+    fn folder_deserialize_invalid_json_test() {
+        for json in vec![
+            // No timestamp
+            r#"{"workspaces":[{"id":"1","name":"first workspace","desc":"","apps":[]}],"trash":[]}"#,
+            // Trailing characters
+            r#"{"workspaces":[{"id":"1","name":"first workspace","desc":"","apps":[]}],"trash":[]}123"#,
+        ] {
+            let mut deserializer = serde_json::Deserializer::from_reader(json.as_bytes());
+            let folder_rev = FolderRevision::deserialize(&mut deserializer).unwrap();
+            assert_eq!(folder_rev.workspaces.first().as_ref().unwrap().name, "first workspace");
+        }
+    }
+
     #[test]
     fn folder_update_workspace() {
         let (mut folder, initial_delta, workspace) = test_folder();