From 8e633809b4ce96e42f22f14a550d36dfcbb84c31 Mon Sep 17 00:00:00 2001
From: bitful-pannul <bitful-pancreas@protonmail.com>
Date: Tue, 26 Dec 2023 11:39:53 -0300
Subject: [PATCH] kv & sqlite: move files into vfs

---
 src/kv.rs     | 18 +++++++++---------
 src/sqlite.rs | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/kv.rs b/src/kv.rs
index 9000f32d..0e0b5791 100644
--- a/src/kv.rs
+++ b/src/kv.rs
@@ -17,9 +17,9 @@ pub async fn kv(
     send_to_caps_oracle: CapMessageSender,
     home_directory_path: String,
 ) -> anyhow::Result<()> {
-    let kv_path = format!("{}/kv", &home_directory_path);
+    let vfs_path = format!("{}/vfs", &home_directory_path);
 
-    if let Err(e) = fs::create_dir_all(&kv_path).await {
+    if let Err(e) = fs::create_dir_all(&vfs_path).await {
         panic!("failed creating kv dir! {:?}", e);
     }
 
@@ -59,7 +59,7 @@ pub async fn kv(
                 let send_to_loop = send_to_loop.clone();
                 let open_kvs = open_kvs.clone();
                 let txs = txs.clone();
-                let kv_path = kv_path.clone();
+                let vfs_path = vfs_path.clone();
 
                 tokio::spawn(async move {
                     let mut queue_lock = queue.lock().await;
@@ -72,7 +72,7 @@ pub async fn kv(
                             send_to_loop.clone(),
                             send_to_terminal.clone(),
                             send_to_caps_oracle.clone(),
-                            kv_path.clone(),
+                            vfs_path.clone(),
                         )
                         .await
                         {
@@ -95,7 +95,7 @@ async fn handle_request(
     send_to_loop: MessageSender,
     send_to_terminal: PrintSender,
     send_to_caps_oracle: CapMessageSender,
-    kv_path: String,
+    vfs_path: String,
 ) -> Result<(), KvError> {
     let KernelMessage {
         id,
@@ -132,7 +132,7 @@ async fn handle_request(
         open_kvs.clone(),
         send_to_caps_oracle.clone(),
         &request,
-        kv_path.clone(),
+        vfs_path.clone(),
     )
     .await?;
 
@@ -325,7 +325,7 @@ async fn check_caps(
     open_kvs: Arc<DashMap<(PackageId, String), OptimisticTransactionDB>>,
     mut send_to_caps_oracle: CapMessageSender,
     request: &KvRequest,
-    kv_path: String,
+    vfs_path: String,
 ) -> Result<(), KvError> {
     let (send_cap_bool, recv_cap_bool) = tokio::sync::oneshot::channel();
     let src_package_id = PackageId::new(source.process.package(), source.process.publisher());
@@ -415,8 +415,8 @@ async fn check_caps(
             }
 
             let db_path = format!(
-                "{}/{}/{}",
-                kv_path,
+                "{}/{}/kv/{}",
+                vfs_path,
                 request.package_id.to_string(),
                 request.db.to_string()
             );
diff --git a/src/sqlite.rs b/src/sqlite.rs
index 220e93cf..27090944 100644
--- a/src/sqlite.rs
+++ b/src/sqlite.rs
@@ -37,9 +37,9 @@ pub async fn sqlite(
     send_to_caps_oracle: CapMessageSender,
     home_directory_path: String,
 ) -> anyhow::Result<()> {
-    let sqlite_path = format!("{}/sqlite", &home_directory_path);
+    let vfs_path = format!("{}/vfs", &home_directory_path);
 
-    if let Err(e) = fs::create_dir_all(&sqlite_path).await {
+    if let Err(e) = fs::create_dir_all(&vfs_path).await {
         panic!("failed creating sqlite dir! {:?}", e);
     }
 
@@ -79,7 +79,7 @@ pub async fn sqlite(
                 let open_dbs = open_dbs.clone();
 
                 let txs = txs.clone();
-                let sqlite_path = sqlite_path.clone();
+                let vfs_path = vfs_path.clone();
 
                 tokio::spawn(async move {
                     let mut queue_lock = queue.lock().await;
@@ -92,7 +92,7 @@ pub async fn sqlite(
                             send_to_loop.clone(),
                             send_to_terminal.clone(),
                             send_to_caps_oracle.clone(),
-                            sqlite_path.clone(),
+                            vfs_path.clone(),
                         )
                         .await
                         {
@@ -115,7 +115,7 @@ async fn handle_request(
     send_to_loop: MessageSender,
     send_to_terminal: PrintSender,
     send_to_caps_oracle: CapMessageSender,
-    sqlite_path: String,
+    vfs_path: String,
 ) -> Result<(), SqliteError> {
     let KernelMessage {
         id,
@@ -152,7 +152,7 @@ async fn handle_request(
         open_dbs.clone(),
         send_to_caps_oracle.clone(),
         &request,
-        sqlite_path.clone(),
+        vfs_path.clone(),
     )
     .await?;
 
@@ -342,7 +342,7 @@ async fn check_caps(
     open_dbs: Arc<DashMap<(PackageId, String), Mutex<Connection>>>,
     mut send_to_caps_oracle: CapMessageSender,
     request: &SqliteRequest,
-    sqlite_path: String,
+    vfs_path: String,
 ) -> Result<(), SqliteError> {
     let (send_cap_bool, recv_cap_bool) = tokio::sync::oneshot::channel();
     let src_package_id = PackageId::new(source.process.package(), source.process.publisher());
@@ -429,8 +429,8 @@ async fn check_caps(
             }
 
             let db_path = format!(
-                "{}/{}/{}",
-                sqlite_path,
+                "{}/{}/sqlite/{}",
+                vfs_path,
                 request.package_id.to_string(),
                 request.db.to_string()
             );