Merge 9136354 into 66c9362

ARK-Builders · Dec 1, 2024 · 92357c6 · 92357c6
2 parents 66c9362 + 9136354
commit 92357c6
Show file tree

Hide file tree

Showing 10 changed files with 769 additions and 59 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,6 +7,7 @@ members = [
     "data-pdf",
     "data-resource",
     "fs-atomic-versions",
+    "fs-cache",
     "fs-atomic-light",
     "fs-metadata",
     "fs-properties",
@@ -23,6 +24,7 @@ default-members = [
     "data-pdf",
     "data-resource",
     "fs-atomic-versions",
+    "fs-cache",
     "fs-atomic-light",
     "fs-metadata",
     "fs-properties",

diff --git a/README.md b/README.md
@@ -28,18 +28,19 @@ The core crate is `fs-index` which provides us with [content addressing](https:/
 
 <div align="center">
 
-| Package         | Description                              |
-| --------------- | ---------------------------------------- |
-| `ark-cli`       | The CLI tool to interact with ark crates |
-| `data-resource` | Resource hashing and ID construction     |
-| `fs-index`      | Resource Index construction and updating |
-| `fs-storage`    | Filesystem storage for resources         |
-| `fs-metadata`   | Metadata management                      |
-| `fs-properties` | Properties management                    |
-| `data-link`     | Linking resources                        |
-| `data-pdf`      | PDF handling                             |
-| `data-error`    | Error handling                           |
-| `data-json`     | JSON serialization and deserialization   |
+| Package         | Description                               |
+| --------------- | ----------------------------------------  |
+| `ark-cli`       | The CLI tool to interact with ark crates  |
+| `data-resource` | Resource hashing and ID construction      |
+| `fs-cache`      | Memory and disk caching with LRU eviction |
+| `fs-index`      | Resource Index construction and updating  |
+| `fs-storage`    | Filesystem storage for resources          |
+| `fs-metadata`   | Metadata management                       |
+| `fs-properties` | Properties management                     |
+| `data-link`     | Linking resources                         |
+| `data-pdf`      | PDF handling                              |
+| `data-error`    | Error handling                            |
+| `data-json`     | JSON serialization and deserialization    |
 
 </div>
 

diff --git a/fs-atomic-versions/src/atomic/file.rs b/fs-atomic-versions/src/atomic/file.rs
@@ -126,7 +126,7 @@ impl AtomicFile {
 
     /// Return the latest version together with vector of the
     /// files matching this version. Multiple files for the same version
-    /// can appear due to usage of file syncronization. Different devices
+    /// can appear due to usage of file synchronization. Different devices
     /// can create same version simultaneously.
     pub fn latest_version(&self) -> Result<(usize, Vec<ReadOnlyFile>)> {
         let files_iterator = fs::read_dir(&self.directory)?.flatten();

diff --git a/fs-cache/Cargo.toml b/fs-cache/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "fs-cache"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "fs_cache"
+crate-type = ["rlib", "cdylib"]
+bench = false
+
+[dependencies]
+log = { version = "0.4.17", features = ["release_max_level_off"] }
+data-error = { path = "../data-error" }
+fs-storage = { path = "../fs-storage"}
+fs-atomic-light = { path = "../fs-atomic-light" }
+lru = "0.12.5"
+
+[dev-dependencies]
+tempdir = "0.3.7"
+rstest = "0.23"