feat(cb) - preserve index content if no partial diff

Author: rumblefrog

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "chumbucket"
-version = "0.2.0"
+version = "0.3.0"
 description = "Chums through manifest, include, and index files"
 authors = ["rumblefrog <contact@rumblefrog>"]
 edition = "2018"

chumbucket/Cargo.toml

@@ -3,14 +3,24 @@ use anyhow::Result;
 use clap::ArgMatches;
 use schema::{
     bundle::Bundle,
-    index::{Index, Indices},
+    index::{Index, IndexMap},
 };
 
 pub async fn index_command(matches: &ArgMatches) -> Result<()> {
     let dir = std::fs::read_dir(matches.value_of("directory").unwrap())?;
 
     let fs_out = matches.value_of("output").unwrap();
 
+    let mut index_map = IndexMap::new();
+
+    if matches.is_present("index") {
+        let index_io = std::fs::read(matches.value_of("index").unwrap())?;
+
+        let parsed_indices: IndexMap = serde_json::from_slice(&index_io)?;
+
+        index_map = parsed_indices;
+    }
+
     let entries = dir
         .filter(|i| i.is_ok())
         .map(|i| i.unwrap())
@@ -19,20 +29,38 @@ pub async fn index_command(matches: &ArgMatches) -> Result<()> {
         .map(|i| i.path())
         .collect::<Vec<_>>();
 
-    let mut indices = Indices::new();
+    let mut diffs = 0u64;
 
     for entry in &entries {
         let content = std::fs::read(entry)?;
 
         let bundle: Bundle = serde_json::from_slice(&content)?;
 
-        indices.push(Index {
-            meta: bundle.meta,
-            source: bundle.source,
-        });
+        match index_map.get(&bundle.meta.name) {
+            Some(v) => {
+                if v.meta != bundle.meta || v.source != bundle.source {
+                    diffs += 1;
+    
+                    index_map.insert(bundle.meta.name.clone(), Index {
+                        meta: bundle.meta,
+                        source: bundle.source,
+                    });
+                }
+            }
+            None => {
+                diffs += 1;
+
+                index_map.insert(bundle.meta.name.clone(), Index {
+                    meta: bundle.meta,
+                    source: bundle.source,
+                });
+            }
+        }
     }
 
-    write_to_disk(fs_out, indices)?;
+    if diffs > 0 {
+        write_to_disk(fs_out, index_map)?;
+    }
 
     Ok(())
 }

chumbucket/src/commands/index.rs

@@ -23,6 +23,13 @@ async fn main() -> Result<()> {
                         .takes_value(true)
                         .required(true)
                 )
+                .arg(
+                    Arg::new("index")
+                        .about("Existing index file for partial check")
+                        .short('i')
+                        .takes_value(true)
+                        .required(false)
+                )
                 .arg(
                     Arg::new("directory")
                         .about("Bundle directory")

chumbucket/src/main.rs

@@ -1,11 +1,13 @@
-use serde::Serialize;
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
 
 use super::meta::Meta;
 use super::manifest::Source;
 
-pub type Indices = Vec<Index>;
+pub type IndexMap = HashMap<String, Index>;
 
-#[derive(Serialize)]
+#[derive(Deserialize, Serialize, PartialEq)]
 pub struct Index {
     /// Meta descriptor of manifest content
     pub meta: Meta,

libschema/src/index.rs

@@ -11,7 +11,7 @@ pub struct Manifest {
     pub source: Source,
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "lowercase")]
 pub enum SourceType {
     /// Git SSH URL schema
@@ -23,7 +23,7 @@ pub enum SourceType {
     Direct,
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, PartialEq)]
 pub struct Source {
     /// Type of source or method of access
     pub r#type: SourceType,

libschema/src/manifest.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Deserialize, Serialize, Debug)]
+#[derive(Deserialize, Serialize, PartialEq, Debug)]
 pub struct Meta {
     /// Name of this manifest/bundle
     pub name: String,