fs, File and Path API

examples/file_layer.rs

@@ -5,7 +5,7 @@ use std::path::Path;
 use std::str::FromStr;
 use tokio::io::{AsyncReadExt, AsyncSeekExt, AsyncWriteExt};
 // use tokio::fs::OpenOptions;
-use rencfs::crypto::fs::OpenOptions;
+use rencfs::crypto::fs_api::r#async::fs::OpenOptions;
 use rencfs::encryptedfs::PasswordProvider;
 
 static ROOT_CIPHER_FS_DATA_DIR: &str = "/tmp/rencfs/file_layer/fs_cipher";

examples/filesystem_dbg.rs

@@ -1,13 +1,12 @@
 #![allow(dead_code)]
 
-use rencfs::crypto::fs::OpenOptions;
+use rencfs::crypto::fs_api::r#async::fs::OpenOptions;
 use rencfs::crypto::Cipher;
 use rencfs::encryptedfs::{
     CreateFileAttr, EncryptedFs, FileType, FsError, FsResult, PasswordProvider,
 };
 use shush_rs::SecretString;
 use std::io::SeekFrom;
-use std::path::Path;
 use std::str::FromStr;
 use tokio::io::{AsyncBufReadExt, AsyncSeekExt, AsyncWriteExt};
 
@@ -20,7 +19,6 @@ use std::sync::Arc;
 async fn main() -> anyhow::Result<()> {
     init_fs().await?;
     let fs = get_fs().await?;
-
     {
         let mut opened_file1 = OpenOptions::new()
             .write(true)
@@ -34,9 +32,7 @@ async fn main() -> anyhow::Result<()> {
         fs.release(opened_file1.context.fh_write).await?;
         opened_file1.seek(SeekFrom::Start(0)).await?;
     }
-
     let opened_file1 = OpenOptions::new().read(true).open(FILENAME).await?;
-
     let reader = tokio::io::BufReader::new(opened_file1);
     let mut lines = reader.lines();
     while let Some(line) = lines.next_line().await? {
@@ -48,7 +44,7 @@ async fn main() -> anyhow::Result<()> {
 
 async fn init_fs() -> anyhow::Result<()> {
     OpenOptions::init_scope(
-        Path::new(ROOT_CIPHER_FS_DATA_DIR).to_path_buf(),
+        std::path::Path::new(ROOT_CIPHER_FS_DATA_DIR).to_path_buf(),
         Box::new(PasswordProviderImpl {}),
         Cipher::ChaCha20Poly1305,
         false,
@@ -57,7 +53,7 @@ async fn init_fs() -> anyhow::Result<()> {
     Ok(())
 }
 
-fn _add_create<'a>(opts: &'a mut OpenOptions, path: &Path) -> &'a mut OpenOptions {
+fn _add_create<'a>(opts: &'a mut OpenOptions, path: &std::path::Path) -> &'a mut OpenOptions {
     if !path.to_path_buf().exists() {
         opts.create(true);
     }
@@ -66,7 +62,7 @@ fn _add_create<'a>(opts: &'a mut OpenOptions, path: &Path) -> &'a mut OpenOption
 
 async fn cleanup() {
     // todo: ignore if we delete first time when not present
-    let _ = tokio::fs::remove_dir_all(Path::new(ROOT_CIPHER_FS_DATA_DIR)).await;
+    let _ = tokio::fs::remove_dir_all(std::path::Path::new(ROOT_CIPHER_FS_DATA_DIR)).await;
 
     // todo: seems we need to abstract also Path because exists() goes against local FS
     // if file_path.exists() {

src/crypto.rs

@@ -28,7 +28,7 @@ use crate::encryptedfs::FsResult;
 use crate::{fs_util, stream_util};
 
 pub mod buf_mut;
-pub mod fs;
+pub mod fs_api;
 pub mod read;
 pub mod write;
 

src/crypto/fs_api.rs

@@ -0,0 +1,2 @@
+pub mod r#async;
+pub mod path;

src/crypto/fs_api/async.rs

@@ -0,0 +1 @@
+pub mod fs;