@anysphere/file-service 0.0.0-dbd43428 → 0.0.0-e3fdf62d

package/Cargo.toml

@@ -17,9 +17,6 @@ tempfile = "3.8.0"
 anyhow = "1.0.75"
 tonic = "0.9.2"
 prost = "0.11.9"
-tracing = "0.1.37"
-tracing-subscriber = "0.3.17"
-tracing-appender = "0.2.2"
 
 [build-dependencies]
 napi-build = "2.0.1"

package/index.d.ts

@@ -6,15 +6,11 @@
 export class MerkleClient {
   constructor(rootDirectory: string)
   init(): Promise<void>
-  computeMerkleTree(): Promise<void>
   updateFile(filePath: string): Promise<void>
   deleteFile(filePath: string): Promise<void>
-  getSubtreeHash(relativePath: string): Promise<string>
+  getSubtreeHash(path: string): Promise<string>
   getNumEmbeddableFiles(): Promise<number>
   getAllFiles(): Promise<Array<string>>
-  getAllDirFilesToEmbed(absoluteFilePath: string): Promise<Array<string>>
   getNextFileToEmbed(): Promise<Array<string>>
-  getSpline(absoluteFilePath: string): Promise<Array<string>>
   getHashesForFiles(files: Array<string>): Promise<Array<string>>
-  updateRootDirectory(rootDirectory: string): void
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anysphere/file-service",
-  "version": "0.0.0-dbd43428",
+  "version": "0.0.0-e3fdf62d",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {
@@ -35,11 +35,11 @@
     "version": "napi version"
   },
   "optionalDependencies": {
-    "@anysphere/file-service-win32-x64-msvc": "0.0.0-dbd43428",
-    "@anysphere/file-service-darwin-x64": "0.0.0-dbd43428",
-    "@anysphere/file-service-linux-x64-gnu": "0.0.0-dbd43428",
-    "@anysphere/file-service-darwin-arm64": "0.0.0-dbd43428",
-    "@anysphere/file-service-win32-arm64-msvc": "0.0.0-dbd43428",
-    "@anysphere/file-service-darwin-universal": "0.0.0-dbd43428"
+    "@anysphere/file-service-win32-x64-msvc": "0.0.0-e3fdf62d",
+    "@anysphere/file-service-darwin-x64": "0.0.0-e3fdf62d",
+    "@anysphere/file-service-linux-x64-gnu": "0.0.0-e3fdf62d",
+    "@anysphere/file-service-darwin-arm64": "0.0.0-e3fdf62d",
+    "@anysphere/file-service-win32-arm64-msvc": "0.0.0-e3fdf62d",
+    "@anysphere/file-service-darwin-universal": "0.0.0-e3fdf62d"
   }
 }

package/src/file_utils.rs

@@ -12,8 +12,9 @@ pub fn is_in_bad_dir(file_path: &Path) -> Result<bool, Error> {
   let item_path = file_path
     .to_str()
     .ok_or(anyhow::anyhow!("Failed to convert path to string"))?;
-  let is_bad_dir =
-    item_path.contains("node_modules") || item_path.contains(".git");
+  let is_bad_dir = (item_path.contains("node_modules")
+    || item_path.contains(".git"))
+    && !(item_path.ends_with(".git") || item_path.ends_with("node_modules"));
   Ok(is_bad_dir)
 }
 
