Rename fields.

Author: tmpfs

Cargo.lock

@@ -1097,7 +1097,7 @@ impl LocalAccount {
                 .ok_or(Error::NoOpenFolder)?;
 
             let commit_state = reader
-                .cache()
+                .folders()
                 .get(folder.id())
                 .ok_or(StorageError::CacheNotAvailable(*folder.id()))?
                 .commit_state()
@@ -1989,8 +1989,8 @@ impl Account for LocalAccount {
 
     async fn root_commit(&self, summary: &Summary) -> Result<CommitHash> {
         let reader = self.storage.read().await;
-        let cache = reader.cache();
-        let folder = cache
+        let folder = reader
+            .folders()
             .get(summary.id())
             .ok_or_else(|| StorageError::CacheNotAvailable(*summary.id()))?;
         let event_log = folder.event_log();
@@ -2125,8 +2125,8 @@ impl Account for LocalAccount {
         let search_index = Arc::new(RwLock::new(SearchIndex::new()));
 
         let reader = self.storage.read().await;
-        let cache = reader.cache();
-        let folder = cache
+        let folder = reader
+            .folders()
             .get(summary.id())
             .ok_or_else(|| StorageError::CacheNotAvailable(*summary.id()))?;
 
@@ -3365,7 +3365,7 @@ impl StorageEventLogs for LocalAccount {
     ) -> Result<Arc<RwLock<FolderEventLog>>> {
         let storage = self.storage.read().await;
         let folder = storage
-            .cache()
+            .folders()
             .get(id)
             .ok_or(StorageError::CacheNotAvailable(*id))?;
         Ok(folder.event_log())

crates/account/src/account.rs

@@ -67,7 +67,7 @@ impl ForceMerge for LocalAccount {
         let mut storage = self.storage.write().await;
 
         let folder = storage
-            .cache_mut()
+            .folders_mut()
             .get_mut(folder_id)
             .ok_or_else(|| StorageError::CacheNotAvailable(*folder_id))?;
         folder.force_merge(&diff).await?;
@@ -341,7 +341,7 @@ impl Merge for LocalAccount {
             }
 
             let folder = storage
-                .cache_mut()
+                .folders_mut()
                 .get_mut(folder_id)
                 .ok_or_else(|| StorageError::CacheNotAvailable(*folder_id))?;
 

crates/account/src/sync.rs

@@ -313,7 +313,7 @@ where
                             let storage = account.storage().await;
                             let storage = storage.read().await;
                             if let Some(folder) =
-                                storage.cache().get(&folder_id)
+                                storage.folders().get(&folder_id)
                             {
                                 let keeper = folder.keeper();
                                 let mut index = index.write().await;
@@ -331,7 +331,8 @@ where
             ChangeRecords::Folder(folder_id, events) => {
                 let storage = account.storage().await;
                 let mut storage = storage.write().await;
-                if let Some(folder) = storage.cache_mut().get_mut(&folder_id)
+                if let Some(folder) =
+                    storage.folders_mut().get_mut(&folder_id)
                 {
                     let keeper = folder.keeper_mut();
 
@@ -498,7 +499,7 @@ where
                 let storage = account.storage().await;
                 let storage = storage.read().await;
                 let folder = storage
-                    .cache()
+                    .folders()
                     .get(&folder_id)
                     .ok_or(FileEventError::NoFolder(folder_id))?;
 

crates/ipc/src/web_service/web_accounts.rs

@@ -10,6 +10,7 @@ repository = "https://github.com/saveoursecrets/sdk"
 [dependencies]
 sos-account.workspace = true
 sos-backend.workspace = true
+sos-client-storage.workspace = true
 sos-core.workspace = true
 sos-password.workspace = true
 sos-vault.workspace = true

crates/security_report/Cargo.toml

@@ -4,6 +4,7 @@ use secrecy::ExposeSecret;
 use serde::{Deserialize, Serialize};
 use sos_account::Account;
 use sos_backend::AccessPoint;
+use sos_client_storage::ClientFolderStorage;
 use sos_password::generator::measure_entropy;
 use sos_vault::{
     secret::{Secret, SecretId, SecretType},
@@ -48,7 +49,7 @@ where
         let storage = account.storage().await;
         let reader = storage.read().await;
 
-        let folder = reader.cache().get(target.id()).unwrap();
+        let folder = reader.folders().get(target.id()).unwrap();
         let keeper = folder.keeper();
 
         let vault = keeper.vault();

crates/security_report/src/lib.rs

@@ -9,7 +9,7 @@ use crate::{
 use clap::Subcommand;
 use hex;
 use sos_account::{Account, FolderCreate};
-use sos_client_storage::ClientAccountStorage;
+use sos_client_storage::{ClientAccountStorage, ClientFolderStorage};
 use sos_core::events::LogEvent;
 use sos_sdk::{events::EventLog, identity::AccountRef, vault::FolderRef};
 
@@ -275,7 +275,7 @@ pub async fn run(cmd: Command) -> Result<()> {
                 owner.selected_account().ok_or(Error::NoSelectedAccount)?;
             let storage = owner.storage().await;
             let reader = storage.read().await;
-            if let Some(folder) = reader.cache().get(summary.id()) {
+            if let Some(folder) = reader.folders().get(summary.id()) {
                 let event_log = folder.event_log();
                 let event_log = event_log.read().await;
                 let tree = event_log.tree();

crates/sos/src/commands/folder.rs

@@ -4,7 +4,7 @@ use crate::{
 };
 use clap::Subcommand;
 use sos_account::Account;
-use sos_backend::StorageError;
+use sos_client_storage::ClientFolderStorage;
 use sos_core::{
     commit::{CommitState, CommitTree, Comparison},
     Origin,
@@ -206,7 +206,7 @@ async fn print_status(
         let id = folder.id();
         let storage = owner.storage().await;
         let storage = storage.read().await;
-        let disc_folder = storage.cache().get(id).unwrap();
+        let disc_folder = storage.folders().get(id).unwrap();
         let log = disc_folder.event_log();
         let log = log.read().await;
         if let (Some(local_folder), Some(remote_folder)) =

crates/sos/src/commands/sync.rs

@@ -6,7 +6,7 @@ use crate::{
 };
 use clap::Subcommand;
 use sos_account::{Account, FolderCreate};
-use sos_client_storage::NewFolderOptions;
+use sos_client_storage::{ClientFolderStorage, NewFolderOptions};
 use sos_migrate::{export_authenticator, import_authenticator};
 use sos_sdk::prelude::{AccountRef, VaultFlags};
 use std::path::PathBuf;
@@ -59,7 +59,7 @@ pub async fn run(cmd: Command) -> Result<()> {
 
             let storage = owner.storage().await;
             let storage = storage.read().await;
-            let folder = storage.cache().get(authenticator.id()).unwrap();
+            let folder = storage.folders().get(authenticator.id()).unwrap();
 
             export_authenticator(file, folder.keeper(), qr_codes).await?;
             success("authenticator TOTP secrets exported");
@@ -108,7 +108,7 @@ pub async fn run(cmd: Command) -> Result<()> {
                 let storage = owner.storage().await;
                 let mut storage = storage.write().await;
                 let folder =
-                    storage.cache_mut().get_mut(folder.id()).unwrap();
+                    storage.folders_mut().get_mut(folder.id()).unwrap();
                 import_authenticator(file, folder.keeper_mut()).await?;
                 success("authenticator TOTP secrets imported");
             }