Compare commits
2 Commits
deprecated
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 25c7d0d470 | |||
|
2b27b788e5 |
274
Cargo.lock
generated
274
Cargo.lock
generated
@@ -17,6 +17,12 @@ version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
|
||||
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
version = "0.9.0"
|
||||
@@ -54,6 +60,15 @@ dependencies = [
|
||||
"toml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
@@ -78,6 +93,39 @@ dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
|
||||
dependencies = [
|
||||
"errno-dragonfly",
|
||||
"libc",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno-dragonfly"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fastrand"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
|
||||
|
||||
[[package]]
|
||||
name = "generic-array"
|
||||
version = "0.14.4"
|
||||
@@ -89,14 +137,19 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.3"
|
||||
name = "hashbrown"
|
||||
version = "0.14.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
|
||||
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
"equivalent",
|
||||
"hashbrown",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -107,14 +160,21 @@ dependencies = [
|
||||
"cas-core",
|
||||
"cas-simple",
|
||||
"regex",
|
||||
"tempfile",
|
||||
"toml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.98"
|
||||
version = "0.2.147"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
|
||||
checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.4.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
@@ -128,12 +188,6 @@ version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.27"
|
||||
@@ -152,53 +206,13 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
"rand_hc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_hc"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
|
||||
dependencies = [
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.9"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee"
|
||||
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 1.2.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -219,19 +233,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
|
||||
|
||||
[[package]]
|
||||
name = "remove_dir_all"
|
||||
version = "0.5.3"
|
||||
name = "rustix"
|
||||
version = "0.38.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
|
||||
checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
"bitflags 2.4.0",
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.127"
|
||||
version = "1.0.183"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
|
||||
checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
|
||||
|
||||
[[package]]
|
||||
name = "serde_spanned"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sha2"
|
||||
@@ -259,16 +286,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.2.0"
|
||||
version = "3.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
|
||||
checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"rand",
|
||||
"fastrand",
|
||||
"redox_syscall",
|
||||
"remove_dir_all",
|
||||
"winapi",
|
||||
"rustix",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -293,11 +319,36 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.5.8"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
|
||||
checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
"toml_edit",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_datetime"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.19.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -319,29 +370,76 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.2+wasi-snapshot-preview1"
|
||||
name = "windows-sys"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
name = "windows-targets"
|
||||
version = "0.48.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.5.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5504cc7644f4b593cbc05c4a55bf9bd4e94b867c3c0bd440934174d50482427d"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
@@ -63,7 +63,10 @@ pub trait Cas {
|
||||
}
|
||||
|
||||
pub trait RefStore {
|
||||
fn get_ref<P: AsRef<Utf8Path>>(&self, key: P) -> Result<ObjectId>;
|
||||
fn set_ref<P: AsRef<Utf8Path>>(&mut self, key: P, value: &ObjectId) -> Result<()>;
|
||||
fn remove_ref<P: AsRef<Utf8Path>>(&mut self, key: P) -> Result<()>;
|
||||
}
|
||||
fn get_ref(&self, key: &Utf8Path) -> Result<ObjectId>;
|
||||
fn set_ref(&mut self, key: &Utf8Path, value: &ObjectId) -> Result<()>;
|
||||
fn remove_ref(&mut self, key: &Utf8Path) -> Result<()>;
|
||||
}
|
||||
|
||||
pub trait CasWithRef: Cas + RefStore {
|
||||
}
|
||||
|
||||
@@ -16,6 +16,10 @@
|
||||
|
||||
// use std::path::Utf8PathBuf;
|
||||
|
||||
use std::path::StripPrefixError;
|
||||
|
||||
use crate::ObjectId;
|
||||
|
||||
|
||||
/// Result type used through cas-core.
|
||||
pub type Result<T> = std::result::Result<T, Error>;
|
||||
@@ -87,6 +91,9 @@ pub enum Error {
|
||||
#[error("non-unicode file name: '{0}'")]
|
||||
NonUnicodeFileName(String),
|
||||
|
||||
#[error("object {0} does not exists")]
|
||||
ObjectDoesNotExists(ObjectId),
|
||||
|
||||
#[error("{0}")]
|
||||
UnknownError(String),
|
||||
}
|
||||
@@ -129,6 +136,11 @@ impl Error {
|
||||
}
|
||||
}
|
||||
|
||||
impl From<StripPrefixError> for Error {
|
||||
fn from(value: StripPrefixError) -> Self {
|
||||
Error::unknown(format!("Invalid operation: {}", value))
|
||||
}
|
||||
}
|
||||
|
||||
// fn format_optional_path(maybe_path: &Option<Utf8PathBuf>) -> String {
|
||||
// match maybe_path {
|
||||
|
||||
@@ -35,10 +35,10 @@ mod cas;
|
||||
pub use crate::{
|
||||
error::{Error, Result},
|
||||
object_id::{ObjectId, hex, write_hex},
|
||||
object_type::{ObjectType},
|
||||
object_metadata::{ObjectMetadata},
|
||||
object_type::ObjectType,
|
||||
object_metadata::ObjectMetadata,
|
||||
pipeline::{Pipeline, DefaultPipeline, Reader, Writer, ReadWrapper, WriteWrapper},
|
||||
cas::{Cas, RefStore},
|
||||
cas::{Cas, CasWithRef, RefStore},
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
// along with bsv. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
use super::object_type::{ObjectType};
|
||||
use super::object_type::ObjectType;
|
||||
|
||||
|
||||
#[derive(Clone, Eq, PartialEq)]
|
||||
|
||||
@@ -11,8 +11,6 @@ license = "AGPL-3.0-or-later"
|
||||
digest = { version = "0.9.0", features = ["alloc"] }
|
||||
sha2 = "0.9.5"
|
||||
camino = { version = "1.0.7" }
|
||||
toml = "0.5.8"
|
||||
toml = "0.7.6"
|
||||
cas-core = { path = "../cas-core" }
|
||||
tempfile = "3.2.0"
|
||||
|
||||
[dev-dependencies]
|
||||
|
||||
@@ -17,60 +17,75 @@
|
||||
use std::str::FromStr;
|
||||
|
||||
use digest::DynDigest;
|
||||
use toml::Value;
|
||||
use toml::{Value, Table};
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use cas_core::{
|
||||
Cas, DefaultPipeline, err, Error, ObjectId, ObjectMetadata, ObjectType,
|
||||
Pipeline, Reader, ReadWrapper, RefStore, Result, Writer,
|
||||
Pipeline, Reader, ReadWrapper, RefStore, Result, Writer, CasWithRef,
|
||||
};
|
||||
|
||||
use crate::utils::{
|
||||
obj_dir, obj_path, ref_dir, tmp_dir,
|
||||
read_config, write_config,
|
||||
read_metadata, write_metadata,
|
||||
new_digest,
|
||||
};
|
||||
use crate::wfile::WFile;
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct SimpleCasConfig {
|
||||
pub digest_id: String,
|
||||
}
|
||||
|
||||
impl SimpleCasConfig {
|
||||
pub fn new(digest_id: String) -> Self {
|
||||
Self {
|
||||
digest_id,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_toml_value(value: &Value) -> Result<Self> {
|
||||
if let Value::Table(ref table) = value {
|
||||
let engine =
|
||||
table.get("engine")
|
||||
.ok_or_else(|| Error::unknown("missing engine field in cas config"))?
|
||||
.as_str()
|
||||
.ok_or_else(|| Error::unknown("cas engine must be a string"))?;
|
||||
if engine != "simple" {
|
||||
return err!("expected simple cas engine");
|
||||
}
|
||||
let digest_id =
|
||||
table.get("digest")
|
||||
.ok_or_else(|| Error::unknown("missing digest field in cas config"))?
|
||||
.as_str()
|
||||
.ok_or_else(|| Error::unknown("cas digest must be a string"))?;
|
||||
Ok(Self {
|
||||
digest_id: digest_id.to_string(),
|
||||
})
|
||||
}
|
||||
else {
|
||||
err!("cas config must be a table")
|
||||
}
|
||||
}
|
||||
|
||||
pub fn to_toml_value(&self) -> Result<Value> {
|
||||
let mut table = Table::new();
|
||||
table["engine"] = "simple".into();
|
||||
table["digest"] = "sha256".into();
|
||||
return Ok(Value::Table(table))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
pub struct SimpleCas {
|
||||
config: SimpleCasConfig,
|
||||
db_path: Utf8PathBuf,
|
||||
digest: Box<dyn DynDigest>,
|
||||
pipeline: DefaultPipeline,
|
||||
// config: Value,
|
||||
}
|
||||
|
||||
|
||||
impl SimpleCas {
|
||||
pub fn create(db_path: Utf8PathBuf, mut config: Value) -> Result<Self> {
|
||||
if !config.is_table() {
|
||||
return Error::err("invalid config object: must be table");
|
||||
}
|
||||
|
||||
let maybe_engine = config.as_table_mut().unwrap()
|
||||
.entry("cas")
|
||||
.or_insert_with(|| toml::value::Table::new().into())
|
||||
.as_table_mut().unwrap()
|
||||
.entry("engine")
|
||||
.or_insert("simple".into())
|
||||
.as_str();
|
||||
match maybe_engine {
|
||||
Some(engine) if engine != "simple" => {
|
||||
return err!("invalid cas.engine in config: got {}, expected simple", engine);
|
||||
},
|
||||
None => {
|
||||
return Error::err("invalid casengine in config: expected String");
|
||||
},
|
||||
_ => {}
|
||||
}
|
||||
|
||||
let digest_id = config["cas"]["digest"].as_str()
|
||||
.ok_or_else(|| Error::unknown(
|
||||
"mandatory cas.digest value is invalid or missing from config"
|
||||
))?;
|
||||
let digest = new_digest(digest_id)?;
|
||||
let pipeline = DefaultPipeline::new(digest.box_clone());
|
||||
|
||||
pub fn create(db_path: Utf8PathBuf, config: SimpleCasConfig) -> Result<Self> {
|
||||
if db_path.exists() {
|
||||
return err!(
|
||||
"failed to create SimpleCas: target directory already exists ({})",
|
||||
@@ -83,8 +98,8 @@ impl SimpleCas {
|
||||
&obj_dir(&db_path),
|
||||
&ref_dir(&db_path),
|
||||
&tmp_dir(&db_path),
|
||||
] {
|
||||
std::fs::create_dir(path).or_else(|e|
|
||||
] {
|
||||
std::fs::create_dir(path).or_else(|e|
|
||||
err!(
|
||||
"failed to create directory ({}): {}",
|
||||
path, e,
|
||||
@@ -92,37 +107,24 @@ impl SimpleCas {
|
||||
)?;
|
||||
}
|
||||
|
||||
write_config(&config, &db_path)?;
|
||||
|
||||
Ok(SimpleCas {
|
||||
db_path,
|
||||
digest,
|
||||
pipeline,
|
||||
// config,
|
||||
})
|
||||
Self::open(db_path, config)
|
||||
}
|
||||
|
||||
pub fn open(db_path: Utf8PathBuf) -> Result<Self> {
|
||||
let config = read_config(&db_path)?;
|
||||
|
||||
let digest_id = config["cas"]["digest"].as_str()
|
||||
.ok_or_else(|| Error::unknown(
|
||||
"mandatory cas.digest value is invalid or missing from config"
|
||||
))?;
|
||||
let digest = new_digest(digest_id)?;
|
||||
pub fn open(db_path: Utf8PathBuf, config: SimpleCasConfig) -> Result<Self> {
|
||||
let digest = new_digest(&config.digest_id)?;
|
||||
let pipeline = DefaultPipeline::new(digest.box_clone());
|
||||
|
||||
Ok(SimpleCas {
|
||||
config,
|
||||
db_path,
|
||||
digest,
|
||||
pipeline,
|
||||
// config,
|
||||
})
|
||||
}
|
||||
|
||||
// pub fn save_config(&self) -> Result<()> {
|
||||
// write_config(&self.config, &self.db_path)
|
||||
// }
|
||||
pub fn get_config(&self) -> &SimpleCasConfig {
|
||||
&self.config
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -152,7 +154,7 @@ impl Cas for SimpleCas {
|
||||
fn open_object(&self, oid: &ObjectId) -> Result<(ObjectMetadata, Box<dyn Reader>)> {
|
||||
let opath = obj_path(&self.db_path, oid);
|
||||
if !opath.is_file() {
|
||||
return err!("object not found: {}", oid);
|
||||
return Err(Error::ObjectDoesNotExists(oid.clone()));
|
||||
}
|
||||
|
||||
let file = std::fs::File::open(opath).or_else(|err|
|
||||
@@ -184,56 +186,59 @@ impl Cas for SimpleCas {
|
||||
}
|
||||
|
||||
impl RefStore for SimpleCas {
|
||||
fn get_ref<P: AsRef<Utf8Path>>(&self, key: P) -> Result<ObjectId> {
|
||||
let path = ref_dir(&self.db_path).join(key.as_ref());
|
||||
fn get_ref(&self, key: &Utf8Path) -> Result<ObjectId> {
|
||||
let path = ref_dir(&self.db_path).join(key);
|
||||
if !path.exists() {
|
||||
err!("reference {} does not exists", key.as_ref())
|
||||
err!("reference {} does not exists", key)
|
||||
}
|
||||
else if !path.is_file() {
|
||||
err!("reference {} is not a file", key.as_ref())
|
||||
err!("reference {} is not a file", key)
|
||||
}
|
||||
else {
|
||||
let file = std::fs::read(path).or_else(|err|
|
||||
err!("failed to read reference file for {}: {}", key.as_ref(), err)
|
||||
err!("failed to read reference file for {}: {}", key, err)
|
||||
)?;
|
||||
Ok(
|
||||
ObjectId::from_str(
|
||||
std::str::from_utf8(&file).or_else(|err|
|
||||
err!("invalid reference file at {}: {}", key.as_ref(), err)
|
||||
err!("invalid reference file at {}: {}", key, err)
|
||||
)?
|
||||
)?
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fn set_ref<P: AsRef<Utf8Path>>(&mut self, key: P, value: &ObjectId) -> Result<()> {
|
||||
let path = ref_dir(&self.db_path).join(key.as_ref());
|
||||
fn set_ref(&mut self, key: &Utf8Path, value: &ObjectId) -> Result<()> {
|
||||
let path = ref_dir(&self.db_path).join(key);
|
||||
std::fs::create_dir_all(path.parent().ok_or_else(||
|
||||
Error::unknown(format!("reference file {} has no parent dir?", key.as_ref()))
|
||||
Error::unknown(format!("reference file {} has no parent dir?", key))
|
||||
)?).or_else(|err|
|
||||
err!("failed to create reference dir for {}: {}", key.as_ref(), err)
|
||||
err!("failed to create reference dir for {}: {}", key, err)
|
||||
)?;
|
||||
std::fs::write(path, value.to_string()).or_else(|err|
|
||||
err!("failed to write reference {}: {}", key.as_ref(), err)
|
||||
err!("failed to write reference {}: {}", key, err)
|
||||
)
|
||||
}
|
||||
|
||||
fn remove_ref<P: AsRef<Utf8Path>>(&mut self, key: P) -> Result<()> {
|
||||
let path = ref_dir(&self.db_path).join(key.as_ref());
|
||||
fn remove_ref(&mut self, key: &Utf8Path) -> Result<()> {
|
||||
let path = ref_dir(&self.db_path).join(key);
|
||||
if !path.exists() {
|
||||
err!("reference {} does not exists", key.as_ref())
|
||||
err!("reference {} does not exists", key)
|
||||
}
|
||||
else if !path.is_file() {
|
||||
err!("reference {} is not a file", key.as_ref())
|
||||
err!("reference {} is not a file", key)
|
||||
}
|
||||
else {
|
||||
std::fs::remove_file(path).or_else(|err|
|
||||
err!("failed to remove reference file {}: {}", key.as_ref(), err)
|
||||
err!("failed to remove reference file {}: {}", key, err)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl CasWithRef for SimpleCas {
|
||||
}
|
||||
|
||||
|
||||
pub struct ObjectIdIterator {
|
||||
root_dirs: Vec<Utf8PathBuf>,
|
||||
@@ -387,13 +392,6 @@ mod tests {
|
||||
|
||||
use super::*;
|
||||
|
||||
fn get_config() -> Value {
|
||||
toml::toml!(
|
||||
[cas]
|
||||
digest = "sha256"
|
||||
)
|
||||
}
|
||||
|
||||
fn get_cas_path(dir: &Utf8Path) -> Utf8PathBuf {
|
||||
let mut cas_path = dir.to_path_buf();
|
||||
cas_path.push(".bsv");
|
||||
@@ -404,7 +402,7 @@ mod tests {
|
||||
fn test_create_simple_cas() {
|
||||
let dir = tempfile::tempdir().expect("failed to create temp test dir");
|
||||
let cas_path = get_cas_path(Utf8Path::from_path(dir.path()).unwrap());
|
||||
let config = get_config();
|
||||
let config = SimpleCasConfig::new("sha256".into());
|
||||
|
||||
let cas = SimpleCas::create(cas_path, config)
|
||||
.expect("failed to create SimpleCas object");
|
||||
@@ -418,7 +416,7 @@ mod tests {
|
||||
fn test_write_object() {
|
||||
let dir = tempfile::tempdir().expect("failed to create temp test dir");
|
||||
let cas_path = get_cas_path(dir.path().try_into().unwrap());
|
||||
let config = get_config();
|
||||
let config = SimpleCasConfig::new("sha256".into());
|
||||
|
||||
let otype = ObjectType::new(b"blob").expect("failed to create object type");
|
||||
let payload = b"Hello World!";
|
||||
@@ -448,7 +446,7 @@ mod tests {
|
||||
|
||||
let dir = tempfile::tempdir().expect("failed to create temp test dir");
|
||||
let cas_path = get_cas_path(dir.path().try_into().unwrap());
|
||||
let config = get_config();
|
||||
let config = SimpleCasConfig::new("sha256".into());
|
||||
|
||||
let otype = ObjectType::new(b"blob").expect("failed to create object type");
|
||||
let payload = b"Hello World!";
|
||||
@@ -487,7 +485,7 @@ mod tests {
|
||||
fn test_read_write_object() {
|
||||
let dir = tempfile::tempdir().expect("failed to create temp test dir");
|
||||
let cas_path = get_cas_path(dir.path().try_into().unwrap());
|
||||
let config = get_config();
|
||||
let config = SimpleCasConfig::new("sha256".into());
|
||||
|
||||
let otype = ObjectType::new(b"blob").expect("failed to create object type");
|
||||
let payload = b"This is a test.";
|
||||
@@ -507,7 +505,7 @@ mod tests {
|
||||
fn test_remove_object() {
|
||||
let dir = tempfile::tempdir().expect("failed to create temp test dir");
|
||||
let cas_path = get_cas_path(dir.path().try_into().unwrap());
|
||||
let config = get_config();
|
||||
let config = SimpleCasConfig::new("sha256".into());
|
||||
|
||||
let otype = ObjectType::new(b"blob").expect("failed to create object type");
|
||||
let payload = b"This is a test.";
|
||||
@@ -528,7 +526,7 @@ mod tests {
|
||||
fn test_object_id_iterator() {
|
||||
let dir = tempfile::tempdir().expect("failed to create temp test dir");
|
||||
let cas_path = get_cas_path(dir.path().try_into().unwrap());
|
||||
let config = get_config();
|
||||
let config = SimpleCasConfig::new("sha256".into());
|
||||
|
||||
let mut cas = SimpleCas::create(cas_path.clone(), config)
|
||||
.expect("failed to create SimpleCas object");
|
||||
@@ -642,21 +640,21 @@ mod tests {
|
||||
fn test_reference() {
|
||||
let dir = tempfile::tempdir().expect("failed to create temp test dir");
|
||||
let cas_path = get_cas_path(dir.path().try_into().unwrap());
|
||||
let config = get_config();
|
||||
let config = SimpleCasConfig::new("sha256".into());
|
||||
|
||||
let mut cas = SimpleCas::create(cas_path.clone(), config)
|
||||
.expect("failed to create SimpleCas object");
|
||||
|
||||
let oid_0 = ObjectId::from_str("f731f6bc6a6a73bad170e56452473ef6930b7a0ab33cc54be44221a89b49d786").unwrap();
|
||||
|
||||
assert!(cas.get_ref("foo/bar").is_err());
|
||||
assert!(cas.remove_ref("foo/bar").is_err());
|
||||
assert!(cas.get_ref("foo/bar".into()).is_err());
|
||||
assert!(cas.remove_ref("foo/bar".into()).is_err());
|
||||
|
||||
cas.set_ref("foo/bar", &oid_0).unwrap();
|
||||
assert_eq!(cas.get_ref("foo/bar").unwrap(), oid_0);
|
||||
cas.set_ref("foo/bar".into(), &oid_0).unwrap();
|
||||
assert_eq!(cas.get_ref("foo/bar".into()).unwrap(), oid_0);
|
||||
|
||||
cas.remove_ref("foo/bar").unwrap();
|
||||
cas.remove_ref("foo/bar".into()).unwrap();
|
||||
|
||||
assert!(cas.get_ref("foo/bar").is_err());
|
||||
assert!(cas.get_ref("foo/bar".into()).is_err());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,4 +32,4 @@ mod wfile;
|
||||
mod cas;
|
||||
|
||||
|
||||
pub use cas::SimpleCas;
|
||||
pub use cas::{SimpleCas, SimpleCasConfig};
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
|
||||
use digest::DynDigest;
|
||||
use toml::Value;
|
||||
// use toml::Value;
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
|
||||
use cas_core::{
|
||||
@@ -49,39 +49,39 @@ pub fn config_path(cas_path: &Utf8Path) -> Utf8PathBuf {
|
||||
}
|
||||
|
||||
|
||||
pub fn read_config(db_path: &Utf8Path) -> Result<Value> {
|
||||
use std::io::Read;
|
||||
// pub fn read_config(db_path: &Utf8Path) -> Result<Value> {
|
||||
// use std::io::Read;
|
||||
|
||||
let mut file = std::fs::File::open(config_path(db_path)).or_else(|err|
|
||||
err!("invalid repository: no config file: {}", err)
|
||||
)?;
|
||||
let mut config_str = String::new();
|
||||
file.read_to_string(&mut config_str).or_else(|err|
|
||||
err!("cannot read config file: {}", err)
|
||||
)?;
|
||||
let config = toml::from_str(&config_str).or_else(|err|
|
||||
err!("error while reading config file: {}", err)
|
||||
)?;
|
||||
Ok(config)
|
||||
}
|
||||
// let mut file = std::fs::File::open(config_path(db_path)).or_else(|err|
|
||||
// err!("invalid repository: no config file: {}", err)
|
||||
// )?;
|
||||
// let mut config_str = String::new();
|
||||
// file.read_to_string(&mut config_str).or_else(|err|
|
||||
// err!("cannot read config file: {}", err)
|
||||
// )?;
|
||||
// let config = toml::from_str(&config_str).or_else(|err|
|
||||
// err!("error while reading config file: {}", err)
|
||||
// )?;
|
||||
// Ok(config)
|
||||
// }
|
||||
|
||||
pub fn write_config(config: &Value, db_path: &Utf8Path) -> Result<()> {
|
||||
use std::io::Write;
|
||||
// pub fn write_config(config: &Value, db_path: &Utf8Path) -> Result<()> {
|
||||
// use std::io::Write;
|
||||
|
||||
let config_str = toml::to_string_pretty(config).or_else(|err|
|
||||
err!("failed to serialize config: {}", err)
|
||||
)?;
|
||||
let mut file = tempfile::NamedTempFile::new_in(tmp_dir(db_path)).or_else(|err|
|
||||
err!("cannot create temp config file: {}", err)
|
||||
)?;
|
||||
file.write_all(config_str.as_bytes()).or_else(|err|
|
||||
err!("failed to write to temp config: {}", err)
|
||||
)?;
|
||||
file.persist(config_path(db_path)).or_else(|err|
|
||||
err!("failed to (over)write config: {}", err)
|
||||
)?;
|
||||
Ok(())
|
||||
}
|
||||
// let config_str = toml::to_string_pretty(config).or_else(|err|
|
||||
// err!("failed to serialize config: {}", err)
|
||||
// )?;
|
||||
// let mut file = tempfile::NamedTempFile::new_in(tmp_dir(db_path)).or_else(|err|
|
||||
// err!("cannot create temp config file: {}", err)
|
||||
// )?;
|
||||
// file.write_all(config_str.as_bytes()).or_else(|err|
|
||||
// err!("failed to write to temp config: {}", err)
|
||||
// )?;
|
||||
// file.persist(config_path(db_path)).or_else(|err|
|
||||
// err!("failed to (over)write config: {}", err)
|
||||
// )?;
|
||||
// Ok(())
|
||||
// }
|
||||
|
||||
|
||||
pub fn read_metadata(read: &mut dyn std::io::Read) -> Result<ObjectMetadata> {
|
||||
@@ -151,28 +151,28 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_read_write_config() {
|
||||
let config = toml::toml!{
|
||||
[cas]
|
||||
path = "/foo/bar"
|
||||
digest = "sha1"
|
||||
// #[test]
|
||||
// fn test_read_write_config() {
|
||||
// let config = toml::toml!{
|
||||
// [cas]
|
||||
// path = "/foo/bar"
|
||||
// digest = "sha1"
|
||||
|
||||
[extra]
|
||||
test = 42
|
||||
};
|
||||
// [extra]
|
||||
// test = 42
|
||||
// };
|
||||
|
||||
let dir = tempfile::TempDir::new()
|
||||
.expect("failed to create tmp dir");
|
||||
std::fs::create_dir(tmp_dir(Utf8Path::from_path(dir.path()).unwrap())).expect("failed to create db/tmp dir");
|
||||
// let dir = tempfile::TempDir::new()
|
||||
// .expect("failed to create tmp dir");
|
||||
// std::fs::create_dir(tmp_dir(Utf8Path::from_path(dir.path()).unwrap())).expect("failed to create db/tmp dir");
|
||||
|
||||
write_config(&config, Utf8Path::from_path(dir.path()).unwrap()).expect("failed to write config");
|
||||
let config2 = read_config(Utf8Path::from_path(dir.path()).unwrap()).expect("failed to read config");
|
||||
// write_config(&config, Utf8Path::from_path(dir.path()).unwrap()).expect("failed to write config");
|
||||
// let config2 = read_config(Utf8Path::from_path(dir.path()).unwrap()).expect("failed to read config");
|
||||
|
||||
assert_eq!(config2, config);
|
||||
// assert_eq!(config2, config);
|
||||
|
||||
dir.close().expect("failed to close tmp dir")
|
||||
}
|
||||
// dir.close().expect("failed to close tmp dir")
|
||||
// }
|
||||
|
||||
#[test]
|
||||
fn test_read_write_metadata() {
|
||||
|
||||
@@ -6,8 +6,9 @@ edition = "2021"
|
||||
license = "AGPL-3.0-or-later"
|
||||
|
||||
[dependencies]
|
||||
toml = "0.5.8"
|
||||
toml = { version = "0.7.6", features = ["parse"] }
|
||||
camino = "1.0.7"
|
||||
regex = "1.6.0"
|
||||
cas-core = { path = "../cas-core" }
|
||||
cas-simple = { path = "../cas-simple" }
|
||||
cas-simple = { path = "../cas-simple" }
|
||||
tempfile = "3.7.1"
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
// This file is part of bsv.
|
||||
//
|
||||
// bsv is free software: you can redistribute it and/or modify it under the
|
||||
// terms of the GNU Affero General Public License as published by the Free
|
||||
// Software Foundation, either version 3 of the License, or (at your option)
|
||||
// any later version.
|
||||
//
|
||||
// bsv is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
|
||||
// more details.
|
||||
//
|
||||
// You should have received a copy of the Affero GNU General Public License
|
||||
// along with bsv. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
use std::collections::{HashMap};
|
||||
use camino::Utf8PathBuf;
|
||||
|
||||
use cas_core::{Cas, Result};
|
||||
|
||||
|
||||
pub trait CasConfig {
|
||||
fn build_cas(&self) -> Result<Box<dyn Cas>>;
|
||||
}
|
||||
|
||||
|
||||
pub struct BsvConfig {
|
||||
cas: Box<dyn CasConfig>,
|
||||
dir_map: HashMap<Utf8PathBuf, Utf8PathBuf>,
|
||||
}
|
||||
@@ -14,23 +14,23 @@
|
||||
// along with bsv. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use camino::Utf8Path;
|
||||
use regex::RegexSet;
|
||||
|
||||
use cas_core::{err, Error, Result};
|
||||
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum Action {
|
||||
pub enum IgnoreAction {
|
||||
Ignore,
|
||||
Accept,
|
||||
}
|
||||
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct IgnoreRules {
|
||||
patterns: RegexSet,
|
||||
actions: Vec<Action>,
|
||||
actions: Vec<IgnoreAction>,
|
||||
}
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ impl IgnoreRules {
|
||||
};
|
||||
|
||||
let mut patterns = Vec::<String>::default();
|
||||
let mut actions = Vec::<Action>::default();
|
||||
let mut actions = Vec::<IgnoreAction>::default();
|
||||
|
||||
for line in source.lines() {
|
||||
let rule = line.trim();
|
||||
@@ -65,10 +65,10 @@ impl IgnoreRules {
|
||||
|
||||
if rule_it.peek() == Some(&'!') {
|
||||
rule_it.next();
|
||||
actions.push(Action::Accept);
|
||||
actions.push(IgnoreAction::Accept);
|
||||
}
|
||||
else {
|
||||
actions.push(Action::Ignore);
|
||||
actions.push(IgnoreAction::Ignore);
|
||||
}
|
||||
|
||||
let mut pat = String::new();
|
||||
@@ -125,13 +125,13 @@ impl IgnoreRules {
|
||||
})
|
||||
}
|
||||
|
||||
pub fn action_for<P: AsRef<Utf8Path>>(&self, path: P) -> Action {
|
||||
pub fn action_for<P: AsRef<Utf8Path>>(&self, path: P) -> IgnoreAction {
|
||||
assert!(path.as_ref().is_absolute());
|
||||
let index = self.patterns.matches(path.as_ref().as_str())
|
||||
.iter()
|
||||
.next()
|
||||
.unwrap_or(self.actions.len());
|
||||
*self.actions.get(index).unwrap_or(&Action::Accept)
|
||||
*self.actions.get(index).unwrap_or(&IgnoreAction::Accept)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -139,6 +139,8 @@ impl IgnoreRules {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use camino::Utf8PathBuf;
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
@@ -147,17 +149,17 @@ mod tests {
|
||||
let patterns = "!hello/world\nhello\n/world/\n\\!\\*\n*.bak";
|
||||
let ignore = IgnoreRules::from_source(patterns, root).unwrap();
|
||||
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test")), Action::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/hello/aoeu")), Action::Ignore);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/hello_world/aoeu")), Action::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/world/aoeu")), Action::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/hello/world/aoeu")), Action::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/world/aoeu")), Action::Ignore);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/world")), Action::Ignore);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/fooXdir/bar/world")), Action::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/!*/aoeu")), Action::Ignore);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/file.bak")), Action::Ignore);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/fileXbak")), Action::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test.bak/file")), Action::Ignore);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test")), IgnoreAction::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/hello/aoeu")), IgnoreAction::Ignore);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/hello_world/aoeu")), IgnoreAction::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/world/aoeu")), IgnoreAction::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/hello/world/aoeu")), IgnoreAction::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/world/aoeu")), IgnoreAction::Ignore);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/world")), IgnoreAction::Ignore);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/fooXdir/bar/world")), IgnoreAction::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/!*/aoeu")), IgnoreAction::Ignore);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/file.bak")), IgnoreAction::Ignore);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test/fileXbak")), IgnoreAction::Accept);
|
||||
assert_eq!(ignore.action_for(Utf8PathBuf::from("/foo.dir/bar/test.bak/file")), IgnoreAction::Ignore);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,20 +17,23 @@
|
||||
extern crate toml;
|
||||
extern crate camino;
|
||||
extern crate regex;
|
||||
extern crate tempfile;
|
||||
|
||||
extern crate cas_core;
|
||||
|
||||
|
||||
// mod config;
|
||||
mod ignore;
|
||||
mod path_map;
|
||||
mod permissions;
|
||||
mod repository;
|
||||
mod tree_item;
|
||||
mod tree_walker;
|
||||
// mod config;
|
||||
mod path_map;
|
||||
mod ignore;
|
||||
mod repository;
|
||||
|
||||
|
||||
pub use crate::permissions::Permissions;
|
||||
pub use crate::tree_item::{Serialize, TreeItem};
|
||||
pub use crate::ignore::{IgnoreAction, IgnoreRules};
|
||||
pub use crate::path_map::{PathMap, PathPair};
|
||||
pub use crate::repository::{Repository};
|
||||
pub use crate::permissions::Permissions;
|
||||
pub use crate::repository::Repository;
|
||||
pub use crate::tree_item::{Serialize, TreeItem};
|
||||
pub use crate::tree_walker::{Action, TreeWalker};
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use toml::Value;
|
||||
use toml::{Value, Table};
|
||||
|
||||
use cas_core::{err, Error, Result};
|
||||
|
||||
@@ -30,10 +30,28 @@ impl PathPair {
|
||||
pub fn new(logic: Utf8PathBuf, physic: Utf8PathBuf) -> Self {
|
||||
Self { logic, physic }
|
||||
}
|
||||
|
||||
pub fn physic_from_logic<P: AsRef<Utf8Path>>(&self, logic_path: P) -> Result<Utf8PathBuf> {
|
||||
let mut physic = self.physic.clone();
|
||||
physic.push(
|
||||
logic_path.as_ref().strip_prefix(&self.logic)?
|
||||
);
|
||||
|
||||
Ok(physic)
|
||||
}
|
||||
|
||||
pub fn logic_from_physic<P: AsRef<Utf8Path>>(&self, physic_path: P) -> Result<Utf8PathBuf> {
|
||||
let mut logic = self.logic.clone();
|
||||
logic.push(
|
||||
physic_path.as_ref().strip_prefix(&self.physic)?
|
||||
);
|
||||
|
||||
Ok(logic)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct PathMap {
|
||||
pairs: Vec<PathPair>,
|
||||
logic_order: Vec<usize>,
|
||||
@@ -113,38 +131,42 @@ impl PathMap {
|
||||
Self::from_vec(map)
|
||||
}
|
||||
|
||||
pub fn physic_from_logic<P: AsRef<Utf8Path>>(&self, logic_path: P) -> Option<Utf8PathBuf> {
|
||||
pub fn to_toml_value(&self) -> Result<Value> {
|
||||
let mut table = Table::new();
|
||||
for pair in self.pairs.iter() {
|
||||
table[pair.logic.as_str()] = pair.physic.as_str().into();
|
||||
}
|
||||
Ok(Value::Table(table))
|
||||
}
|
||||
|
||||
pub fn path_pair_from_logic<P: AsRef<Utf8Path>>(&self, logic_path: P) -> Option<&PathPair> {
|
||||
let path = logic_path.as_ref();
|
||||
|
||||
let pair = self.logic_order.iter()
|
||||
Some(self.logic_order.iter()
|
||||
.map(|&i| &self.pairs[i])
|
||||
.filter(|p| path.starts_with(&p.logic))
|
||||
.next()?;
|
||||
.next()?
|
||||
)
|
||||
}
|
||||
|
||||
let mut physic = pair.physic.clone();
|
||||
physic.push(
|
||||
path.strip_prefix(&pair.logic)
|
||||
.ok()?
|
||||
);
|
||||
pub fn path_pair_from_physic<P: AsRef<Utf8Path>>(&self, physic_path: P) -> Option<&PathPair> {
|
||||
let path = physic_path.as_ref();
|
||||
|
||||
return Some(physic)
|
||||
Some(self.physic_order.iter()
|
||||
.map(|&i| &self.pairs[i])
|
||||
.filter(|p| path.starts_with(&p.physic))
|
||||
.next()?
|
||||
)
|
||||
}
|
||||
|
||||
pub fn physic_from_logic<P: AsRef<Utf8Path>>(&self, logic_path: P) -> Option<Utf8PathBuf> {
|
||||
self.path_pair_from_logic(&logic_path)?
|
||||
.physic_from_logic(&logic_path).ok()
|
||||
}
|
||||
|
||||
pub fn logic_from_physic<P: AsRef<Utf8Path>>(&self, physic_path: P) -> Option<Utf8PathBuf> {
|
||||
let path = physic_path.as_ref();
|
||||
|
||||
let pair = self.physic_order.iter()
|
||||
.map(|&i| &self.pairs[i])
|
||||
.filter(|p| path.starts_with(&p.physic))
|
||||
.next()?;
|
||||
|
||||
let mut logic = pair.logic.clone();
|
||||
logic.push(
|
||||
path.strip_prefix(&pair.physic)
|
||||
.ok()?
|
||||
);
|
||||
|
||||
return Some(logic)
|
||||
self.path_pair_from_physic(&physic_path)?
|
||||
.logic_from_physic(&physic_path).ok()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -40,9 +40,9 @@ impl Permissions {
|
||||
use std::os::unix::fs::MetadataExt;
|
||||
let mode = metadata.mode();
|
||||
Ok(Self {
|
||||
read: mode & 0o100 != 0,
|
||||
read: mode & 0o400 != 0,
|
||||
write: mode & 0o200 != 0,
|
||||
execute: mode & 0o400 != 0,
|
||||
execute: mode & 0o100 != 0,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -14,100 +14,118 @@
|
||||
// along with bsv. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
use std::{fs::create_dir_all, io::BufReader};
|
||||
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use toml::Value;
|
||||
use cas_simple::utils::config_path;
|
||||
use toml::{Value, Table};
|
||||
|
||||
use cas_core::{Cas, err, Error, ObjectId, Result};
|
||||
use cas_simple::{SimpleCas};
|
||||
use cas_core::{err, Error, ObjectId, Result, ObjectType, CasWithRef};
|
||||
use cas_simple::{SimpleCas, SimpleCasConfig};
|
||||
|
||||
use crate::PathMap;
|
||||
pub use crate::permissions::Permissions;
|
||||
use crate::tree_item::Deserialize;
|
||||
pub use crate::tree_item::{Serialize, TreeItem};
|
||||
|
||||
|
||||
pub fn create_cas(path: Utf8PathBuf, config: Value) -> Result<Box<dyn Cas>> {
|
||||
let engine = config
|
||||
.get("cas")
|
||||
.ok_or_else(|| Error::unknown("config must have a cas item"))?
|
||||
.get("engine")
|
||||
.ok_or_else(|| Error::unknown("config must have a cas.engine item"))?
|
||||
.as_str()
|
||||
.ok_or_else(|| Error::unknown("cas.engine must be a string"))?;
|
||||
|
||||
match engine {
|
||||
"simple" => { SimpleCas::create(path, config).map(|cas| Box::new(cas) as Box<dyn Cas>) }
|
||||
_ => { err!("unknown cas engine {}", engine) }
|
||||
}
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct Config {
|
||||
pub device_name: String,
|
||||
pub cas: SimpleCasConfig,
|
||||
pub path_map: PathMap,
|
||||
}
|
||||
|
||||
impl Config {
|
||||
pub fn from_toml_value(value: &Value) -> Result<Self> {
|
||||
let bsv_value = value.get("bsv")
|
||||
.ok_or_else(|| Error::unknown("bsv section missing from config"))?;
|
||||
if !bsv_value.is_table() {
|
||||
return err!("bsv section must be a table");
|
||||
}
|
||||
|
||||
pub fn open_cas(path: Utf8PathBuf, config: &Value) -> Result<Box<dyn Cas>> {
|
||||
let engine = config
|
||||
.get("cas")
|
||||
.ok_or_else(|| Error::unknown("config must have a cas item"))?
|
||||
.get("engine")
|
||||
.ok_or_else(|| Error::unknown("config must have a cas.engine item"))?
|
||||
.as_str()
|
||||
.ok_or_else(|| Error::unknown("cas.engine must be a string"))?;
|
||||
Ok(Self {
|
||||
device_name: bsv_value.get("device_name")
|
||||
.ok_or_else(|| Error::unknown("bsv.device_name missing from config"))?
|
||||
.as_str()
|
||||
.ok_or_else(|| Error::unknown("bsv.device_name must be a string"))?
|
||||
.to_string(),
|
||||
cas: SimpleCasConfig::from_toml_value(
|
||||
value.get("cas").ok_or_else(|| Error::unknown("config must have a cas section"))?
|
||||
)?,
|
||||
path_map: PathMap::from_toml_value(
|
||||
value.get("mapping").ok_or_else(|| Error::unknown("config must have a mapping section"))?
|
||||
)?,
|
||||
})
|
||||
}
|
||||
|
||||
match engine {
|
||||
"simple" => { SimpleCas::open(path).map(|cas| Box::new(cas) as Box<dyn Cas>) }
|
||||
_ => { err!("unknown cas engine {}", engine) }
|
||||
pub fn from_toml_file(config_path: &Utf8Path) -> Result<Self> {
|
||||
use std::io::Read;
|
||||
|
||||
let mut file = std::fs::File::open(config_path).or_else(|err|
|
||||
err!("invalid repository: failed to read config file: {}", err)
|
||||
)?;
|
||||
let mut config_str = String::new();
|
||||
file.read_to_string(&mut config_str).or_else(|err|
|
||||
err!("failed to read config file: {}", err)
|
||||
)?;
|
||||
let value = config_str.parse::<Value>().or_else(|err|
|
||||
err!("parse error while reading config file: {}", err)
|
||||
)?;
|
||||
Self::from_toml_value(&value)
|
||||
}
|
||||
|
||||
pub fn to_toml_value(&self) -> Result<Value> {
|
||||
let mut bsv = Table::new();
|
||||
bsv["device_name"] = Value::String(self.device_name.clone());
|
||||
|
||||
let mut table = Table::new();
|
||||
table["bsv"] = Value::Table(bsv);
|
||||
table["cas"] = self.cas.to_toml_value()?;
|
||||
table["mapping"] = self.path_map.to_toml_value()?;
|
||||
|
||||
Ok(Value::Table(table))
|
||||
}
|
||||
|
||||
pub fn write_toml_file(&self, config_path: &Utf8Path) -> Result<()> {
|
||||
use std::io::Write;
|
||||
|
||||
let value = self.to_toml_value()?;
|
||||
let config_str = toml::to_string_pretty(&value).or_else(|err|
|
||||
err!("failed to serialize config: {}", err)
|
||||
)?;
|
||||
let mut file = tempfile::NamedTempFile::new_in(config_path.parent().unwrap()).or_else(|err|
|
||||
err!("cannot create temp config file: {}", err)
|
||||
)?;
|
||||
file.write_all(config_str.as_bytes()).or_else(|err|
|
||||
err!("failed to write to temp config: {}", err)
|
||||
)?;
|
||||
file.persist(config_path).or_else(|err|
|
||||
err!("failed to (over)write config: {}", err)
|
||||
)?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// pub trait FsVisitor {
|
||||
// fn accept(&self, path: &Utf8Path, metadata: &Metadata) -> bool;
|
||||
// fn handle_error(&mut self, error: Error) -> Option<Error>;
|
||||
|
||||
// fn handle_result<T>(&mut self, result: Result<T>) -> Result<T>
|
||||
// {
|
||||
// result.map_err(|error|
|
||||
// self.handle_error(error)
|
||||
// .unwrap_or(Error::Skipped)
|
||||
// )
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
// fn read_path_map(config: &Value) -> Result<Vec<PathPair>> {
|
||||
// if let Some(mapping) = config.get("mapping") {
|
||||
// if let Some(ref table) = mapping.as_table() {
|
||||
// table.iter()
|
||||
// .map(|(k, v)| Ok(PathPair{
|
||||
// logic: k.into(),
|
||||
// physic: v.as_str()
|
||||
// .ok_or_else(|| Error::unknown("mapping values must be strings"))?
|
||||
// .into()
|
||||
// }))
|
||||
// .collect()
|
||||
// }
|
||||
// else {
|
||||
// err!("mapping must be a table, got {}", mapping)
|
||||
// }
|
||||
// }
|
||||
// else {
|
||||
// Ok(vec![])
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
pub struct Repository {
|
||||
cas: Box<dyn Cas>,
|
||||
// path_map: Vec<PathPair>,
|
||||
config: Config,
|
||||
cas: Box<dyn CasWithRef>,
|
||||
}
|
||||
|
||||
impl Repository {
|
||||
pub fn create(path: Utf8PathBuf, config: Value) -> Result<Self> {
|
||||
pub fn create(path: Utf8PathBuf, config: Config) -> Result<Self> {
|
||||
if path.exists() {
|
||||
return err!("cannot create bsv repository, path {} already exists", path);
|
||||
}
|
||||
|
||||
let cas = create_cas(path, config)?;
|
||||
create_dir_all(&path)?;
|
||||
config.write_toml_file(&config_path(&path))?;
|
||||
let cas = SimpleCas::create(path.to_path_buf(), config.cas.clone())?;
|
||||
|
||||
Ok(Self {
|
||||
cas,
|
||||
// path_map: vec![],
|
||||
config,
|
||||
cas: Box::new(cas),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -117,39 +135,61 @@ impl Repository {
|
||||
}
|
||||
|
||||
let config_file = cas_simple::utils::config_path(&path);
|
||||
let config = cas_simple::utils::read_config(&config_file)?;
|
||||
let config = Config::from_toml_file(&config_file)?;
|
||||
|
||||
let cas = open_cas(path, &config)?;
|
||||
// let path_map = read_path_map(&config)?;
|
||||
let cas = SimpleCas::open(path, config.cas.clone())?;
|
||||
|
||||
Ok(Self {
|
||||
cas,
|
||||
// path_map,
|
||||
config,
|
||||
cas: Box::new(cas),
|
||||
})
|
||||
}
|
||||
|
||||
pub fn cas(&self) -> &dyn Cas {
|
||||
pub fn cas(&self) -> &dyn CasWithRef {
|
||||
self.cas.as_ref()
|
||||
}
|
||||
|
||||
// pub fn path_pair_from_logic_path<P: AsRef<Utf8Path>>(&self, logic_path: P) -> Option<PathPair> {
|
||||
// None
|
||||
// }
|
||||
pub fn physic_from_logic_path<P: AsRef<Utf8Path>>(&self, logic_path: P) -> Option<Utf8PathBuf> {
|
||||
self.config.path_map.physic_from_logic(&logic_path)
|
||||
}
|
||||
|
||||
// pub fn path_pair_from_physic_path<P: AsRef<Utf8Path>>(&self, physic_path: P) -> Option<PathPair> {
|
||||
// None
|
||||
// }
|
||||
pub fn path_pair_from_physic_path<P: AsRef<Utf8Path>>(&self, physic_path: P) -> Option<Utf8PathBuf> {
|
||||
self.config.path_map.logic_from_physic(&physic_path)
|
||||
}
|
||||
|
||||
pub fn oid_from_logic_path<P: AsRef<Utf8Path>>(&self, logic_path: P) -> Result<ObjectId> {
|
||||
pub fn oid_from_logic_path<P: AsRef<Utf8Path>>(&self, _logic_path: P) -> Result<ObjectId> {
|
||||
// let snapshot_oid = self.cas.get_ref(Utf8Path::new("latest"))?;
|
||||
// let snapshot = self.read_snapshot(snapshot_oid)?;
|
||||
err!("not implemented")
|
||||
}
|
||||
|
||||
pub fn oid_from_physic_path<P: AsRef<Utf8Path>>(&self, physic_path: P) -> Result<ObjectId> {
|
||||
err!("not implemented")
|
||||
let logic_path = self.config.path_map.logic_from_physic(physic_path)
|
||||
.ok_or_else(|| Error::unknown("physic path do not map to a logic path"))?;
|
||||
self.oid_from_logic_path(logic_path)
|
||||
}
|
||||
|
||||
pub fn read_tree(&self, oid: &ObjectId) -> Result<Option<Vec<TreeItem>>> {
|
||||
err!("not implemented")
|
||||
match self.cas.open_object(oid) {
|
||||
Ok((metadata, mut reader)) => {
|
||||
if metadata.otype() != &ObjectType::new(b"tree")? {
|
||||
err!("object is not a tree")
|
||||
}
|
||||
else {
|
||||
let mut buf_read = BufReader::new(reader.as_mut());
|
||||
Ok(Some(
|
||||
Vec::<TreeItem>::deserialize(&mut buf_read)?
|
||||
.unwrap_or_else(|| Vec::new())
|
||||
))
|
||||
}
|
||||
},
|
||||
Err(Error::ObjectDoesNotExists(_)) => {
|
||||
Ok(None)
|
||||
}
|
||||
Err(err) => {
|
||||
Err(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// pub fn add<P, V>(&mut self, path: P, visitor: &mut V) -> Result<ObjectId>
|
||||
|
||||
@@ -27,10 +27,10 @@ pub trait Serialize {
|
||||
}
|
||||
|
||||
pub trait Deserialize {
|
||||
fn deserialize_with_buf<R: BufRead>(stream: &mut R, buf: &mut Vec<u8>) -> Result<Self>
|
||||
fn deserialize_with_buf<R: BufRead>(stream: &mut R, buf: &mut Vec<u8>) -> Result<Option<Self>>
|
||||
where Self: Sized;
|
||||
|
||||
fn deserialize<R: BufRead>(stream: &mut R) -> Result<Self>
|
||||
fn deserialize<R: BufRead>(stream: &mut R) -> Result<Option<Self>>
|
||||
where Self: Sized
|
||||
{
|
||||
let mut buf = Vec::new();
|
||||
@@ -39,6 +39,15 @@ pub trait Deserialize {
|
||||
}
|
||||
|
||||
|
||||
pub fn is_tree_item_name_valid(name: &str) -> bool {
|
||||
return
|
||||
!name.contains('/') &&
|
||||
!name.contains('\\') &&
|
||||
!name.contains('\n') &&
|
||||
!name.contains('\0');
|
||||
}
|
||||
|
||||
|
||||
#[derive(Clone, Debug, Eq, PartialEq)]
|
||||
pub struct TreeItem {
|
||||
pub name: String,
|
||||
@@ -52,13 +61,17 @@ pub struct TreeItem {
|
||||
|
||||
impl TreeItem {
|
||||
pub fn from_metadata(name: String, metadata: &std::fs::Metadata, oid: ObjectId) -> Result<Self> {
|
||||
if !is_tree_item_name_valid(&name) {
|
||||
return err!("invalid item name {:?}", name);
|
||||
}
|
||||
|
||||
let otype = otype_from_metadata(metadata)?;
|
||||
let permissions = Permissions::from_metadata(metadata)?;
|
||||
|
||||
Ok(Self {
|
||||
name: name,
|
||||
otype,
|
||||
size: metadata.len(),
|
||||
size: if metadata.is_file() { metadata.len() } else { 0 },
|
||||
created: metadata.created().unwrap_or(UNIX_EPOCH),
|
||||
modified: metadata.modified().unwrap_or(UNIX_EPOCH),
|
||||
permissions,
|
||||
@@ -70,7 +83,7 @@ impl TreeItem {
|
||||
impl Serialize for TreeItem {
|
||||
fn serialize<W: Write>(&self, out: &mut W) -> Result<()> {
|
||||
// TODO: Check that name do not contain invalid characters
|
||||
writeln!(out, "{}\t{}\t{}\t{}\t{}\t{}\t{}/",
|
||||
writeln!(out, "{}\t{}\t{}\t{}\t{}\t{}\t{}",
|
||||
self.oid,
|
||||
self.otype,
|
||||
self.size,
|
||||
@@ -87,28 +100,39 @@ impl Serialize for TreeItem {
|
||||
}
|
||||
|
||||
impl Deserialize for TreeItem {
|
||||
fn deserialize_with_buf<R: BufRead>(stream: &mut R, buf: &mut Vec<u8>) -> Result<Self> {
|
||||
let oid: ObjectId = read_field_parse(stream, buf, "object ID", b'\t')?;
|
||||
fn deserialize_with_buf<R: BufRead>(stream: &mut R, buf: &mut Vec<u8>) -> Result<Option<Self>> {
|
||||
let oid: ObjectId = if let Some(oid) = read_field_parse(stream, buf, "object ID", b'\t')? {
|
||||
oid
|
||||
}
|
||||
else {
|
||||
return Ok(None);
|
||||
};
|
||||
read_field(stream, buf, "object type", b'\t')?;
|
||||
let otype = ObjectType::new(buf)?;
|
||||
let size: u64 = read_field_parse(stream, buf, "object type", b'\t')?;
|
||||
let permissions: Permissions = read_field_parse(stream, buf, "permissions", b'\t')?;
|
||||
let size: u64 = read_field_parse(stream, buf, "object type", b'\t')?
|
||||
.ok_or_else(|| Error::unknown("unexpected end-of-file"))?;
|
||||
let permissions: Permissions = read_field_parse(stream, buf, "permissions", b'\t')?
|
||||
.ok_or_else(|| Error::unknown("unexpected end-of-file"))?;
|
||||
let created = UNIX_EPOCH + Duration::from_millis(
|
||||
read_field_parse(stream, buf, "creation date", b'\t')?
|
||||
.ok_or_else(|| Error::unknown("unexpected end-of-file"))?
|
||||
);
|
||||
let modified = UNIX_EPOCH + Duration::from_millis(
|
||||
read_field_parse(stream, buf, "modification date", b'\t')?
|
||||
.ok_or_else(|| Error::unknown("unexpected end-of-file"))?
|
||||
);
|
||||
let name = read_field_str(stream, buf, "name", b'/')?
|
||||
let name = read_field_str(stream, buf, "name", b'\n')?
|
||||
.ok_or_else(|| Error::unknown("unexpected end-of-file"))?
|
||||
.to_string();
|
||||
|
||||
stream.read_exact(&mut buf[..1])
|
||||
.or_else(|err| err!("failed to read new line character: {}", err))?;
|
||||
if buf[0] != b'\n' {
|
||||
err!("expected new line character, got {:x}", buf[0])
|
||||
if name.is_empty() {
|
||||
err!("tree item name is empty")
|
||||
}
|
||||
else if !is_tree_item_name_valid(&name) {
|
||||
err!("tree item name has invalid character(s)")
|
||||
}
|
||||
else {
|
||||
Ok(TreeItem {
|
||||
Ok(Some(TreeItem {
|
||||
name,
|
||||
otype,
|
||||
size,
|
||||
@@ -116,7 +140,7 @@ impl Deserialize for TreeItem {
|
||||
modified,
|
||||
permissions,
|
||||
oid,
|
||||
})
|
||||
}))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -133,6 +157,22 @@ impl Serialize for [TreeItem] {
|
||||
}
|
||||
}
|
||||
|
||||
impl Deserialize for Vec<TreeItem> {
|
||||
fn deserialize_with_buf<R: BufRead>(stream: &mut R, buf: &mut Vec<u8>) -> Result<Option<Self>> {
|
||||
let mut items = Vec::new();
|
||||
while let Some(item) = TreeItem::deserialize_with_buf(stream, buf)? {
|
||||
items.push(item);
|
||||
}
|
||||
|
||||
Ok(if items.is_empty() {
|
||||
None
|
||||
}
|
||||
else {
|
||||
Some(items)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
pub fn otype_from_metadata(metadata: &std::fs::Metadata) -> Result<ObjectType> {
|
||||
let file_type = metadata.file_type();
|
||||
@@ -152,29 +192,45 @@ pub fn otype_from_metadata(metadata: &std::fs::Metadata) -> Result<ObjectType> {
|
||||
}
|
||||
|
||||
|
||||
fn read_field<R: BufRead>(stream: &mut R, buf: &mut Vec<u8>, field_name: &str, byte: u8) -> Result<()> {
|
||||
fn read_field<R: BufRead>(stream: &mut R, buf: &mut Vec<u8>, field_name: &str, byte: u8) -> Result<bool> {
|
||||
buf.clear();
|
||||
stream.read_until(byte, buf)
|
||||
.or_else(|err| err!("failed to read TreeItem {}: {}", field_name, err))?;
|
||||
if buf.is_empty() {
|
||||
return Ok(false)
|
||||
}
|
||||
buf.pop();
|
||||
Ok(())
|
||||
Ok(true)
|
||||
}
|
||||
|
||||
fn read_field_str<'a, R: BufRead>(stream: &mut R, buf: &'a mut Vec<u8>, field_name: &str, byte: u8) -> Result<&'a str> {
|
||||
read_field(stream, buf, field_name, byte)?;
|
||||
std::str::from_utf8(buf)
|
||||
.or_else(|err| err!("TreeItem {} is not valid utf-8: {}", field_name, err))
|
||||
fn read_field_str<'a, R: BufRead>(stream: &mut R, buf: &'a mut Vec<u8>, field_name: &str, byte: u8) -> Result<Option<&'a str>> {
|
||||
if read_field(stream, buf, field_name, byte)? {
|
||||
Ok(Some(
|
||||
std::str::from_utf8(buf)
|
||||
.or_else(|err| err!("TreeItem {} is not valid utf-8: {}", field_name, err))?
|
||||
))
|
||||
}
|
||||
else {
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
|
||||
fn read_field_parse<R, I>(stream: &mut R, buf: &mut Vec<u8>, field_name: &str, byte: u8) -> Result<I>
|
||||
fn read_field_parse<R, I>(stream: &mut R, buf: &mut Vec<u8>, field_name: &str, byte: u8) -> Result<Option<I>>
|
||||
where
|
||||
R: BufRead,
|
||||
I: std::str::FromStr,
|
||||
<I as std::str::FromStr>::Err: std::fmt::Display
|
||||
{
|
||||
let int_str = read_field_str(stream, buf, field_name, byte)?;
|
||||
I::from_str(int_str)
|
||||
.or_else(|err| err!("failed to parse TreeItem {}: {}", field_name, err))
|
||||
let maybe_str = read_field_str(stream, buf, field_name, byte)?;
|
||||
if let Some(int_str) = maybe_str {
|
||||
Ok(Some(
|
||||
I::from_str(int_str)
|
||||
.or_else(|err| err!("failed to parse TreeItem {}: {}", field_name, err))?
|
||||
))
|
||||
}
|
||||
else {
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -196,7 +252,7 @@ mod tests {
|
||||
permissions: Permissions { read: true, write: false, execute: true },
|
||||
oid: ObjectId::from_str("0123456789abcdef").unwrap(),
|
||||
};
|
||||
let expected = "0123456789abcdef\ttest\t42\tr-x\t1234000\t5678000\tTest $¢ह€한/\n".as_bytes();
|
||||
let expected = "0123456789abcdef\ttest\t42\tr-x\t1234000\t5678000\tTest $¢ह€한\n".as_bytes();
|
||||
|
||||
let mut result = Vec::new();
|
||||
item.serialize(&mut result).unwrap();
|
||||
@@ -208,7 +264,7 @@ mod tests {
|
||||
fn test_deserialize_tree_item() {
|
||||
use std::io::Cursor;
|
||||
|
||||
let item_bytes = "0123456789abcdef\ttest\t42\tr-x\t1234000\t5678000\tTest $¢ह€한/\n".as_bytes();
|
||||
let item_bytes = "0123456789abcdef\ttest\t42\tr-x\t1234000\t5678000\tTest $¢ह€한\n".as_bytes();
|
||||
let mut item_cursor = Cursor::new(item_bytes);
|
||||
let expected = TreeItem {
|
||||
name: "Test $¢ह€한".to_string(),
|
||||
@@ -220,19 +276,20 @@ mod tests {
|
||||
oid: ObjectId::from_str("0123456789abcdef").unwrap(),
|
||||
};
|
||||
|
||||
let item = TreeItem::deserialize(&mut item_cursor).unwrap();
|
||||
let item = TreeItem::deserialize(&mut item_cursor).unwrap().unwrap();
|
||||
|
||||
assert_eq!(item, expected);
|
||||
|
||||
assert!(TreeItem::deserialize(&mut Cursor::new("")).unwrap().is_none());
|
||||
assert!(TreeItem::deserialize(&mut Cursor::new(
|
||||
"0123456789abcdef\ttest\t42\tr-x\t1234000\t5678000\tTest $¢ह€한/".as_bytes()
|
||||
"0123456789abcdef\ttest\t42\tr-x\t1234000\t5678000\tTest $¢ह€한".as_bytes()
|
||||
)).is_err());
|
||||
assert!(TreeItem::deserialize(&mut Cursor::new(
|
||||
"0123456789abcdef\ttest\t42\tr-x\t1234000\t5678000\tTest $¢ह€한/bar/\n".as_bytes()
|
||||
)).is_err());
|
||||
assert!(TreeItem::deserialize(&mut Cursor::new(
|
||||
"0123456789abcdef\ttest\t42\tr-x\t1234000\t5678000\tTest $¢ह€한\t\n".as_bytes()
|
||||
"0123456789abcdef\ttest\t42\tr-x\t1234000\t5678000\tTest $¢ह€한/bar\n".as_bytes()
|
||||
)).is_err());
|
||||
// assert!(TreeItem::deserialize(&mut Cursor::new(
|
||||
// "0123456789abcdef\ttest\t42\tr-x\t1234000\t5678000\tTest $¢ह€한\t\n".as_bytes()
|
||||
// )).is_err());
|
||||
assert!(TreeItem::deserialize(&mut Cursor::new(
|
||||
"0123456789abcdef\ttest\t42\tr-x\t5678000\tTest $¢ह€한\t\n".as_bytes()
|
||||
)).is_err());
|
||||
|
||||
@@ -15,14 +15,15 @@
|
||||
|
||||
|
||||
use std::iter::Peekable;
|
||||
use std::fs::{DirEntry, Metadata, ReadDir, read_dir};
|
||||
use std::fs::read_dir;
|
||||
use std::vec::IntoIter;
|
||||
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
|
||||
use cas_core::{err, Error, ObjectId, Result};
|
||||
use cas_core::{Error, ObjectId, Result};
|
||||
|
||||
use crate::{PathPair, Repository, TreeItem};
|
||||
use crate::{IgnoreAction, IgnoreRules};
|
||||
use crate::TreeItem;
|
||||
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
@@ -35,13 +36,19 @@ pub enum Action {
|
||||
}
|
||||
|
||||
pub struct TreeWalker {
|
||||
path: Utf8PathBuf,
|
||||
dir_it: Peekable<IntoIter<Result<TreeItem>>>,
|
||||
prev_tree_it: Peekable<IntoIter<TreeItem>>,
|
||||
ignore_rules: Option<IgnoreRules>,
|
||||
}
|
||||
|
||||
|
||||
impl TreeWalker {
|
||||
pub fn new<P: AsRef<Utf8Path>>(path: P, prev_tree: Vec<TreeItem>) -> Result<Self> {
|
||||
pub fn new<P: AsRef<Utf8Path>>(
|
||||
path: P,
|
||||
prev_tree: Vec<TreeItem>,
|
||||
ignore_rules: Option<IgnoreRules>
|
||||
) -> Result<Self> {
|
||||
let dir_entries = read_dir(path.as_ref().to_path_buf())?
|
||||
.map(|res| res.map_err(|err| err.into()))
|
||||
.collect::<Result<Vec<_>>>()?;
|
||||
@@ -70,10 +77,26 @@ impl TreeWalker {
|
||||
});
|
||||
|
||||
Ok(Self {
|
||||
path: path.as_ref().to_path_buf(),
|
||||
dir_it: dir_items.into_iter().peekable(),
|
||||
prev_tree_it: prev_tree.into_iter().peekable(),
|
||||
ignore_rules: ignore_rules,
|
||||
})
|
||||
}
|
||||
|
||||
fn test_ignore(&self, item_name: &str, default_action: Action) -> Action {
|
||||
if let Some(ignore_rules) = self.ignore_rules.as_ref() {
|
||||
let mut path = self.path.clone();
|
||||
path.push(item_name);
|
||||
match ignore_rules.action_for(path) {
|
||||
IgnoreAction::Accept => { default_action },
|
||||
IgnoreAction::Ignore => { Action::Ignore },
|
||||
}
|
||||
}
|
||||
else {
|
||||
default_action
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Iterator for TreeWalker {
|
||||
@@ -82,32 +105,42 @@ impl Iterator for TreeWalker {
|
||||
fn next(&mut self) -> Option<Self::Item> {
|
||||
match (self.dir_it.peek(), self.prev_tree_it.peek()) {
|
||||
(Some(Err(_)), _) => {
|
||||
Some(Err(self.dir_it.next().unwrap().unwrap_err()))
|
||||
let error = self.dir_it.next().unwrap().unwrap_err();
|
||||
Some(Err(error))
|
||||
}
|
||||
(Some(Ok(curr_item)), Some(prev_item)) => {
|
||||
if curr_item.name == prev_item.name {
|
||||
let action =
|
||||
if curr_item.modified != prev_item.modified {
|
||||
if curr_item.modified != prev_item.modified
|
||||
|| curr_item.otype != prev_item.otype
|
||||
|| curr_item.size != prev_item.size {
|
||||
Action::Update
|
||||
}
|
||||
else {
|
||||
Action::Skip
|
||||
};
|
||||
self.prev_tree_it.next();
|
||||
Some(Ok((action, self.dir_it.next().unwrap().unwrap())))
|
||||
let item = self.dir_it.next().unwrap().unwrap();
|
||||
self.prev_tree_it.next().unwrap();
|
||||
Some(Ok((action, item)))
|
||||
}
|
||||
else if curr_item.name < prev_item.name {
|
||||
Some(Ok((Action::Add, self.dir_it.next().unwrap().unwrap())))
|
||||
let item = self.dir_it.next().unwrap().unwrap();
|
||||
let action = self.test_ignore(&item.name, Action::Add);
|
||||
Some(Ok((action, item)))
|
||||
}
|
||||
else {
|
||||
Some(Ok((Action::Remove, self.prev_tree_it.next().unwrap())))
|
||||
let item = self.prev_tree_it.next().unwrap();
|
||||
Some(Ok((Action::Remove, item)))
|
||||
}
|
||||
},
|
||||
(Some(_), None) => {
|
||||
Some(Ok((Action::Add, self.dir_it.next().unwrap().unwrap())))
|
||||
let item = self.dir_it.next().unwrap().unwrap();
|
||||
let action = self.test_ignore(&item.name, Action::Add);
|
||||
Some(Ok((action, item)))
|
||||
},
|
||||
(None, Some(_)) => {
|
||||
Some(Ok((Action::Remove, self.prev_tree_it.next().unwrap())))
|
||||
let item = self.prev_tree_it.next().unwrap();
|
||||
Some(Ok((Action::Remove, item)))
|
||||
},
|
||||
(None, None) => None,
|
||||
}
|
||||
@@ -117,15 +150,124 @@ impl Iterator for TreeWalker {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::fs::{create_dir, remove_file as fs_remove_file, write};
|
||||
|
||||
use tempfile::tempdir;
|
||||
|
||||
use cas_core::ObjectType;
|
||||
use crate::Permissions;
|
||||
use super::*;
|
||||
|
||||
fn mkdir(root: &Utf8Path, path: &str) -> Result<()> {
|
||||
let mut full_path = root.to_path_buf();
|
||||
full_path.push(path);
|
||||
create_dir(full_path).map_err(|err| err.into())
|
||||
}
|
||||
|
||||
fn write_file(root: &Utf8Path, path: &str, content: &[u8]) -> Result<()> {
|
||||
let mut full_path = root.to_path_buf();
|
||||
full_path.push(path);
|
||||
write(full_path, content).map_err(|err| err.into())
|
||||
}
|
||||
|
||||
fn remove_file(root: &Utf8Path, path: &str) -> Result<()> {
|
||||
let mut full_path = root.to_path_buf();
|
||||
full_path.push(path);
|
||||
fs_remove_file(full_path).map_err(|err| err.into())
|
||||
}
|
||||
|
||||
fn to_tree_items(items: Vec<Result<(Action, TreeItem)>>) -> Vec<TreeItem> {
|
||||
items.into_iter()
|
||||
.filter(|ref item| item.as_ref().unwrap().0 != Action::Remove)
|
||||
.map(|item| item.unwrap().1)
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tree_walker() {
|
||||
for item in TreeWalker::new("/home/draklaw/tmp", vec![]).unwrap() {
|
||||
match item {
|
||||
Ok((action, tree_item)) => println!("{:?} {:?}", action, tree_item.name),
|
||||
Err(err) => println!("error while iterating directory: {}", err),
|
||||
}
|
||||
}
|
||||
fn test_tree_walker() -> Result<()>{
|
||||
let root_dir = tempdir()?;
|
||||
let root = Utf8Path::from_path(root_dir.path()).unwrap();
|
||||
|
||||
let ignore_rules = IgnoreRules::from_source("*.bak", root).unwrap();
|
||||
|
||||
mkdir(root, "test")?;
|
||||
write_file(root, "test/foobar.txt", b"baz")?;
|
||||
write_file(root, "readme", b"hello world!")?;
|
||||
|
||||
let items: Vec<_> = TreeWalker::new(root, vec![], Some(ignore_rules.clone())).unwrap().collect();
|
||||
assert_eq!(items.len(), 2);
|
||||
let (action, item) = items[0].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Add);
|
||||
assert_eq!(item.name, "readme");
|
||||
assert_eq!(item.otype, ObjectType::new(b"blob").unwrap());
|
||||
assert_eq!(item.size, 12);
|
||||
assert_eq!(item.permissions, Permissions{read: true, write: true, execute: false});
|
||||
let (action, item) = items[1].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Add);
|
||||
assert_eq!(item.name, "test");
|
||||
assert_eq!(item.otype, ObjectType::new(b"tree").unwrap());
|
||||
assert_eq!(item.size, 0);
|
||||
assert_eq!(item.permissions, Permissions{read: true, write: true, execute: true});
|
||||
|
||||
write_file(root, "abc", b"xxxx")?;
|
||||
|
||||
let items: Vec<_> = TreeWalker::new(root, to_tree_items(items), Some(ignore_rules.clone())).unwrap().collect();
|
||||
assert_eq!(items.len(), 3);
|
||||
let (action, item) = items[0].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Add);
|
||||
assert_eq!(item.name, "abc");
|
||||
assert_eq!(item.otype, ObjectType::new(b"blob").unwrap());
|
||||
assert_eq!(item.size, 4);
|
||||
assert_eq!(item.permissions, Permissions{read: true, write: true, execute: false});
|
||||
let (action, item) = items[1].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Skip);
|
||||
assert_eq!(item.name, "readme");
|
||||
let (action, item) = items[2].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Skip);
|
||||
assert_eq!(item.name, "test");
|
||||
|
||||
remove_file(root, "readme")?;
|
||||
|
||||
let items: Vec<_> = TreeWalker::new(root, to_tree_items(items), Some(ignore_rules.clone())).unwrap().collect();
|
||||
assert_eq!(items.len(), 3);
|
||||
let (action, item) = items[0].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Skip);
|
||||
assert_eq!(item.name, "abc");
|
||||
let (action, item) = items[1].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Remove);
|
||||
assert_eq!(item.name, "readme");
|
||||
let (action, item) = items[2].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Skip);
|
||||
assert_eq!(item.name, "test");
|
||||
|
||||
write_file(root, "abc", b"ab")?;
|
||||
write_file(root, "test/foobar.txt", b"redacted")?;
|
||||
|
||||
let items: Vec<_> = TreeWalker::new(root, to_tree_items(items), Some(ignore_rules.clone())).unwrap().collect();
|
||||
assert_eq!(items.len(), 2);
|
||||
let (action, item) = items[0].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Update);
|
||||
assert_eq!(item.name, "abc");
|
||||
assert_eq!(item.size, 2);
|
||||
let (action, item) = items[1].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Skip);
|
||||
assert_eq!(item.name, "test");
|
||||
|
||||
write_file(root, "test.bak", b"ignore this")?;
|
||||
|
||||
let items: Vec<_> = TreeWalker::new(root, to_tree_items(items), Some(ignore_rules.clone())).unwrap().collect();
|
||||
assert_eq!(items.len(), 3);
|
||||
let (action, item) = items[0].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Skip);
|
||||
assert_eq!(item.name, "abc");
|
||||
let (action, item) = items[1].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Skip);
|
||||
assert_eq!(item.name, "test");
|
||||
let (action, item) = items[2].as_ref().unwrap();
|
||||
assert_eq!(action, &Action::Ignore);
|
||||
assert_eq!(item.name, "test.bak");
|
||||
assert_eq!(item.size, 11);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user