Merge branch 'main' of github.com:TravisWheelerLab/mdrepo-rs

Author: kyclark

mdr-process/src/process.rs

@@ -472,6 +472,7 @@ pub fn make_import_json(
         size: meta_path.metadata()?.len(),
         md5_sum: get_md5(meta_path)?,
         description: None,
+        is_primary: None,
     }];
 
     for (file_type, filename) in &[
@@ -486,6 +487,7 @@ pub fn make_import_json(
             size: local_path.metadata()?.len(),
             md5_sum: get_md5(&local_path)?,
             description: None,
+            is_primary: Some(true),
         })
     }
 
@@ -505,6 +507,7 @@ pub fn make_import_json(
                     size: path.metadata()?.len(),
                     md5_sum,
                     description: file.description.clone(),
+                    is_primary: None,
                 })
             }
         }
@@ -527,6 +530,7 @@ pub fn make_import_json(
             size: path.metadata()?.len(),
             md5_sum: get_md5(path)?,
             description: None,
+            is_primary: None,
         })
     }
 

mdr-process/src/types.rs

@@ -414,18 +414,19 @@ pub struct ExportSimulation {
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct MdFile {
     pub name: String,
+
     pub file_type: String,
+
     pub size: u64,
+
     pub md5_sum: String,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
-}
 
-// --------------------------------------------------
-//#[derive(Debug)]
-//pub struct Import {
-//    pub dirname: PathBuf,
-//    pub import_json: PathBuf,
-//}
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_primary: Option<bool>,
+}
 
 // --------------------------------------------------
 #[derive(Debug, Deserialize, Serialize)]