From 322e68ffaa118ed519e1fe2f395b7cdfa903d91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Sun, 2 Jun 2019 19:09:22 +0200 Subject: [PATCH] feat(index): implemented index::insert() --- src/index.rs | 104 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 87 insertions(+), 17 deletions(-) diff --git a/src/index.rs b/src/index.rs index 6da24ca..684c538 100644 --- a/src/index.rs +++ b/src/index.rs @@ -1,10 +1,13 @@ -use std::fs::{self, OpenOptions}; +use std::fs::OpenOptions; use std::io::Write; use std::path::{Path, PathBuf}; use std::time::{SystemTime, UNIX_EPOCH}; use digest::Digest; +use failure::Error; use hex; +use mkdirp; +use nix::unistd::{Uid, Gid}; use serde_derive::{Deserialize, Serialize}; use serde_json::{self, json, Value}; use sha1::Sha1; @@ -22,23 +25,73 @@ struct Entry { metadata: Value, } -pub fn insert(cache: &Path, key: &str, sri: Integrity) -> std::io::Result<()> { - let bucket = bucket_path(&cache, &key); - fs::create_dir_all(bucket.parent().unwrap())?; - let stringified = serde_json::to_string(&Entry { +pub struct Inserter { + cache: PathBuf, + key: String, + sri: Integrity, + size: Option, + time: Option, + metadata: Option, + uid: Option, + gid: Option, +} + +impl Inserter { + pub fn size(mut self, size: u128) -> Self { + self.size = Some(size); + self + } + + pub fn metadata(mut self, metadata: Value) -> Self { + self.metadata = Some(metadata); + self + } + + pub fn time(mut self, time: u128) -> Self { + self.time = Some(time); + self + } + + pub fn chown(mut self, uid: Option, gid: Option) -> Self { + self.uid = uid; + self.gid = gid; + self + } + + pub fn commit(self) -> Result<(), Error> { + let bucket = bucket_path(&self.cache, &self.key); + if let Some(path) = mkdirp::mkdirp(bucket.parent().unwrap())? { + chownr::chownr(path.as_path(), self.uid, self.gid)?; + } + let stringified = serde_json::to_string(&Entry { + key: self.key.to_owned(), + integrity: self.sri.to_string(), + time: self.time.unwrap_or_else(now), + size: self.size.unwrap_or(0), + metadata: self.metadata.unwrap_or_else(|| json!(null)), + })?; + let str = format!("\n{}\t{}", hash_entry(&stringified), stringified); + OpenOptions::new() + .create(true) + .append(true) + .open(&bucket)? + .write_all(&str.into_bytes())?; + chownr::chownr(bucket.as_path(), self.uid, self.gid)?; + Ok(()) + } +} + +pub fn insert(cache: &Path, key: &str, sri: Integrity) -> Inserter { + Inserter { + cache: cache.to_path_buf(), key: String::from(key), - integrity: sri.to_string(), - time: now(), - size: 0, // TODO - probably do something about this. - metadata: json!(null), - }) - .expect("Failed to serialize entry."); - let str = format!("\n{}\t{}", hash_entry(&stringified), stringified); - OpenOptions::new() - .create(true) - .append(true) - .open(bucket)? - .write_all(&str.into_bytes()) + size: None, + sri, + time: None, + metadata: None, + uid: None, + gid: None, + } } pub fn find(_cache: &Path, _key: &str) { @@ -82,3 +135,20 @@ fn now() -> u128 { .unwrap() .as_millis() } + +#[cfg(test)] +mod tests { + use super::*; + use tempfile; + #[test] + fn insert_basic() { + let tmp = tempfile::tempdir().unwrap(); + let dir = tmp.path().to_owned(); + let sri: Integrity = "sha1-deadbeef".parse().unwrap(); + let time = 1_234_567; + insert(&dir, "hello", sri).time(time).commit().unwrap(); + let entry = std::fs::read_to_string(bucket_path(&dir, "hello")).unwrap(); + assert_eq!( + entry, "\n251d18a2b33264ea8655695fd23c88bd874cdea2c3dc9d8f9b7596717ad30fec\t{\"key\":\"hello\",\"integrity\":\"sha1-deadbeef\",\"time\":1234567,\"size\":0,\"metadata\":null}") + } +}