src/commands/add.rs

@@ -10,8 +10,6 @@ pub struct AddArgs<'a> {
     pub force: bool,
 }
 
-// todo match deleted files
-// todo match weird reg expression
 pub fn add(args: AddArgs) {
     let mut index_file = store::index::open();
     let mut added_files: Vec<String> = vec![];
@@ -29,6 +27,7 @@ pub fn add(args: AddArgs) {
         match path.exists() {
             true => {
                 if path.is_dir() {
+
                     added_files.push(String::from(path.to_str().unwrap()));
                     add_folder_content(path.to_path_buf(), &mut added_files);
                 } else {

src/commands/clone.rs

@@ -7,7 +7,7 @@ use crate::global::global::{DIR_PATH, set_dir_path};
 use crate::services::api::ApiError;
 use crate::services::req_props::{ReqProps, ObjProps};
 use crate::services::download_files::DownloadFiles;
-use crate::store::object::{tree, blob};
+use crate::store::object::{self, add_blob, add_tree};
 use crate::commands::init;
 
 pub fn clone(remote: Values<'_>) {
@@ -93,7 +93,7 @@ pub fn clone(remote: Values<'_>) {
             // add tree
             let path_folder = p.strip_prefix(ref_path.clone()).unwrap();
             let lastmodified = folder.lastmodified.unwrap().timestamp_millis();
-            if let Err(err) = tree::add(&path_folder, &lastmodified.to_string()) {
+            if let Err(err) = add_tree(&path_folder, &lastmodified.to_string()) {
                 eprintln!("err: saving ref of {} ({})", path_folder.display(), err);
             }
         }
@@ -125,7 +125,7 @@ fn download_files(ref_p: PathBuf, files: Vec<ObjProps>, api_props: &ApiProps) {
             Ok(()) => {
                 let relative_p = Path::new(&relative_s);
                 let lastmodified = obj.clone().lastmodified.unwrap().timestamp_millis();
-                if let Err(err) = blob::add(relative_p, &lastmodified.to_string()) {
+                if let Err(err) = add_blob(relative_p, &lastmodified.to_string()) {
                     eprintln!("err: saving ref of {} ({})", relative_s.clone(), err);
                 }
             },

src/commands/init.rs

@@ -16,27 +16,27 @@ pub fn init() {
     // .nextsync folder
     path.push(".nextsync");
     match builder.create(path.clone()) {
-        Ok(()) => (),
+        Ok(()) => println!("Directory successfuly created"),
         Err(_) => println!("Error: cannot create directory"),
     };
 
     path.push("objects");
     match builder.create(path.clone()) {
-        Ok(()) => (),
+        Ok(()) => println!("Directory successfuly created"),
         Err(_) => println!("Error: cannot create directory"),
     };
     path.pop();
 
     path.push("HEAD");
     match File::create(path.clone()) {
-        Ok(_) => (),
+        Ok(_) => println!("File successfuly created"),
         Err(_) => println!("Error: cannot create .nextsyncignore"),
     }
 
     path.pop();
     path.push("index");
     match File::create(path.clone()) {
-        Ok(_) => (),
+        Ok(_) => println!("File successfuly created"),
         Err(_) => println!("Error: cannot create .nextsyncignore"),
     }
 
@@ -45,7 +45,7 @@ pub fn init() {
     path.push(".nextsyncignore");
     
     match File::create(path) {
-        Ok(_) => (),
+        Ok(_) => println!("File successfuly created"),
         Err(_) => println!("Error: cannot create .nextsyncignore"),
     }
 }

src/commands/push.rs

@@ -1,18 +1,16 @@
-use std::path::Path;
 use crate::services::api::ApiError;
 use crate::services::upload_file::UploadFile;
 use crate::services::delete_path::DeletePath;
 use crate::services::req_props::{ReqProps, ObjProps};
 use crate::store::index;
-use crate::store::object::blob;
+use crate::store::object::{add_blob, rm_blob};
 use crate::commands::{status, config};
-use crate::commands::status::{State, LocalObj};
+use crate::commands::status::{State, Obj};
 use crate::commands::push::push_factory::{PushFactory, PushState};
 
 pub mod push_factory;
 pub mod new;
-//pub mod new_dir;
-//pub mod deleted;
+pub mod deleted;
 
 pub fn push() {
     dbg!(status::get_all_staged());
@@ -21,45 +19,25 @@ pub fn push() {
         Some(r) => r,
         None => {
             eprintln!("fatal: no remote set in configuration");
-            //std::process::exit(1);
-            String::from("")
+            std::process::exit(1);
         }
     };
   
     let staged_objs = status::get_all_staged();
     // todo sort folder first
-
-    // path that certify that all its children can be push whithout hesistation
-    // (e.g if remote dir has no changes since last sync all children
-    // can be pushed without verification)
-    let whitelist: Option<&Path> = None;
-
     for obj in staged_objs {
         if obj.otype == String::from("tree") {
-            //let push_factory = PushFactory.new_dir(obj.clone());
-            //let res = match push_factory.can_push(whitelist.clone()) {
-            //    PushState::Valid => push_factory.push(),
-            //    PushState::Done => (),
-            //    PushState::Conflict => (),
-            //    _ => todo!(),
-            //};
-
-            //match res {
-            //    
-            //}
-            //dbg!("should push folder");
+           dbg!("should push folder");
         } else {
             let push_factory = PushFactory.new(obj.clone());
-            match push_factory.can_push(whitelist.clone()) {
+            match push_factory.can_push() {
                 PushState::Valid => push_factory.push(),
                 PushState::Done => (),
-                PushState::Conflict => {
-                    // download file
-                }
                 _ => todo!(),
             }
         }
     }
     // read index
     // if dir upload dir
+
 }

src/commands/push/deleted.rs

@@ -1,24 +1,46 @@
-use std::path::Path;
 use crate::services::api::ApiError;
 use crate::services::req_props::ReqProps;
 use crate::services::delete_path::DeletePath;
 use crate::store::index;
-use crate::store::object::blob;
-use crate::commands::status::LocalObj;
-use crate::commands::push::push_factory::{PushState, PushChange, PushFlowState};
+use crate::store::object::rm_blob;
+use crate::commands::status::Obj;
+use crate::commands::push::push_factory::{PushState, PushChange};
 
 pub struct Deleted {
-    pub obj: LocalObj
+    pub obj: Obj,
 }
 
 impl PushChange for Deleted {
-    fn can_push(&self, whitelist: Option<&Path>) -> PushState {
-        match self.flow(&self.obj, whitelist) {
-            PushFlowState::Whitelisted => PushState::Done,
-            PushFlowState::NotOnRemote => PushState::Done,
-            PushFlowState::RemoteIsNewer => PushState::Conflict,
-            PushFlowState::LocalIsNewer => PushState::Valid,
-            PushFlowState::Error => PushState::Error,
+    fn can_push(&self) -> PushState {
+        // check if exist on server
+        let res = ReqProps::new()
+            .set_url(&self.obj.path.to_str().unwrap())
+            .getlastmodified()
+            .send_with_err();
+
+        let file_infos = match res {
+            Ok(obj) => Ok(Some(obj)),
+            Err(ApiError::IncorrectRequest(err)) => {
+                if err.status() == 404 {
+                    Ok(None)
+                } else {
+                    Err(())
+                }
+            },
+            Err(_) => Err(()),
+        };
+
+        if let Ok(infos) = file_infos {
+            if let Some(inf) = infos {
+                // file doesn't exist on remote
+                PushState::Done
+            } else {
+                // todo check date
+                //PushState::Conflict
+                PushState::Valid
+            }
+        } else {
+            PushState::Error
         }
     }
 
@@ -41,12 +63,8 @@ impl PushChange for Deleted {
         }
 
         // update tree
-        blob::rm(&obj.path.clone());
+        rm_blob(&obj.path.clone());
         // remove index
         index::rm_line(obj.path.to_str().unwrap());
     }
-
-    fn conflict(&self) {
-
-    }
 }

src/commands/push/new.rs

@@ -1,23 +1,45 @@
-use std::path::Path;
 use crate::services::api::ApiError;
+use crate::services::req_props::ReqProps;
 use crate::services::upload_file::UploadFile;
 use crate::store::index;
-use crate::store::object::blob;
-use crate::commands::status::LocalObj;
-use crate::commands::push::push_factory::{PushState, PushChange, PushFlowState};
+use crate::store::object::add_blob;
+use crate::commands::status::Obj;
+use crate::commands::push::push_factory::{PushState, PushChange, PushFactory};
 
 pub struct New {
-    pub obj: LocalObj,
+    pub obj: Obj,
 }
 
 impl PushChange for New {
-    fn can_push(&self, whitelist: Option<&Path>) -> PushState {
-        match self.flow(&self.obj, whitelist) {
-            PushFlowState::Whitelisted => PushState::Valid,
-            PushFlowState::NotOnRemote => PushState::Valid,
-            PushFlowState::RemoteIsNewer => PushState::Conflict,
-            PushFlowState::LocalIsNewer => PushState::Valid,
-            PushFlowState::Error => PushState::Error,
+    fn can_push(&self) -> PushState {
+        // check if exist on server
+        let res = ReqProps::new()
+            .set_url(&self.obj.path.to_str().unwrap())
+            .getlastmodified()
+            .send_req_single();
+
+        let file_infos = match res {
+            Ok(obj) => Ok(Some(obj)),
+            Err(ApiError::IncorrectRequest(err)) => {
+                if err.status() == 404 {
+                    Ok(None)
+                } else {
+                    Err(())
+                }
+            },
+            Err(_) => Err(()),
+        };
+
+        if let Ok(infos) = file_infos {
+            if let Some(info) = infos {
+                // file doesn't exist on remote
+                PushState::Valid
+            } else {
+                // todo check date
+                PushState::Conflict
+            }
+        } else {
+            PushState::Error
         }
     }
 
@@ -41,14 +63,9 @@ impl PushChange for New {
         }
 
         // update tree
-        blob::add(&obj.path.clone(), "todo_date");
+        add_blob(&obj.path.clone(), "todo_date");
 
         // remove index
         index::rm_line(obj.path.to_str().unwrap());
     }
-
-    // download file with .distant at the end   
-    fn conflict(&self) {
-        todo!()
-    }
 }

src/commands/push/push_factory.rs

@@ -1,11 +1,6 @@
-use std::path::Path;
-use crate::commands::status::{State, LocalObj};
-use crate::services::api::ApiError;
-use crate::store::object;
-use crate::services::req_props::{ObjProps, ReqProps};
+use crate::commands::status::{State, Obj};
 use crate::commands::push::new::New;
-//use crate::commands::push::new_dir::NewDir;
-//use crate::commands::push::deleted::Deleted;
+use crate::commands::push::deleted::Deleted;
 
 #[derive(Debug)]
 pub enum PushState {
@@ -15,88 +10,20 @@ pub enum PushState {
     Error,
 } 
 
-pub enum PushFlowState {
-    Whitelisted,
-    NotOnRemote,
-    RemoteIsNewer,
-    LocalIsNewer,
-    Error,
-}
-
 pub trait PushChange {
-    fn can_push(&self, whitelist: Option<&Path>) -> PushState;
-    fn try_push(&self, whitelist: Option<&Path>);
+    fn can_push(&self) -> PushState;
     fn push(&self);
-
-    fn is_whitelisted(&self, obj: &LocalObj, path: Option<&Path>) -> bool {
-        match path {
-            Some(p) => obj.path.starts_with(p),
-            None => false,
-        }
-    }
-
-    fn flow(&self, obj: &LocalObj, whitelist: Option<&Path>) -> PushFlowState {
-        if self.is_whitelisted(obj, whitelist) {
-            return PushFlowState::Whitelisted;
-        }
-
-        // check if exist on server
-        let res = ReqProps::new()
-            .set_url(obj.path.to_str().unwrap())
-            .getlastmodified()
-            .send_req_single();
-
-        let obj_data = match res {
-            Ok(obj) => Ok(Some(obj)),
-            Err(ApiError::IncorrectRequest(err)) => {
-                if err.status() == 404 {
-                    Ok(None)
-                } else {
-                    Err(())
-                }
-            },
-            Err(_) => Err(()),
-        };
-
-        let obj_data = match obj_data {
-            Ok(Some(info)) => info,
-            Ok(None) => return PushFlowState::NotOnRemote,
-            Err(_) => return PushFlowState::Error,
-        };
-
-        // check if remote is newest
-        let last_sync_ts = object::get_timestamp(obj.path.to_str().unwrap().to_string()).unwrap();
-        let remote_ts = obj_data.lastmodified.unwrap().timestamp_millis(); 
-
-        if last_sync_ts < remote_ts {
-            PushFlowState::RemoteIsNewer
-        } else {
-            PushFlowState::LocalIsNewer
-        }
-    }
 }
 
 pub struct PushFactory;
 
 impl PushFactory {
-    pub fn new(&self, obj: LocalObj) -> Box<dyn PushChange> {
+    pub fn new(&self, obj: Obj) -> Box<dyn PushChange> {
         match obj.state {
-            State::New => Box::new(New { obj }),
+            State::New => Box::new(New { obj: obj.clone() }),
             State::Renamed => todo!(),
             State::Modified => todo!(),
-            State::Deleted => todo!(),
-            //State::Deleted => Box::new(Deleted {}),
-            State::Default => todo!(),
-        }
-    }
-
-    pub fn new_dir(&self, obj: LocalObj) -> Box<dyn PushChange> {
-        match obj.state {
-            //State::New => Box::new(NewDir {}),
-            State::New => todo!(),
-            State::Renamed => todo!(),
-            State::Modified => todo!(),
-            State::Deleted => todo!(),
+            State::Deleted => Box::new(Deleted { obj: obj.clone() }),
             State::Default => todo!(),
         }
     }

src/commands/status.rs

@@ -6,8 +6,7 @@ use crypto::digest::Digest;
 use crypto::sha1::Sha1;
 use colored::Colorize;
 use crate::utils;
-use crate::store::object::tree;
-use crate::store::index;
+use crate::store::{self, object};
 
 #[derive(PartialEq)]
 enum RemoveSide {
@@ -39,14 +38,14 @@ pub fn status() {
 }
 
 #[derive(Debug, Clone)]
-pub struct LocalObj {
+pub struct Obj {
     pub otype: String,
     pub name: String,
     pub path: PathBuf,
     pub state: State,
 }
 
-pub fn get_all_staged() -> Vec<LocalObj> {
+pub fn get_all_staged() -> Vec<Obj> {
     // todo opti getting staged and then finding differences ?
     // todo opti return folder
     let (mut new_objs, mut del_objs) = get_diff();
@@ -59,17 +58,18 @@ pub fn get_all_staged() -> Vec<LocalObj> {
     staged_objs
 }
 
-fn get_renamed(_new_obj: &mut Vec<LocalObj>, _del_obj: &mut Vec<LocalObj>) -> Vec<LocalObj> {
+fn get_renamed(_new_obj: &mut Vec<Obj>, _del_obj: &mut Vec<Obj>) -> Vec<Obj> {
     // get hash of all new obj, compare to hash of all del
     let renamed_objs = vec![];
     renamed_objs
 }
 
-fn get_staged(objs: &mut Vec<LocalObj>) -> Vec<LocalObj> {
+fn get_staged(objs: &mut Vec<Obj>) -> Vec<Obj> {
     let mut indexes = HashSet::new();
-    let mut staged_objs: Vec<LocalObj> = vec![];
+    let mut staged_objs: Vec<Obj> = vec![];
 
-    if let Ok(entries) = index::read_line() {
+    let nextsync_path = utils::path::nextsync().unwrap();
+    if let Ok(entries) = store::index::read_line(nextsync_path.clone()) {
         for entry in entries {
             indexes.insert(entry.unwrap());
         }
@@ -87,7 +87,7 @@ fn get_staged(objs: &mut Vec<LocalObj>) -> Vec<LocalObj> {
     staged_objs
 }
 
-fn get_diff() -> (Vec<LocalObj>, Vec<LocalObj>) {
+fn get_diff() -> (Vec<Obj>, Vec<Obj>) {
     let mut hashes = HashMap::new();
     let mut objs: Vec<String> = vec![];
 
@@ -122,7 +122,7 @@ fn get_diff() -> (Vec<LocalObj>, Vec<LocalObj>) {
         let obj_path = root.clone().join(cur_path.clone());
 
         if obj_path.is_dir() {
-            if let Some((_, lines)) = tree::read(cur_obj.clone()) {
+            if let Some((_, lines)) = object::read_tree(cur_obj.clone()) {
                 add_to_hashmap(lines, &mut hashes, cur_path.clone());
             }
 
@@ -138,8 +138,8 @@ fn get_diff() -> (Vec<LocalObj>, Vec<LocalObj>) {
             
     }
 
-    let del_objs: Vec<LocalObj> = hashes.iter().map(|x| {
-        LocalObj {
+    let del_objs: Vec<Obj> = hashes.iter().map(|x| {
+        Obj {
             otype: x.1.otype.clone(),
             name: x.1.name.clone(),
             path: x.1.path.clone(),
@@ -147,10 +147,10 @@ fn get_diff() -> (Vec<LocalObj>, Vec<LocalObj>) {
         }
     }).collect();
 
-    let new_objs: Vec<LocalObj> = objs.iter().map(|x| {
+    let new_objs: Vec<Obj> = objs.iter().map(|x| {
         let p = PathBuf::from(x.to_string());
         // todo name
-        LocalObj {
+        Obj {
             otype: get_type(p.clone()),
             name: x.to_string(),
             path: p,
@@ -168,14 +168,14 @@ fn get_type(p: PathBuf) -> String {
     }
 }
 
-fn add_to_hashmap(lines: Lines<BufReader<File>>, hashes: &mut HashMap<String, LocalObj>, path: PathBuf) {
+fn add_to_hashmap(lines: Lines<BufReader<File>>, hashes: &mut HashMap<String, Obj>, path: PathBuf) {
     for line in lines {
         if let Ok(ip) = line {
             if ip.clone().len() > 5 {
-                let (ftype, hash, name) = tree::parse_line(ip);
+                let (ftype, hash, name) = object::parse_line(ip);
                 let mut p = path.clone();
                 p.push(name.clone());
-                hashes.insert(String::from(hash), LocalObj{
+                hashes.insert(String::from(hash), Obj{
                     otype: String::from(ftype),
                     name: String::from(name),
                     path: p,
@@ -196,7 +196,7 @@ fn add_to_vec(entries: Vec<PathBuf>, objects: &mut Vec<String>, root: PathBuf) {
 
 }
 
-fn print_status(staged_objs: Vec<LocalObj>, objs: Vec<LocalObj>) {
+fn print_status(staged_objs: Vec<Obj>, objs: Vec<Obj>) {
     dbg!(staged_objs.clone());
     dbg!(objs.clone());
     if staged_objs.len() == 0 && objs.len() == 0 {
@@ -224,31 +224,31 @@ fn print_status(staged_objs: Vec<LocalObj>, objs: Vec<LocalObj>) {
     }
 }
 
-fn print_object(obj: LocalObj) {
+fn print_object(obj: Obj) {
     if obj.state == State::Deleted {
         println!("      {}    {}", String::from("deleted:").red(), obj.name.red());
     } else if obj.state == State::Renamed {
         println!("      {}    {}", String::from("renamed:").red(), obj.name.red());
     } else if obj.state == State::New {
-        println!("      {}        {}", String::from("new:").red(), obj.name.red());
+        println!("      {}   {}", String::from("new file:").red(), obj.name.red());
     } else if obj.state == State::Modified {
         println!("      {}   {}", String::from("modified:").red(), obj.name.red());
     }
 }
 
-fn print_staged_object(obj: LocalObj) {
+fn print_staged_object(obj: Obj) {
     if obj.state == State::Deleted {
         println!("      {}    {}", String::from("deleted:").green(), obj.name.green());
     } else if obj.state == State::Renamed {
         println!("      {}    {}", String::from("renamed:").green(), obj.name.green());
     } else if obj.state == State::New {
-        println!("      {}        {}", String::from("new:").green(), obj.name.green());
+        println!("      {}   {}", String::from("new file:").green(), obj.name.green());
     } else if obj.state == State::Modified {
         println!("      {}   {}", String::from("modified:").green(), obj.name.green());
     }
 }
 
-fn remove_duplicate(hashes: &mut HashMap<String, LocalObj>, objects: &mut Vec<String>, remove_option: RemoveSide) -> Vec<String> {
+fn remove_duplicate(hashes: &mut HashMap<String, Obj>, objects: &mut Vec<String>, remove_option: RemoveSide) -> Vec<String> {
     let mut hasher = Sha1::new();
     let mut duplicate = vec![];
 
@@ -306,7 +306,7 @@ mod tests {
         hasher.reset();
 
         let mut hashes = HashMap::new();
-        let default_obj = LocalObj {
+        let default_obj = Obj {
             otype: String::from("tree"),
             name: String::from("test"),
             path: PathBuf::from(""),

src/store/index.rs

@@ -26,11 +26,7 @@ pub fn open() -> File {
         .open(path).expect("Cannot open index file")
 }
 
-pub fn read_line() -> io::Result<io::Lines<io::BufReader<File>>> {
-    let mut path = match path::nextsync() {
-        Some(p) => p,
-        None => todo!(),
-    };
+pub fn read_line(mut path: PathBuf) -> io::Result<io::Lines<io::BufReader<File>>> {
     path.push("index");
     read::read_lines(path)
 }

src/store/object.rs

@@ -1,19 +1,18 @@
+use std::fs::File;
 use std::io::{self, Write};
 use std::path::{Path, PathBuf};
 use std::fs::{OpenOptions, self};
 use crypto::sha1::Sha1;
 use crypto::digest::Digest;
 use crate::utils::{read, path};
-
-pub mod tree;
-pub mod blob;
+use crate::store::head;
 
 /// Returns (line, hash, name)
 ///
 /// # Examples
 /// Input: /foo/bar
 /// Result: ("tree hash(/foo/bar) bar", hash(/foo/bar), bar)
-pub fn parse_path(path: &Path, is_blob: bool) -> (String, String, String) {
+fn parse_path(path: &Path, is_blob: bool) -> (String, String, String) {
     let file_name = path.file_name().unwrap().to_str().unwrap();
 
     let mut hasher = Sha1::new();
@@ -28,6 +27,83 @@ pub fn parse_path(path: &Path, is_blob: bool) -> (String, String, String) {
     (line, hash, String::from(file_name))
 }
 
+pub fn parse_line(line: String) -> (String, String, String) {
+    let mut split = line.rsplit(' ');
+    if split.clone().count() != 3 {
+        eprintln!("fatal: invalid object(s)");
+        std::process::exit(1);
+    }
+
+    let name = split.next().unwrap();
+    let hash = split.next().unwrap();
+    let ftype = split.next().unwrap();
+    (String::from(ftype), String::from(hash), String::from(name))
+}
+
+pub fn add_tree(path: &Path, date: &str) -> io::Result<()> {
+    let (line, hash, name) = parse_path(path.clone(), false);
+
+    // add tree reference to parent
+    if path.iter().count() == 1 {
+        head::add_line(line)?;
+    } else {
+        add_node(path.parent().unwrap(), &line)?;
+    }
+
+    // create tree object
+    let mut content = name;
+    content.push_str(" ");
+    content.push_str(date);
+    create_object(hash, &content)?;
+
+    Ok(())
+}
+
+pub fn rm_blob(path: &Path) -> io::Result<()> {
+    let (line, hash, _) = parse_path(path.clone(), true);
+
+    // remove blob reference to parent
+    if path.iter().count() == 1 {
+        head::rm_line(&line)?;
+    } else {
+        rm_node(path.parent().unwrap(), &line)?;
+    }
+
+    // remove blob object
+    let mut root = match path::objects() {
+        Some(path) => path,
+        None => todo!(),
+    };
+
+    let c = hash.clone();
+    let (dir, rest) = c.split_at(2);
+    root.push(dir);
+    root.push(rest);
+    fs::remove_file(root)?;
+
+    Ok(())
+
+}
+
+pub fn add_blob(path: &Path, date: &str) -> io::Result<()> {
+    let (line, hash, name) = parse_path(path.clone(), true);
+    // add blob reference to parent
+    if path.iter().count() == 1 {
+        head::add_line(line)?;
+    } else {
+        add_node(path.parent().unwrap(), &line)?;
+    }
+
+    let mut content = name.clone().to_owned();
+    content.push_str(" ");
+    content.push_str(date);
+
+    // create blob object
+    create_object(hash, &content)?;
+
+    Ok(())
+}
+
 fn hash_obj(obj: &str) -> (String, String) {
     let mut hasher = Sha1::new();
     hasher.input_str(obj);
@@ -48,6 +124,31 @@ fn _object_path(obj: &str) -> PathBuf {
     root
 }
 
+pub fn read_tree(tree: String) -> Option<(String, io::Lines<io::BufReader<File>>)> {
+    let mut obj_p = match path::objects() {
+        Some(path) => path,
+        None => todo!(),
+    };
+
+    let (dir, res) = hash_obj(&tree);
+    obj_p.push(dir);
+    obj_p.push(res);
+    
+    match read::read_lines(obj_p) {
+        Ok(mut reader) => {
+            let name = match reader.next() {
+                Some(Ok(line)) => line,
+                _ => String::from(""),
+            };
+            Some((name, reader))
+        },
+        Err(err) => {
+            eprintln!("error reading tree: {}", err);
+            None
+        },
+    }
+}
+
 fn rm_node(path: &Path, node: &str) -> io::Result<()> {
     let mut root = match path::objects() {
         Some(path) => path,
@@ -87,7 +188,7 @@ fn add_node(path: &Path, node: &str) -> io::Result<()> {
     Ok(())
 }
 
-fn create_obj(name: String, content: &str) -> io::Result<()> {
+fn create_object(name: String, content: &str) -> io::Result<()> {
     let mut root = match path::objects() {
         Some(path) => path,
         None => todo!(),
@@ -109,35 +210,3 @@ fn create_obj(name: String, content: &str) -> io::Result<()> {
     writeln!(file, "{}", content)?;
     Ok(())
 }
-
-pub fn get_timestamp(path_s: String) -> Option<i64> {
-    let mut obj_p = match path::objects() {
-        Some(path) => path,
-        None => todo!(),
-    };
-
-    let (dir, res) = hash_obj(&path_s);
-    obj_p.push(dir);
-    obj_p.push(res);
-    
-    match read::read_lines(obj_p) {
-        Ok(mut reader) => {
-            match reader.next() {
-                Some(Ok(line)) => {
-                    let mut data = line.rsplit(' ');
-                    if data.clone().count() >= 2 {
-                        Some(data.next().unwrap().parse::<i64>().unwrap())
-                    } else {
-                        None
-                    }
-                },
-                _ => None,
-            }
-        },
-        Err(err) => {
-            eprintln!("error reading object: {}", err);
-            None
-        },
-    }
-
-}

src/store/object/blob.rs

@@ -1,50 +0,0 @@
-use std::io::{self};
-use std::path::Path;
-use std::fs::{self};
-use crate::utils::path;
-use crate::store::head;
-use crate::store::object::{parse_path, add_node, create_obj, rm_node};
-
-pub fn add(path: &Path, date: &str) -> io::Result<()> {
-    let (line, hash, name) = parse_path(path.clone(), true);
-    // add blob reference to parent
-    if path.iter().count() == 1 {
-        head::add_line(line)?;
-    } else {
-        add_node(path.parent().unwrap(), &line)?;
-    }
-
-    let mut content = name.clone().to_owned();
-    content.push_str(" ");
-    content.push_str(date);
-
-    // create blob object
-    create_obj(hash, &content)?;
-
-    Ok(())
-}
-
-pub fn rm(path: &Path) -> io::Result<()> {
-    let (line, hash, _) = parse_path(path.clone(), true);
-
-    // remove blob reference to parent
-    if path.iter().count() == 1 {
-        head::rm_line(&line)?;
-    } else {
-        rm_node(path.parent().unwrap(), &line)?;
-    }
-
-    // remove blob object
-    let mut root = match path::objects() {
-        Some(path) => path,
-        None => todo!(),
-    };
-
-    let c = hash.clone();
-    let (dir, rest) = c.split_at(2);
-    root.push(dir);
-    root.push(rest);
-    fs::remove_file(root)?;
-
-    Ok(())
-}

src/store/object/tree.rs

@@ -1,63 +0,0 @@
-use std::fs::File;
-use std::io::{self};
-use std::path::Path;
-use crate::utils::{read, path};
-use crate::store::head;
-use crate::store::object::{parse_path, hash_obj, add_node, create_obj};
-
-pub fn add(path: &Path, date: &str) -> io::Result<()> {
-    let (line, hash, name) = parse_path(path.clone(), false);
-
-    // add tree reference to parent
-    if path.iter().count() == 1 {
-        head::add_line(line)?;
-    } else {
-        add_node(path.parent().unwrap(), &line)?;
-    }
-
-    // create tree object
-    let mut content = name;
-    content.push_str(" ");
-    content.push_str(date);
-    create_obj(hash, &content)?;
-
-    Ok(())
-}
-
-pub fn read(tree: String) -> Option<(String, io::Lines<io::BufReader<File>>)> {
-    let mut obj_p = match path::objects() {
-        Some(path) => path,
-        None => todo!(),
-    };
-
-    let (dir, res) = hash_obj(&tree);
-    obj_p.push(dir);
-    obj_p.push(res);
-    
-    match read::read_lines(obj_p) {
-        Ok(mut reader) => {
-            let name = match reader.next() {
-                Some(Ok(line)) => line,
-                _ => String::from(""),
-            };
-            Some((name, reader))
-        },
-        Err(err) => {
-            eprintln!("error reading tree: {}", err);
-            None
-        },
-    }
-}
-
-pub fn parse_line(line: String) -> (String, String, String) {
-    let mut split = line.rsplit(' ');
-    if split.clone().count() != 3 {
-        eprintln!("fatal: invalid object(s)");
-        std::process::exit(1);
-    }
-
-    let name = split.next().unwrap();
-    let hash = split.next().unwrap();
-    let ftype = split.next().unwrap();
-    (String::from(ftype), String::from(hash), String::from(name))
-}