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

cleanup: some reorganizing and reformatting of stuff

This commit is contained in:
Kat Marchán 2019-11-06 23:03:14 -08:00
parent b54ec598cb
commit a9f8e4e6f4
No known key found for this signature in database
GPG Key ID: AEB529C08A3C7E9E
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/index.rs
View File

@ -7,9 +7,11 @@ use std::time::{SystemTime, UNIX_EPOCH};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use async_std::fs as afs; use async_std::fs as afs;
use async_std::io::BufReader;
use digest::Digest; use digest::Digest;
use either::{Left, Right}; use either::{Left, Right};
use futures::io::AsyncWriteExt; use futures::io::{AsyncBufReadExt, AsyncWriteExt};
use futures::stream::StreamExt;
use hex; use hex;
use serde_derive::{Deserialize, Serialize}; use serde_derive::{Deserialize, Serialize};
use serde_json::{json, Value}; use serde_json::{json, Value};
@ -95,12 +97,14 @@ pub fn insert(cache: &Path, key: &str, opts: WriteOpts) -> Result<Integrity> {
pub async fn insert_async<'a>(cache: &'a Path, key: &'a str, opts: WriteOpts) -> Result<Integrity> { pub async fn insert_async<'a>(cache: &'a Path, key: &'a str, opts: WriteOpts) -> Result<Integrity> {
let bucket = bucket_path(&cache, &key); let bucket = bucket_path(&cache, &key);
afs::create_dir_all(bucket.parent().unwrap()).await.with_context(|| { afs::create_dir_all(bucket.parent().unwrap())
format!( .await
"Failed to create index bucket directory: {:?}", .with_context(|| {
bucket.parent().unwrap() format!(
) "Failed to create index bucket directory: {:?}",
})?; bucket.parent().unwrap()
)
})?;
let stringified = serde_json::to_string(&SerializableMetadata { let stringified = serde_json::to_string(&SerializableMetadata {
key: key.to_owned(), key: key.to_owned(),
integrity: opts.sri.clone().map(|x| x.to_string()), integrity: opts.sri.clone().map(|x| x.to_string()),
@ -304,9 +308,6 @@ fn bucket_entries(bucket: &Path) -> Result<Vec<SerializableMetadata>> {
} }
async fn bucket_entries_async(bucket: &Path) -> Result<Vec<SerializableMetadata>> { async fn bucket_entries_async(bucket: &Path) -> Result<Vec<SerializableMetadata>> {
use async_std::io::BufReader;
use futures::io::AsyncBufReadExt;
use futures::stream::StreamExt;
let file_result = afs::File::open(bucket).await; let file_result = afs::File::open(bucket).await;
let file; let file;
if let Err(err) = file_result { if let Err(err) = file_result {