@@ -37,14 +38,14 @@ pub fn is_good_file(file_path: &Path) -> Result<(), Error> {
 
   match file_name {
     "package-lock.json" | "pnpm-lock.yaml" | "yarn.lock" | "composer.lock"
-    | "Gemfile.lock" | "bun.lockb" => {
+    | "Gemfile.lock" => {
       return Err(anyhow::anyhow!("File is just a lock file"));
     }
     _ => {}
   }
 
   match extension {
-    "lock" | "bak" | "tmp" | "bin" | "exe" | "dll" | "so" | "lockb" => {
+    "lock" | "bak" | "tmp" | "bin" | "exe" | "dll" | "so" => {
       return Err(anyhow::anyhow!("File is just a lock file"));
     }
     _ => {}

package/src/git_utils.rs

@@ -1,10 +1,10 @@
 use std::collections::HashSet;
+use std::path::PathBuf;
 use std::process::Command;
 
 pub fn list_ignored_files(
   workspace_root_path: &str,
-  should_return_absolute_paths: bool,
-) -> Result<HashSet<String>, Box<dyn std::error::Error>> {
+) -> Result<HashSet<PathBuf>, Box<dyn std::error::Error>> {
   let mut gitignored_files = HashSet::new();
 
   let commands = vec![
@@ -15,66 +15,12 @@ pub fn list_ignored_files(
       "--ignored",
       "--exclude-standard",
     ],
-    // FIXME(sualeh): this is super sketchy and might totally break in like a bazillion ways. i dont like it.
-    vec![
-      "sh",
-      "-c",
-      "git submodule foreach --quiet 'git ls-files --others --ignored --exclude-standard | sed \"s|^|$path/|\"'",
-    ],
-  ];
-
-  for command in commands {
-    let output = Command::new(&command[0])
-      .args(&command[1..])
-      .current_dir(workspace_root_path)
-      .output()?;
-
-    if output.status.success() {
-      let files = String::from_utf8(output.stdout)?
-        .lines()
-        .filter(|line| !line.is_empty())
-        .map(|line| {
-          if should_return_absolute_paths {
-            let mut path = std::path::PathBuf::from(workspace_root_path);
-            path.push(line);
-
-            match path.canonicalize() {
-              Ok(canonical_path) => {
-                canonical_path.to_string_lossy().into_owned()
-              }
-              Err(_) => String::from(line),
-            }
-          } else {
-            String::from(line)
-          }
-        })
-        .collect::<HashSet<_>>();
-
-      gitignored_files.extend(files);
-    }
-  }
-
-  Ok(gitignored_files)
-}
-
-pub fn list_ignored_files_with_absolute_paths(
-  workspace_root_path: &str,
-) -> Result<HashSet<String>, Box<dyn std::error::Error>> {
-  let mut gitignored_files = HashSet::new();
-
-  let commands = vec![
     vec![
       "git",
-      "ls-files",
-      "--others",
-      "--ignored",
-      "--exclude-standard",
-    ],
-    // FIXME(sualeh): this is super sketchy and might totally break in like a bazillion ways. i dont like it.
-    vec![
-      "sh",
-      "-c",
-      "git submodule foreach --quiet 'git ls-files --others --ignored --exclude-standard | sed \"s|^|$path/|\"'",
+      "submodule",
+      "foreach",
+      "--quiet",
+      "git ls-files --others --ignored --exclude-standard | sed 's|^|$path/|'",
     ],
   ];
 
@@ -88,7 +34,7 @@ pub fn list_ignored_files_with_absolute_paths(
       let files = String::from_utf8(output.stdout)?
         .lines()
         .filter(|line| !line.is_empty())
-        .map(|line| String::from(line))
+        .map(|line| PathBuf::from(line))
         .collect::<HashSet<_>>();
 
       gitignored_files.extend(files);
@@ -111,18 +57,6 @@ pub async fn is_git_ignored(
   Ok(output.status.success())
 }
 
-pub async fn is_git_directory(
-  workspace_root_path: &str,
-) -> Result<bool, anyhow::Error> {
-  let output = tokio::process::Command::new("git")
-    .args(&["rev-parse", "--is-inside-work-tree"])
-    .current_dir(workspace_root_path)
-    .output()
-    .await?;
-
-  Ok(output.status.success())
-}
-
 #[cfg(test)]
 mod tests {
   use super::*;
@@ -132,8 +66,7 @@ mod tests {
   #[test]
   fn test_no_ignored_files() {
     let dir = tempfile::tempdir().unwrap();
-    let gitignored_files =
-      list_ignored_files(dir.path().to_str().unwrap(), false).unwrap();
+    let gitignored_files = list_ignored_files(dir.path().to_str().unwrap()).unwrap();
     Command::new("git")
       .args(&["init"])
       .current_dir(dir.path())
@@ -159,14 +92,13 @@ mod tests {
       .current_dir(dir.path())
       .output()
       .unwrap();
-    let gitignored_files =
-      list_ignored_files(dir.path().to_str().unwrap(), false).unwrap();
+    let gitignored_files = list_ignored_files(dir.path().to_str().unwrap()).unwrap();
     println!(
       "ignored files for test_one_ignored_file: {:?}",
       gitignored_files
     );
     // assert_eq!(gitignored_files.len(), 1);
-    assert!(gitignored_files.contains(&String::from("ignored.txt")));
+    assert!(gitignored_files.contains(&PathBuf::from("ignored.txt")));
   }
 
   #[test]
@@ -189,83 +121,19 @@ mod tests {
       .current_dir(dir.path())
       .output()
       .unwrap();
-    let gitignored_files =
-      list_ignored_files(dir.path().to_str().unwrap(), false).unwrap();
+    let gitignored_files = list_ignored_files(dir.path().to_str().unwrap()).unwrap();
     println!(
       "ignored files for test_multiple_ignored_files: {:?}",
       gitignored_files
     );
     // assert_eq!(gitignored_files.len(), 2);
-    assert!(gitignored_files.contains(&String::from("ignored1.txt")));
-    assert!(gitignored_files.contains(&String::from("ignored2.txt")));
-  }
-
-  #[test]
-  fn test_git_submodule_ignored_files() {
-    let dir = tempfile::tempdir().unwrap();
-    let submodule_path = dir.path().join("submodule");
-    std::fs::create_dir(&submodule_path).unwrap();
-
-    let o = Command::new("git")
-      .args(&["init"])
-      .current_dir(&submodule_path)
-      .output()
-      .unwrap();
-    println!("git init output: {:?}", o);
-
-    let file_path = submodule_path.join("ignored.txt");
-    let mut file = File::create(&file_path).unwrap();
-    writeln!(file, "This is an ignored file.").unwrap();
-
-    let file2 = submodule_path.join("ignored2.txt");
-    let mut file = File::create(&file2).unwrap();
-    writeln!(file, "This is another ignored file.").unwrap();
-
-    let gitignore_path = submodule_path.join(".gitignore");
-    let mut gitignore = File::create(&gitignore_path).unwrap();
-    writeln!(gitignore, "*.txt").unwrap();
-
-    let o = Command::new("git")
-      .args(&["init"])
-      .current_dir(dir.path())
-      .output()
-      .unwrap();
-    println!("git init output: {:?}", o);
-
-    // make a commit in the submodule
-    let o = Command::new("git")
-      .args(&["add", "."])
-      .current_dir(&submodule_path)
-      .output()
-      .unwrap();
-    println!("git add output: {:?}", o);
-    let o = Command::new("git")
-      .args(&["commit", "-m", "initial commit"])
-      .current_dir(&submodule_path)
-      .output()
-      .unwrap();
-    println!("git commit output: {:?}", o);
-
-    let o = Command::new("git")
-      .args(&["submodule", "add", "./submodule"])
-      .current_dir(dir.path())
-      .output()
-      .unwrap();
-    println!("git submodule add output: {:?}", o);
-
-    let gitignored_files =
-      list_ignored_files(dir.path().to_str().unwrap(), false).unwrap();
-    println!(
-      "ignored files for test_git_submodule_ignored_files: {:?}",
-      gitignored_files
-    );
-    assert!(gitignored_files.contains(&String::from("submodule/ignored.txt")));
-    assert!(gitignored_files.contains(&String::from("submodule/ignored2.txt")));
+    assert!(gitignored_files.contains(&PathBuf::from("ignored1.txt")));
+    assert!(gitignored_files.contains(&PathBuf::from("ignored2.txt")));
   }
 
   #[test]
   fn test_multiple_ignored_files_in_current_dir() {
-    let gitignored_files = list_ignored_files(".", false).unwrap();
+    let gitignored_files = list_ignored_files(".").unwrap();
     assert!(gitignored_files.len() > 1);
 
     // print a sample of the ignored files
@@ -279,6 +147,7 @@ mod tests {
     }
   }
 
+
   #[tokio::test]
   async fn test_file_not_ignored() {
     let dir = tempfile::tempdir().unwrap();
@@ -291,10 +160,7 @@ mod tests {
       .current_dir(dir.path())
       .output()
       .unwrap();
-    let is_ignored =
-      is_git_ignored(dir.path().to_str().unwrap(), "not_ignored.txt")
-        .await
-        .unwrap();
+    let is_ignored = is_git_ignored(dir.path().to_str().unwrap(), "not_ignored.txt").await.unwrap();
     assert_eq!(is_ignored, false);
   }
 
@@ -314,10 +180,7 @@ mod tests {
       .current_dir(dir.path())
       .output()
       .unwrap();
-    let is_ignored =
-      is_git_ignored(dir.path().to_str().unwrap(), "ignored.txt")
-        .await
-        .unwrap();
+    let is_ignored = is_git_ignored(dir.path().to_str().unwrap(), "ignored.txt").await.unwrap();
     assert_eq!(is_ignored, true);
   }
 
@@ -337,10 +200,8 @@ mod tests {
       .current_dir(dir.path())
       .output()
       .unwrap();
-    let is_ignored =
-      is_git_ignored(dir.path().to_str().unwrap(), "ignored.txt")
-        .await
-        .unwrap();
+    let is_ignored = is_git_ignored(dir.path().to_str().unwrap(), "ignored.txt").await.unwrap();
     assert_eq!(is_ignored, true);
   }
+
 }

package/src/lib.rs

@@ -1,5 +1,4 @@
 #![deny(clippy::all)]
-#![deny(unsafe_op_in_unsafe_fn)]
 pub mod file_utils;
 pub mod git_utils;
 pub mod merkle_tree;
@@ -7,9 +6,6 @@ pub mod merkle_tree;
 use std::vec;
 
 use merkle_tree::{LocalConstruction, MerkleTree};
-use tracing::{info, Level};
-use tracing_appender::rolling::{RollingFileAppender, Rotation};
-use tracing_subscriber::fmt;
 
 #[macro_use]
 extern crate napi_derive;
@@ -18,35 +14,15 @@ extern crate napi_derive;
 pub struct MerkleClient {
   tree: MerkleTree,
   root_directory: String,
-  _guard: tracing_appender::non_blocking::WorkerGuard,
-}
-
-pub fn init_logger() -> tracing_appender::non_blocking::WorkerGuard {
-  let file_appender =
-    RollingFileAppender::new(Rotation::NEVER, "./", "rust_log.txt");
-  let (non_blocking, _guard) = tracing_appender::non_blocking(file_appender);
-  let subscriber = fmt::Subscriber::builder()
-    .with_max_level(Level::TRACE)
-    .with_writer(non_blocking)
-    .with_ansi(false)
-    .with_line_number(true)
-    .finish();
-
-  let _ = tracing::subscriber::set_global_default(subscriber);
-
-  _guard
 }
 
 #[napi]
 impl MerkleClient {
   #[napi(constructor)]
   pub fn new(root_directory: String) -> MerkleClient {
-    let _guard = init_logger();
-
     MerkleClient {
       tree: MerkleTree::empty_tree(),
       root_directory,
-      _guard,
     }
   }
 
@@ -55,9 +31,7 @@ impl MerkleClient {
     // 1. compute the merkle tree
     // 2. update the backend
     // 3. sync with the remote
-    unsafe {
-      self.compute_merkle_tree().await?;
-    }
+    self.compute_merkle_tree().await?;
 
     Ok(())
   }
@@ -66,24 +40,13 @@ impl MerkleClient {
     unimplemented!("Interrupt is not implemented yet");
   }
 
-  #[napi]
+  // #[napi]
   pub async unsafe fn compute_merkle_tree(
     &mut self,
   ) -> Result<(), napi::Error> {
     let t =
       MerkleTree::construct_merkle_tree(self.root_directory.clone()).await;
 
-    let files = self.tree.get_all_files().await;
-
-    match files {
-      Ok(files) => {
-        info!("files: {:?}", files);
-      }
-      Err(e) => {
-        info!("Error in get_all_files: {:?}", e);
-      }
-    }
-
     match t {
       Ok(tree) => {
         self.tree = tree;
@@ -109,15 +72,9 @@ impl MerkleClient {
   #[napi]
   pub async fn get_subtree_hash(
     &self,
-    relative_path: String,
+    path: String,
   ) -> Result<String, napi::Error> {
-    info!("relative_path: {:?}", relative_path);
-    let absolute_path =
-      std::path::Path::new(&self.root_directory).join(relative_path);
-    let canonical_path = absolute_path.canonicalize().unwrap();
-
-    info!("canonical_path: {:?}", canonical_path);
-    let hash = self.tree.get_subtree_hash(canonical_path).await;
+    let hash = self.tree.get_subtree_hash(path).await;
 
     match hash {
       Ok(hash) => Ok(hash),
@@ -141,28 +98,6 @@ impl MerkleClient {
     }
   }
 
-  pub async fn get_num_embeddable_files_in_subtree(
-    &self,
-    relative_path: String,
-  ) -> Result<i32, napi::Error> {
-    let absolute_path = std::path::Path::new(&self.root_directory)
-      .join(relative_path)
-      .canonicalize()?;
-
-    let num = self
-      .tree
-      .get_num_embeddable_files_in_subtree(absolute_path)
-      .await;
-
-    match num {
-      Ok(num) => Ok(num),
-      Err(e) => Err(napi::Error::new(
-        napi::Status::Unknown,
-        format!("Error in get_num_embeddable_files_in_subtree: {:?}", e),
-      )),
-    }
-  }
-
   #[napi]
   pub async fn get_all_files(&self) -> Result<Vec<String>, napi::Error> {
     let files = self.tree.get_all_files().await;
@@ -176,26 +111,6 @@ impl MerkleClient {
     }
   }
 
-  #[napi]
-  pub async fn get_all_dir_files_to_embed(
-    &self,
-    absolute_file_path: String,
-  ) -> Result<Vec<String>, napi::Error> {
-    let absolute_path_str = absolute_file_path.as_str();
-    let files = self
-      .tree
-      .get_all_dir_files_to_embed(absolute_path_str)
-      .await;
-
-    match files {
-      Ok(files) => Ok(files),
-      Err(e) => Err(napi::Error::new(
-        napi::Status::Unknown,
-        format!("Error in get_all_dir_files_to_embed: {:?}", e),
-      )),
-    }
-  }
-
   #[napi]
   pub async unsafe fn get_next_file_to_embed(
     &mut self,
@@ -209,10 +124,7 @@ impl MerkleClient {
         // TODO(sualeh): we should assert that the path is ascending up to the path.
 
         let ret = vec![file];
-        info!("file: {:?}", ret);
-
         let ret = ret.into_iter().chain(path.into_iter()).collect::<Vec<_>>();
-        info!("ret to js: {:?}", ret);
 
         Ok(ret)
       }
@@ -223,24 +135,6 @@ impl MerkleClient {
     }
   }
 
-  // FIXME(sualeh): get_spline
-  #[napi]
-  pub async fn get_spline(
-    &self,
-    absolute_file_path: String,
-  ) -> Result<Vec<String>, napi::Error> {
-    let absolute_path_str = absolute_file_path.as_str();
-    let spline = self.tree.get_spline(absolute_path_str).await;
-
-    match spline {
-      Ok(spline) => Ok(spline),
-      Err(e) => Err(napi::Error::new(
-        napi::Status::Unknown,
-        format!("Error in get_spline: {:?}", e),
-      )),
-    }
-  }
-
   #[napi]
   pub async fn get_hashes_for_files(
     &self,
@@ -257,7 +151,7 @@ impl MerkleClient {
     }
   }
 
-  #[napi]
+  // #[napi]
   pub fn update_root_directory(&mut self, root_directory: String) {
     self.root_directory = root_directory;
   }

package/src/merkle_tree/local_construction.rs

@@ -1,11 +1,10 @@
-use crate::git_utils;
 use crate::merkle_tree::{
   File, MerkleNode, MerkleNodePtr, NodeType, PinnedFuture,
 };
 
 use super::{LocalConstruction, MerkleTree};
-use std::collections::{BTreeMap, HashSet};
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
+use std::{collections::HashMap, path::Path, sync::Arc};
 use tonic::async_trait;
 
 #[async_trait]
@@ -29,45 +28,27 @@ impl LocalConstruction for MerkleTree {
   /// 3. construct merkle tree
   /// 4. return merkle tree
   async fn construct_merkle_tree(
-    absolute_path_to_root_directory: String,
+    root_directory: String,
   ) -> Result<MerkleTree, anyhow::Error> {
-    let path = PathBuf::from(absolute_path_to_root_directory.clone());
+    let path = PathBuf::from(root_directory.clone());
     if !path.exists() {
       // FIXME: we should report this via a good logger.
       panic!("Root directory does not exist!");
     }
 
-    // 1. get all the gitignored files
-    let git_ignored_files = match git_utils::list_ignored_files(
-      absolute_path_to_root_directory.as_str(),
-      true,
-    ) {
-      Ok(git_ignored) => git_ignored,
-      Err(_e) => HashSet::new(),
-    };
-
-    tracing::info!("git_ignored_files: {:?}", git_ignored_files);
-
-    let root_node = MerkleNode::new(
-      path,
-      None,
-      &git_ignored_files,
-      absolute_path_to_root_directory.as_str(),
-    )
-    .await;
+    let root_node = MerkleNode::new(path, None).await;
     let mut mt = MerkleTree {
       root: root_node,
-      files: BTreeMap::new(),
-      root_path: absolute_path_to_root_directory,
+      files: HashMap::new(),
+      root_path: root_directory,
       cursor: None,
-      git_ignored_files,
     };
 
     // we now iterate over all the nodes and add them to the hashmap
     // TODO(later): i can make this parallel.
     fn add_nodes_to_hashmap<'a>(
       node: &'a MerkleNodePtr,
-      files: &'a mut BTreeMap<String, File>,
+      files: &'a mut HashMap<String, File>,
     ) -> PinnedFuture<'a, ()> {
       Box::pin(async move {
         let node_reader = node.read().await;

package/src/merkle_tree/mod.rs

@@ -1,13 +1,9 @@
-use crate::git_utils;
-
 use super::file_utils;
 use sha2::Digest;
-use std::collections::{BTreeMap, HashSet};
 use std::path::PathBuf;
-use std::{fs, path::Path, sync::Arc};
+use std::{collections::HashMap, fs, path::Path, sync::Arc};
 use tokio::sync::RwLock;
 use tonic::async_trait;
-use tracing::info;
 pub mod local_construction;
 pub mod test;
 
@@ -16,9 +12,8 @@ pub type MerkleNodePtr = Arc<RwLock<MerkleNode>>;
 pub struct MerkleTree {
   root_path: String,
   root: MerkleNodePtr,
-  files: BTreeMap<String, File>,
-  cursor: Option<usize>,
-  git_ignored_files: HashSet<String>,
+  files: HashMap<String, File>,
+  cursor: Option<MerkleNodePtr>,
 }
 
 #[derive(Debug)]
@@ -92,27 +87,18 @@ impl MerkleTree {
   pub fn empty_tree() -> MerkleTree {
     MerkleTree {
       root: Arc::new(RwLock::new(MerkleNode::empty_node(None, None))),
-      files: BTreeMap::new(),
+      files: HashMap::new(),
       root_path: "".to_string(),
       cursor: None,
-      git_ignored_files: HashSet::new(),
     }
   }
 
   pub async fn get_subtree_hash(
     &self,
-    absolute_path: PathBuf,
+    path: String,
   ) -> Result<String, anyhow::Error> {
-    let abs_string = match absolute_path.to_str() {
-      Some(s) => s.to_string(),
-      None => {
-        return Err(anyhow::anyhow!(
-          "get_subtree_hash: Failed to convert path to string"
-        ))
-      }
-    };
-
-    let node = match self.files.get(&abs_string) {
+    let path = PathBuf::from(path);
+    let node = match self.files.get(path.to_str().unwrap()) {
       Some(file) => file.node.clone(),
       None => {
         return Err(anyhow::anyhow!("Could not find file in tree!"));
@@ -146,43 +132,6 @@ impl MerkleTree {
     Ok(count)
   }
 
-  pub async fn get_num_embeddable_files_in_subtree(
-    &self,
-    absolute_path: PathBuf,
-  ) -> Result<i32, anyhow::Error> {
-    let mut count = 0;
-
-    let absolute_path = match absolute_path.to_str() {
-      Some(s) => s.to_string(),
-      None => {
-        return Err(anyhow::anyhow!(
-        "get_num_embeddable_files_in_subtree: Failed to convert path to string"
-      ))
-      }
-    };
-
-    // TODO(sualeh): worth keeping this list sorted. its now a btree
-
-    for (_, file) in &self.files {
-      let file_reader = file.node.read().await;
-      match &file_reader.node_type {
-        NodeType::File(file_name) => {
-          if file_name.contains(&absolute_path) {
-            count += 1;
-          }
-        }
-        NodeType::Branch(_) => {
-          continue;
-        }
-        NodeType::ErrorNode(_) => {
-          continue;
-        }
-      }
-    }
-
-    Ok(count)
-  }
-
   pub async fn get_all_files(&self) -> Result<Vec<String>, anyhow::Error> {
     let mut files = Vec::new();
 
@@ -239,119 +188,83 @@ impl MerkleTree {
   pub async fn get_next_file_to_embed(
     &mut self,
   ) -> Result<(String, Vec<String>), anyhow::Error> {
-    // if the cursor is none, set it to 0
-    let cursor = match self.cursor {
-      Some(cursor) => cursor,
-      None => {
-        self.cursor = Some(0);
-        0
-      }
-    };
+    // the plan is to do an in-order traversal of the tree.
+
+    // first the edge case to deal with:
+    // cursor == None
+    if self.cursor.is_none() {
+      // If the root is a file, return its name.
+      if let NodeType::File(file_path) = &self.root.read().await.node_type {
+        return Ok((file_path.clone(), vec![]));
+      }
+
+      // if the path is not empty, we can iterate till we find the first child.
+      let mut potential_first_child = self.root.clone();
+      let mut is_branch = true;
+      let mut path = Vec::new();
+
+      while is_branch {
+        let node = {
+          let potential_first_child_reader = potential_first_child.read().await;
+          match &potential_first_child_reader.node_type {
+            NodeType::Branch(branch) => branch.clone(),
+            NodeType::File(_) => {
+              return Err(anyhow::anyhow!(
+                "get_next_file_to_embed: This should not happen! the branch happened to be file."
+              ));
+            }
+            NodeType::ErrorNode(_) => {
+              return Err(anyhow::anyhow!("Cursor is an error node!"));
+            }
+          }
+        };
 
-    // get the thing at the cursor. while we dont find a file, we keep incrementing the cursor.
-    let mut cursor = cursor;
-    loop {
-      // O(log n)
-      let file = match self.files.values().nth(cursor) {
-        Some(file) => file,
-        None => {
-          return Err(anyhow::anyhow!("Could not find file to embed!"));
-        }
-      };
+        let current_node_name = &node.0;
+        let child_list = &node.1;
 
-      let file_reader = file.node.read().await;
-      match &file_reader.node_type {
-        NodeType::File(f) => {
-          // update the cursor.
-          self.cursor = Some(cursor + 1);
-          let spline = self.get_spline(f).await?;
-          return Ok((f.clone(), spline));
-        }
-        NodeType::Branch(_) => {
-          cursor += 1;
-          continue;
-        }
-        NodeType::ErrorNode(_) => {
-          cursor += 1;
-          continue;
-        }
-      }
-    }
-  }
+        if let Some(c) = child_list.first() {
+          let c_reader = c.read().await;
 
-  pub async fn get_all_dir_files_to_embed(
-    &self,
-    absolute_path: &str,
-  ) -> Result<Vec<String>, anyhow::Error> {
-    let mut files = Vec::new();
+          match &c_reader.node_type {
+            NodeType::File(file_path) => {
+              // must set the cursor!
+              self.cursor = Some(c.clone());
 
-    for (file_path, f) in &self.files {
-      if !file_path.contains(absolute_path) {
-        continue;
-      }
+              return Ok((file_path.clone(), path));
+            }
+            NodeType::Branch(_) => {
+              potential_first_child = c.clone();
+              is_branch = true;
 
-      match f.node.read().await.node_type {
-        NodeType::File(_) => {
-          files.push(file_path.clone());
-        }
-        NodeType::Branch(_) => {
-          continue;
-        }
-        NodeType::ErrorNode(_) => {
-          continue;
+              // add the path to the current node.
+              path.push(current_node_name.clone());
+            }
+            NodeType::ErrorNode(_) => {
+              return Err(anyhow::anyhow!("Cursor is an error node!"));
+            }
+          }
+        } else {
+          // If the root has no children, return an error.
+          return Err(anyhow::anyhow!("Root has no children!"));
         }
       }
     }
 
-    Ok(files)
-  }
+    // THE DEFAULT CASE:
+    // we already have a cursor at a file.
 
-  // TODO(sualeh): i need tests for this!!
-  pub async fn get_spline(
-    &self,
-    absolute_path: &str,
-  ) -> Result<Vec<String>, anyhow::Error> {
-    info!("get_spline called with absolute_path: {}", absolute_path);
-    let mut files = Vec::new();
+    // UNWRAP checked and fine. see the none case above.
+    let cursor_name = self.cursor.as_ref().unwrap();
+    let cursor_reader = cursor_name.read().await;
 
-    let current_node = match self.files.get(absolute_path) {
-      Some(node) => {
-        info!("Found node for absolute_path: {}", absolute_path);
-        node.node.clone()
-      }
-      None => {
-        info!("File not found for absolute_path: {}", absolute_path);
-        return Err(anyhow::anyhow!("File not found: {}", absolute_path));
-      }
-    };
+    // invariant: you must be a file!!
 
-    let mut stack = Vec::new();
-    stack.push(current_node);
-
-    while let Some(node) = stack.pop() {
-      let parent = node.read().await.parent.clone();
-      if let Some(parent) = parent {
-        info!("Adding parent hash to files vector");
-        {
-          let parent_node = parent.read().await;
-          match &parent_node.node_type {
-            NodeType::File(file_name) => {
-              files.push(file_name.clone());
-            }
-            NodeType::Branch((branch_name, _)) => {
-              files.push(branch_name.clone());
-            }
-            _ => {
-              continue;
-            }
-          }
-        }
+    // everytime we get to a child list, we will add all the children to a fifo, and then pull from it as long as we need it.
 
-        stack.push(parent);
-      }
-    }
-    info!("Returning files vector with {} elements", files.len());
-    Ok(files)
+    // algorithm:
+    // 1.
+
+    Err(anyhow::anyhow!("Could not find file to embed!"))
   }
 
   /// creates a new node and attaches it to the current tree.
@@ -389,18 +302,12 @@ impl MerkleTree {
     // 1. the path is empty. this means that the ancestor is the root.
     // 2. the path is non-empty. that means there exist a non-empty element btwn till the root.
 
-    let absolute_root_path = self.root_path.clone();
     let new_node = match path.len() {
       0 => {
         // this means that the ancestor is the root.
         // we need to create a new node and attach it to the ancestor.
-        let new_node = MerkleNode::new(
-          file_path.clone(),
-          Some(ancestor.clone()),
-          &self.git_ignored_files,
-          &absolute_root_path.as_str(),
-        )
-        .await;
+        let new_node =
+          MerkleNode::new(file_path.clone(), Some(ancestor.clone())).await;
         ancestor.write().await.attach_child(new_node.clone()).await;
         new_node
       }
@@ -411,13 +318,9 @@ impl MerkleTree {
         // UNSURE: not sure this is the correct thing to do but it is the fastest.
         // get the last thing that is not in the tree.
         let first_child_path = path.last().unwrap();
-        let first_child = MerkleNode::new(
-          first_child_path.clone(),
-          Some(ancestor.clone()),
-          &self.git_ignored_files,
-          &absolute_root_path.as_str(),
-        )
-        .await;
+        let first_child =
+          MerkleNode::new(first_child_path.clone(), Some(ancestor.clone()))
+            .await;
 
         // TODO(sualeh): we should do an assertion check that the entire vec is contained here.
 
@@ -694,62 +597,18 @@ use std::future::Future;
 use std::pin::Pin;
 
 type PinnedFuture<'a, T> = Pin<Box<dyn Future<Output = T> + Send + 'a>>;
-type IgnoredFiles = HashSet<String>;
 
 impl MerkleNode {
   /// please be careful using this.
   async fn __new_unchecked(
     file_or_directory: String,
     parent: ParentPtr,
-    ignored_files: &IgnoredFiles,
-    absolute_root_path: &str,
   ) -> MerkleNodePtr {
-    // check if the root is a git directory.
-    let is_git_repo =
-      match git_utils::is_git_directory(absolute_root_path).await {
-        Ok(is_git_repo) => is_git_repo,
-        Err(e) => false,
-      };
-    let bypass_git = !is_git_repo;
-
-    MerkleNode::construct_node(
-      Path::new(&file_or_directory),
-      parent,
-      ignored_files,
-      absolute_root_path,
-      bypass_git,
-    )
-    .await
+    MerkleNode::construct_node(Path::new(&file_or_directory), parent).await
   }
 
-  async fn new(
-    absolute_file_or_directory: PathBuf,
-    parent: ParentPtr,
-    ignored_files: &IgnoredFiles,
-    absolute_root_path: &str,
-  ) -> MerkleNodePtr {
-    // check if the root is a git directory.
-    let is_git_repo =
-      match git_utils::is_git_directory(absolute_root_path).await {
-        Ok(is_git_repo) => is_git_repo,
-        Err(_e) => false,
-      };
-    let bypass_git = !is_git_repo;
-
-    info!(
-      "constructing node for absolute_file_or_directory: {:?}",
-      absolute_file_or_directory
-    );
-    info!("bypass_git: {}, is_git_repo: {}", bypass_git, is_git_repo);
-
-    MerkleNode::construct_node(
-      Path::new(&absolute_file_or_directory),
-      parent,
-      ignored_files,
-      absolute_root_path,
-      bypass_git,
-    )
-    .await
+  async fn new(file_or_directory: PathBuf, parent: ParentPtr) -> MerkleNodePtr {
+    MerkleNode::construct_node(Path::new(&file_or_directory), parent).await
   }
 
   /// NOT added to the tree by default.
@@ -760,64 +619,38 @@ impl MerkleNode {
   // 		let file_hash = self.files.get_mut(&file_path).unwrap();
 
   fn construct_node<'a>(
-    absolute_file_or_directory: &'a Path,
+    file_or_directory: &'a Path,
     parent: ParentPtr,
-    ignored_files: &'a IgnoredFiles,
-    absolute_root_path: &'a str,
-    bypass_git: bool,
   ) -> PinnedFuture<'a, MerkleNodePtr> {
     Box::pin(async move {
       // check if it is a file
-      let path_str = absolute_file_or_directory.to_str().unwrap().to_string();
-      if absolute_file_or_directory.is_file() {
+      let path_str = file_or_directory.to_str().unwrap().to_string();
+      if file_or_directory.is_file() {
         return Arc::new(RwLock::new(
           MerkleNode::construct_file_node_or_error_node(
-            absolute_file_or_directory,
+            file_or_directory,
             parent,
-            ignored_files,
           )
           .await,
         ));
       }
 
       // check if the directory fails the bad dir test.
-      let is_bad_dir = file_utils::is_in_bad_dir(absolute_file_or_directory);
+      let is_bad_dir = file_utils::is_in_bad_dir(file_or_directory);
       if is_bad_dir.is_err() || is_bad_dir.unwrap_or(false) {
         // println!("skipping directory: {}", path_str);
         return Arc::new(RwLock::new(MerkleNode::empty_node(
-          Some(absolute_file_or_directory),
+          Some(file_or_directory),
           Some("Directory is in bad dir!".to_string()),
         )));
       }
 
-      // check if the directory is git ignored
-      let is_git_ignored =
-        match git_utils::is_git_ignored(absolute_root_path, path_str.as_str())
-          .await
-        {
-          Ok(is_git_ignored) => is_git_ignored,
-          Err(e) => {
-            return Arc::new(RwLock::new(MerkleNode::empty_node(
-              Some(absolute_file_or_directory),
-              Some(e.to_string()),
-            )));
-          }
-        };
-
-      if is_git_ignored && !bypass_git {
-        // println!("skipping directory: {}", path_str);
-        return Arc::new(RwLock::new(MerkleNode::empty_node(
-          Some(absolute_file_or_directory),
-          Some("Directory is git ignored!".to_string()),
-        )));
-      }
-
-      let entries = fs::read_dir(absolute_file_or_directory);
+      let entries = fs::read_dir(file_or_directory);
       match entries {
         Ok(_) => (),
         Err(e) => {
           return Arc::new(RwLock::new(MerkleNode::empty_node(
-            Some(absolute_file_or_directory),
+            Some(file_or_directory),
             Some(e.to_string()),
           )));
         }
@@ -837,19 +670,13 @@ impl MerkleNode {
         match entry {
           Ok(entry) => {
             children.push(
-              MerkleNode::construct_node(
-                &entry.path(),
-                Some(node.clone()),
-                ignored_files,
-                absolute_root_path,
-                bypass_git,
-              )
-              .await,
+              MerkleNode::construct_node(&entry.path(), Some(node.clone()))
+                .await,
             );
           }
           Err(e) => {
             children.push(Arc::new(RwLock::new(MerkleNode::empty_node(
-              Some(absolute_file_or_directory),
+              Some(file_or_directory),
               Some(e.to_string()),
             ))));
           }
@@ -869,33 +696,23 @@ impl MerkleNode {
   }
 
   async fn construct_file_node(
-    absolute_file_path: &Path,
+    file_path: &Path,
     parent: ParentPtr,
-    ignored_files: &IgnoredFiles,
   ) -> Result<MerkleNode, String> {
-    let file_str = absolute_file_path
+    let file_str = file_path
       .to_str()
       .ok_or("Could not convert file path to string!")?
       .to_string();
     // first see if it passes the
-    match file_utils::is_good_file(absolute_file_path) {
+    match file_utils::is_good_file(file_path) {
       Ok(_) => {}
       Err(e) => {
         return Err(format!("File failed runtime checks! {}", e.to_string()));
       }
     }
 
-    // check if the file is in the git ignore buffer.
-    // this is a bug right because we are not checking absoluteness here.
-    match ignored_files.contains(&file_str) {
-      true => {
-        return Err(format!("File is in git ignore buffer!"));
-      }
-      false => {}
-    }
-
     // read the file_content to a buffer
-    let file_content = match tokio::fs::read(absolute_file_path).await {
+    let file_content = match tokio::fs::read(file_path).await {
       Ok(content) => content,
       Err(e) => {
         return Err(format!("Could not read file! {}", e.to_string()));
@@ -903,11 +720,7 @@ impl MerkleNode {
     };
 
     // check if the file passes runtime checks.
-    match file_utils::is_good_file_runtime_check(
-      absolute_file_path,
-      &file_content,
-    )
-    .await
+    match file_utils::is_good_file_runtime_check(file_path, &file_content).await
     {
       Ok(_) => {}
       Err(e) => {
@@ -938,22 +751,15 @@ impl MerkleNode {
   }
 
   async fn construct_file_node_or_error_node(
-    absolute_file_path: &Path,
+    file_path: &Path,
     parent: ParentPtr,
-    ignored_files: &IgnoredFiles,
   ) -> MerkleNode {
-    let node = match MerkleNode::construct_file_node(
-      absolute_file_path,
-      parent,
-      ignored_files,
-    )
-    .await
-    {
+    let node = match MerkleNode::construct_file_node(file_path, parent).await {
       Ok(node) => node,
       Err(e) => {
         // println!("constructing error node. error: {}", e);
         // println!("file_path: {:?}", file_path);
-        MerkleNode::empty_node(Some(absolute_file_path), Some(e))
+        MerkleNode::empty_node(Some(file_path), Some(e))
       }
     };
 

package/src/test.rs

@@ -1,5 +0,0 @@
-#[cfg(test)]
-mod tests {
-  use super::super::*;
-  use std::path::PathBuf;
-}