debug

Cargo.toml

@@ -16,4 +16,5 @@ memmap2 = "0.7.1"
 rayon = "1.7.0"
 file-owner = "0.1.2"
 chrono = "0.4.37"
-walkdir = "2.4.0"
+walkdir = "2.4.0"
+path-absolutize = "3.1.1"

src/cmd/status_cmd.rs

@@ -2,8 +2,7 @@ use std::path::PathBuf;
 
 use crate::internal::config::config;
 use crate::internal::file::hash;
-use crate::internal::git::{self, repo};
-use crate::internal::log::json;
+use crate::internal::git::repo;
 use crate::internal::meta::{file, parse};
 
 #[derive(Debug)]
@@ -17,28 +16,13 @@ pub struct JsonFileResult {
     pub message: String
 }
 
-// struct JsonResult {
-//     files: Vec<JsonFileResult>,
-//     errors:Vec<json::JsonIssue>
-// }
-
-// impl JsonResult {
-//     fn add_file(&mut self, file_result: JsonFileResult) {
-//         self.files.push(file_result);
-//     }
-
-//     fn add_error(&mut self, json_issue: json::JsonIssue) {
-//         self.errors.push(json_issue);
-//     }
-// } // impl
-
 pub fn run_status_cmd(files: &Vec<String>) -> Result<Vec<JsonFileResult>, std::io::Error> {
 
     let mut json_logger: Vec<JsonFileResult> = Vec::new();
 
     let mut meta_paths: Vec<PathBuf> = Vec::new();
 
-    //iIf no arguments are provided, get the status of all files in the current git repository
+    // if no arguments are provided, get the status of all files in the current git repository
     if files.is_empty() {
         // Get git root
         let git_repo = match repo::get_nearest_repo_dir(&PathBuf::from(".")) {

src/internal/git/repo.rs

@@ -1,18 +1,18 @@
 use std::path::{PathBuf, Path};
 use std::fs;
+use path_absolutize::*;
 
 pub fn get_relative_path(root_dir: &PathBuf, file_path: &PathBuf) -> Result<PathBuf, std::io::Error> {
-    // let abs_file_path = match file_path.canonicalize() {
-    //     Ok(path) => path,
-    //     Err(e) => return Err(e),
-    // };
+    let abs_file_string = file_path.absolutize().unwrap().to_str().unwrap().to_string();
+    let abs_file_path = PathBuf::from(abs_file_string);
+
 
     let abs_root_dir = match root_dir.canonicalize() {
         Ok(path) => path,
         Err(e) => return Err(e),
     };
 
-    match file_path.strip_prefix(abs_root_dir) {
+    match abs_file_path.strip_prefix(abs_root_dir) {
         Ok(path) => return Ok(path.to_path_buf()),
         Err(_) => return Err(std::io::Error::other("paths not relative")),
     }

src/internal/mod.rs

@@ -1,7 +1,6 @@
 pub mod config;
 pub mod file;
 pub mod git;
-pub mod log;
 pub mod meta;
 pub mod migrate;
 pub mod storage;

src/main.rs

@@ -30,13 +30,14 @@ fn main() -> io::Result<()> {
    //add_cmd::run_add_cmd(&files, &message)?;
 
    //fs::remove_file(PathBuf::from("src/test_directory/test1.txt"))?;
-//  fs::remove_file(PathBuf::from("src/test_directory/test2.txt"))?;
+   //  fs::remove_file(PathBuf::from("src/test_directory/test2.txt"))?;
 
    // dvs get src/test_directory/test1.txt src/test_directory/test2.txt
    //get_cmd::run_get_cmd(&files)?;
 
    let empty_vec: Vec<String> = Vec::new();
-   let vec = status_cmd::run_status_cmd(&empty_vec)?;
+   let one_path = vec![String::from("src/test_directory/test2.txt")];
+   let vec = status_cmd::run_status_cmd(&one_path)?;
    println!("{:?}", vec);
     Ok(())
  }