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

fix(remove_fully): Remove the key content when set `remove_fully` to `true`

This commit is contained in:
TheAwiteb 2024-01-27 13:16:41 +03:00
parent 0ac9fb8cd9
commit 5e9ca392fc
No known key found for this signature in database
GPG Key ID: ABF818BD15DC2D34
1 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/index.rs
View File

@ -20,6 +20,7 @@ use walkdir::WalkDir;
#[cfg(any(feature = "async-std", feature = "tokio"))]
use crate::async_lib::{AsyncBufReadExt, AsyncWriteExt};
use crate::content::path::content_path;
use crate::errors::{IoErrorExt, Result};
use crate::put::WriteOpts;
@ -407,6 +408,11 @@ impl RemoveOpts {
if !self.remove_fully {
delete(cache.as_ref(), key.as_ref())
} else {
if let Some(meta) = crate::metadata_sync(cache.as_ref(), key.as_ref())? {
let content = content_path(cache.as_ref(), &meta.integrity);
fs::remove_file(&content)
.with_context(|| format!("Failed to remove content at {content:?}"))?;
}
let bucket = bucket_path(cache.as_ref(), key.as_ref());
fs::remove_file(&bucket)
.with_context(|| format!("Failed to remove bucket at {bucket:?}"))
@ -422,6 +428,12 @@ impl RemoveOpts {
if !self.remove_fully {
delete_async(cache.as_ref(), key.as_ref()).await
} else {
if let Some(meta) = crate::metadata(cache.as_ref(), key.as_ref()).await? {
let content = content_path(cache.as_ref(), &meta.integrity);
crate::async_lib::remove_file(&content)
.await
.with_context(|| format!("Failed to remove content at {content:?}"))?;
}
let bucket = bucket_path(cache.as_ref(), key.as_ref());
crate::async_lib::remove_file(&bucket)
.await
@ -535,6 +547,44 @@ mod tests {
assert_eq!(find(&dir, "hello").unwrap(), None);
}
#[test]
fn delete_fully() {
let tmp = tempfile::tempdir().unwrap();
let dir = tmp.path().to_owned();
let content = content_path(&dir, &"sha1-deadbeef".parse().unwrap());
fs::create_dir_all(content.parent().unwrap()).unwrap();
fs::write(content.as_path(), "hello").unwrap();
let sri: Integrity = "sha1-deadbeef".parse().unwrap();
let time = 1_234_567;
insert(&dir, "hello", WriteOpts::new().integrity(sri).time(time)).unwrap();
RemoveOpts::new()
.remove_fully(true)
.remove_sync(&dir, "hello")
.unwrap();
assert_eq!(find(&dir, "hello").unwrap(), None);
assert!(!content.exists());
}
#[cfg(any(feature = "async-std", feature = "tokio"))]
#[async_test]
async fn delete_fully_async() {
let tmp = tempfile::tempdir().unwrap();
let dir = tmp.path().to_owned();
let content = content_path(&dir, &"sha1-deadbeef".parse().unwrap());
fs::create_dir_all(content.parent().unwrap()).unwrap();
fs::write(content.as_path(), "hello").unwrap();
let sri: Integrity = "sha1-deadbeef".parse().unwrap();
let time = 1_234_567;
insert(&dir, "hello", WriteOpts::new().integrity(sri).time(time)).unwrap();
RemoveOpts::new()
.remove_fully(true)
.remove(&dir, "hello")
.await
.unwrap();
assert_eq!(find(&dir, "hello").unwrap(), None);
assert!(!content.exists());
}
#[test]
fn round_trip() {
let tmp = tempfile::tempdir().unwrap();