Merge install cache and trust cache into one

Cargo.toml

@@ -15,7 +15,7 @@ async-signal = "0.2"
 async-once-cell = "0.5"
 clap = { version = "4.5", features = ["derive"] }
 const_format = "0.2"
-dashmap = "5.5"
+dashmap = { version = "5.5", features = ["serde"] }
 dialoguer = "0.11"
 dirs = "5.0"
 futures = "0.3"
@@ -29,7 +29,7 @@ reqwest = { version = "0.12", default-features = false, features = [
 ] }
 secrecy = "0.8"
 semver = { version = "1.0", features = ["serde"] }
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
 serde_with = { version = "3.7", features = ["macros"] }
 tempfile = "3.3"

lib/manifests/aftman.rs

@@ -5,7 +5,7 @@ use toml_edit::{DocumentMut, Formatted, Item, Value};
 use crate::{
     result::{AftmanError, AftmanResult},
     tool::{ToolAlias, ToolSpec},
-    util::{load_from_file_fallible, save_to_file},
+    util::{load_from_file, save_to_file},
 };
 
 pub const MANIFEST_FILE_NAME: &str = "aftman.toml";
@@ -37,7 +37,7 @@ impl AftmanManifest {
     */
     pub async fn load_or_create(dir: impl AsRef<Path>) -> AftmanResult<Self> {
         let path = dir.as_ref().join(MANIFEST_FILE_NAME);
-        match load_from_file_fallible(path).await {
+        match load_from_file(path).await {
             Ok(manifest) => Ok(manifest),
             Err(AftmanError::FileNotFound(_)) => {
                 let new = Self::default();
@@ -57,7 +57,7 @@ impl AftmanManifest {
     pub async fn load(dir: impl AsRef<Path>) -> AftmanResult<Self> {
         let path = dir.as_ref().join(MANIFEST_FILE_NAME);
         tracing::trace!(?path, "Loading manifest");
-        load_from_file_fallible(path).await
+        load_from_file(path).await
     }
 
     /**

lib/manifests/auth.rs

@@ -5,7 +5,7 @@ use toml_edit::{DocumentMut, Formatted, Item, Value};
 use crate::{
     result::{AftmanError, AftmanResult},
     sources::ArtifactProvider,
-    util::{load_from_file_fallible, save_to_file},
+    util::{load_from_file, save_to_file},
 };
 
 pub const MANIFEST_FILE_NAME: &str = "auth.toml";
@@ -36,7 +36,7 @@ impl AuthManifest {
     */
     pub async fn load_or_create(dir: impl AsRef<Path>) -> AftmanResult<Self> {
         let path = dir.as_ref().join(MANIFEST_FILE_NAME);
-        match load_from_file_fallible(path).await {
+        match load_from_file(path).await {
             Ok(manifest) => Ok(manifest),
             Err(AftmanError::FileNotFound(_)) => {
                 let new = Self::default();
@@ -56,7 +56,7 @@ impl AuthManifest {
     pub async fn load(dir: impl AsRef<Path>) -> AftmanResult<Self> {
         let path = dir.as_ref().join(MANIFEST_FILE_NAME);
         tracing::trace!(?path, "Loading manifest");
-        load_from_file_fallible(path).await
+        load_from_file(path).await
     }
 
     /**

lib/storage/home.rs

@@ -5,7 +5,7 @@ use std::sync::Arc;
 
 use crate::result::{AftmanError, AftmanResult};
 
-use super::{InstallCache, ToolStorage, TrustCache};
+use super::{ToolCache, ToolStorage};
 
 /**
     Aftman's home directory - this is where Aftman stores its
@@ -19,9 +19,8 @@ use super::{InstallCache, ToolStorage, TrustCache};
 pub struct Home {
     path: Arc<Path>,
     did_save: Arc<AtomicBool>,
-    trust_cache: TrustCache,
-    install_cache: InstallCache,
     tool_storage: ToolStorage,
+    tool_cache: ToolCache,
 }
 
 impl Home {
@@ -32,18 +31,14 @@ impl Home {
         let path: Arc<Path> = path.into().into();
         let did_save = Arc::new(AtomicBool::new(false));
 
-        let (trust_cache, install_cache, tool_storage) = tokio::try_join!(
-            TrustCache::load(&path),
-            InstallCache::load(&path),
-            ToolStorage::load(&path),
-        )?;
+        let (tool_storage, tool_cache) =
+            tokio::try_join!(ToolStorage::load(&path), ToolCache::load(&path))?;
 
         Ok(Self {
             path,
             did_save,
-            trust_cache,
-            install_cache,
             tool_storage,
+            tool_cache,
         })
     }
 
@@ -77,34 +72,24 @@ impl Home {
     }
 
     /**
-        Returns a reference to the `TrustCache` for this `Home`.
-    */
-    pub fn trust_cache(&self) -> &TrustCache {
-        &self.trust_cache
-    }
-
-    /**
-        Returns a reference to the `InstallCache` for this `Home`.
+        Returns a reference to the `ToolStorage` for this `Home`.
     */
-    pub fn install_cache(&self) -> &InstallCache {
-        &self.install_cache
+    pub fn tool_storage(&self) -> &ToolStorage {
+        &self.tool_storage
     }
 
     /**
-        Returns a reference to the `ToolStorage` for this `Home`.
+        Returns a reference to the `ToolCache` for this `Home`.
     */
-    pub fn tool_storage(&self) -> &ToolStorage {
-        &self.tool_storage
+    pub fn tool_cache(&self) -> &ToolCache {
+        &self.tool_cache
     }
 
     /**
         Saves the contents of this `Home` to disk.
     */
     pub async fn save(&self) -> AftmanResult<()> {
-        tokio::try_join!(
-            self.trust_cache.save(&self.path),
-            self.install_cache.save(&self.path),
-        )?;
+        self.tool_cache.save(&self.path).await?;
         self.did_save.store(true, Ordering::SeqCst);
         Ok(())
     }

lib/storage/mod.rs

@@ -1,9 +1,7 @@
 mod home;
-mod install_cache;
+mod tool_cache;
 mod tool_storage;
-mod trust_cache;
 
 pub use self::home::Home;
-pub use self::install_cache::InstallCache;
+pub use self::tool_cache::ToolCache;
 pub use self::tool_storage::ToolStorage;
-pub use self::trust_cache::TrustCache;