work on merge

Author: mre

Cargo.lock

@@ -29,3 +29,4 @@ serde_json = "1.0.62"
 chrono = "0.4.19"
 quantiles = "0.7.1"
 structopt = "0.3.21"
+glob = "0.3.0"

Cargo.toml

@@ -10,15 +10,23 @@
 )]
 
 use anyhow::{Context, Result};
-use codeprints_analyzer::count_commits;
 use codeprints_analyzer::Parser;
+use codeprints_analyzer::Timeline;
+use codeprints_analyzer::{count_commits, Merger};
+use glob::glob;
 use std::fs;
 use structopt::StructOpt;
 
 mod options;
 use options::Command;
 
-const OUTPUT_FILE: &'static str = "codeprints.json";
+fn write(timeline: &Timeline, output_file: &str) -> Result<()> {
+    let output = serde_json::to_string_pretty(&timeline)?;
+    fs::write(output_file, output)?;
+    println!("done!");
+    println!("Output file: {}", output_file);
+    Ok(())
+}
 
 fn main() -> Result<()> {
     let opt = Command::from_args();
@@ -42,18 +50,26 @@ fn main() -> Result<()> {
                 parser.set_after(after)?;
             }
             let timeline = parser.parse()?;
-            let output = serde_json::to_string_pretty(&timeline)?;
-            fs::write(OUTPUT_FILE, output)?;
-            println!("done!");
-            println!("Output file: {}", OUTPUT_FILE);
+
+            write(&timeline, "codeprints.json")?;
         }
         Command::Merge {} => {
             // Find all `codeprints*.json` files in the current directory
             // using glob.
-            // Read each one into memory
-            // Merge the results together
-            // Write a `codeprints_merged.json` file
-            unimplemented!();
+            let mut merger = Merger::new();
+            for entry in glob("codeprints*.json")? {
+                match entry {
+                    Ok(path) => {
+                        println!("Merging {}", path.display());
+                        let input = fs::read_to_string(path)?;
+                        let mut parser = Parser::new(input);
+                        let timeline = parser.parse()?;
+                        merger.merge_timeline(&timeline)?;
+                    }
+                    Err(e) => println!("{:?}", e),
+                }
+            }
+            write(&merger.timeline()?, "codeprints_merged.json")?;
         }
     };
     Ok(())

src/bin/analyzer/main.rs

@@ -21,3 +21,4 @@ mod types;
 pub use crate::git::count_commits;
 pub use crate::merge::Merger;
 pub use crate::parser::Parser;
+pub use crate::types::Timeline as Timeline;

src/lib.rs

@@ -16,7 +16,8 @@ impl Merger {
         Merger { state }
     }
 
-    fn merge_timeline(&mut self, timeline: &Timeline) -> Result<()> {
+    /// Merge a single timeline
+    pub fn merge_timeline(&mut self, timeline: &Timeline) -> Result<()> {
         for contribution in &timeline.contributions {
             let date = contribution.date.clone();
             let date = git::parse_date(&date)?;
@@ -42,8 +43,14 @@ impl Merger {
         }
         Ok(Timeline::try_from(&self.state)?)
     }
+
+    /// Return the merged timeline of all inputs
+    pub fn timeline(&self) -> Result<Timeline> {
+        Ok(Timeline::try_from(&self.state)?)
+    }
 }
 
+
 #[cfg(test)]
 mod test {
     use super::*;

src/merge.rs

@@ -18,6 +18,7 @@ pub struct Year {
 pub type Years = Vec<Year>;
 pub type Contributions = Vec<Contribution>;
 
+/// A timeline represents a codeprints.json file's contents
 #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Timeline {