berkus
/
cacache-rs
mirror of https://github.com/zkat/cacache-rs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(index): make inserter.commit() return integrity

This commit is contained in:
Kat Marchán 2019-06-04 23:56:25 +02:00
parent dbb8c79b00
commit 257fc9b6d0
No known key found for this signature in database
GPG Key ID: AEB529C08A3C7E9E
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/index.rs
View File

@ -69,14 +69,14 @@ impl Inserter {
self self
} }
pub fn commit(self) -> Result<(), Error> { pub fn commit(self) -> Result<Integrity, Error> {
let bucket = bucket_path(&self.cache, &self.key); let bucket = bucket_path(&self.cache, &self.key);
if let Some(path) = mkdirp::mkdirp(bucket.parent().unwrap())? { if let Some(path) = mkdirp::mkdirp(bucket.parent().unwrap())? {
chownr::chownr(&path, self.uid, self.gid)?; chownr::chownr(&path, self.uid, self.gid)?;
} }
let stringified = serde_json::to_string(&SerializableEntry { let stringified = serde_json::to_string(&SerializableEntry {
key: self.key.to_owned(), key: self.key.to_owned(),
integrity: self.sri.map(|x| x.to_string()), integrity: self.sri.clone().map(|x| x.to_string()),
time: self.time.unwrap_or_else(now), time: self.time.unwrap_or_else(now),
size: self.size.unwrap_or(0), size: self.size.unwrap_or(0),
metadata: self.metadata.unwrap_or_else(|| json!(null)), metadata: self.metadata.unwrap_or_else(|| json!(null)),
@ -88,7 +88,7 @@ impl Inserter {
.open(&bucket)? .open(&bucket)?
.write_all(&str.into_bytes())?; .write_all(&str.into_bytes())?;
chownr::chownr(&bucket, self.uid, self.gid)?; chownr::chownr(&bucket, self.uid, self.gid)?;
Ok(()) Ok(self.sri.unwrap_or_else(|| "sha1-deadbeef".parse::<Integrity>().unwrap()))
} }
} }
@ -142,7 +142,8 @@ pub fn delete(cache: &Path, key: &str) -> Result<(), Error> {
uid: None, uid: None,
gid: None, gid: None,
}; };
inserter.commit() inserter.commit()?;
Ok(())
} }
pub fn ls(_cache: &Path) { pub fn ls(_cache: &Path) {