grimhilt/nextsync-rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

find modified, copied, moved file in staged

Browse Source
This commit is contained in:
grimhilt 2023-08-23 12:52:45 +02:00
parent dcf137667b
commit f64d719b31
2 changed files with 70 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/commands/add.rs
View File

@ -44,11 +44,9 @@ pub fn add(args: AddArgs) {
match path.exists() { match path.exists() {
true => { true => {
if path.is_dir() { if path.is_dir() {
added_files.push(f);
add_folder_content(path.to_path_buf(), &mut added_files); add_folder_content(path.to_path_buf(), &mut added_files);
} else {
added_files.push(String::from(path.to_str().unwrap()));
} }
added_files.push(f);
}, },
false => { false => {
if Object::new(path.to_str().unwrap()).exists() { if Object::new(path.to_str().unwrap()).exists() {

74
src/commands/status.rs
View File

@ -1,5 +1,4 @@
use std::fs::File; use std::fs::File;
use std::fs::File;
use std::path::PathBuf; use std::path::PathBuf;
use std::io::{self, Lines, BufReader}; use std::io::{self, Lines, BufReader};
use std::collections::HashMap; use std::collections::HashMap;
@ -34,25 +33,16 @@ pub enum State {
// todo: not catch added empty folder // todo: not catch added empty folder
pub fn status() { pub fn status() {
let (mut new_objs_hashes, mut del_objs_hashes, objs_modified) = get_diff(); let (mut new_objs_hashes, mut del_objs_hashes, objs_modified) = get_diff();
let move_copy_objs = get_move_copy_objs(&mut new_objs_hashes, &mut del_objs_hashes); let move_copy_hashes = get_move_copy_objs(&mut new_objs_hashes, &mut del_objs_hashes);
// get copy
let staged_objs = get_staged(&mut new_objs_hashes, &mut del_objs_hashes);
let mut objs: Vec<LocalObj> = del_objs_hashes.iter().map(|x| {
x.1.clone()
}).collect();
for (_, elt) in new_objs_hashes {
objs.push(elt.clone());
}
for obj in move_copy_objs {
objs.push(obj.clone());
}
let mut hasher = Sha1::new();
let mut modified_objs_hashes = HashMap::new();
for obj in objs_modified { for obj in objs_modified {
objs.push(LocalObj { hasher.input_str(&obj);
let hash = hasher.result_str();
hasher.reset();
modified_objs_hashes.insert(hash, LocalObj {
// todo otype // todo otype
otype: get_otype(PathBuf::from(obj.clone())), otype: get_otype(PathBuf::from(obj.clone())),
name: obj.clone().to_string(), name: obj.clone().to_string(),
@ -62,10 +52,24 @@ pub fn status() {
}); });
} }
let mut all_hashes = HashMap::new();
all_hashes.extend(move_copy_hashes);
all_hashes.extend(del_objs_hashes);
all_hashes.extend(new_objs_hashes);
all_hashes.extend(modified_objs_hashes);
let staged_objs = get_staged(&mut all_hashes);
let objs: Vec<LocalObj> = all_hashes.iter().map(|x| {
x.1.clone()
}).collect();
print_status(staged_objs, objs); print_status(staged_objs, objs);
} }
fn should_retain(hasher: &mut Sha1, obj: LocalObj, move_objs: &mut Vec<LocalObj>, del_objs_h: &mut HashMap<String, LocalObj>) -> bool { fn should_retain(hasher: &mut Sha1, key: String, obj: LocalObj, move_copy_hashes: &mut HashMap<String, LocalObj>, del_objs_h: &mut HashMap<String, LocalObj>) -> bool {
// todo prevent copied or moved if file empty
let mut blob = Blob::new(obj.path.clone()); let mut blob = Blob::new(obj.path.clone());
let mut flag = true; let mut flag = true;
let identical_blobs = blob.get_all_identical_blobs(); let identical_blobs = blob.get_all_identical_blobs();
@ -86,7 +90,7 @@ fn should_retain(hasher: &mut Sha1, obj: LocalObj, move_objs: &mut Vec<LocalObj>
new_move.path_from = Some(deleted.path); new_move.path_from = Some(deleted.path);
new_move.state = State::Moved; new_move.state = State::Moved;
move_objs.push(new_move.clone()); move_copy_hashes.insert(key.clone(), new_move.clone());
flag = false; flag = false;
} }
} }
@ -102,7 +106,7 @@ fn should_retain(hasher: &mut Sha1, obj: LocalObj, move_objs: &mut Vec<LocalObj>
let mut new_copy = obj.clone(); let mut new_copy = obj.clone();
new_copy.path_from = Some(rel_p); new_copy.path_from = Some(rel_p);
new_copy.state = State::Copied; new_copy.state = State::Copied;
move_objs.push(new_copy.clone()); move_copy_hashes.insert(key, new_copy.clone());
flag = false; flag = false;
} }
} }
@ -110,14 +114,14 @@ fn should_retain(hasher: &mut Sha1, obj: LocalObj, move_objs: &mut Vec<LocalObj>
flag flag
} }
fn get_move_copy_objs(new_objs_h: &mut HashMap<String, LocalObj>, del_objs_h: &mut HashMap<String, LocalObj>) -> Vec<LocalObj> { fn get_move_copy_objs(new_objs_h: &mut HashMap<String, LocalObj>, del_objs_h: &mut HashMap<String, LocalObj>) -> HashMap<String, LocalObj> {
let mut hasher = Sha1::new(); let mut hasher = Sha1::new();
let mut move_objs: Vec<LocalObj> = vec![]; let mut move_copy_hashes = HashMap::new();
new_objs_h.retain(|_, obj| { new_objs_h.retain(|key, obj| {
should_retain(&mut hasher, obj.clone(), &mut move_objs, del_objs_h) should_retain(&mut hasher, key.to_owned(), obj.clone(), &mut move_copy_hashes, del_objs_h)
}); });
move_objs move_copy_hashes
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -132,13 +136,13 @@ pub struct LocalObj {
pub fn get_all_staged() -> Vec<LocalObj> { pub fn get_all_staged() -> Vec<LocalObj> {
let (mut new_objs_hashes, mut del_objs_hashes, mut objs_modified) = get_diff(); let (mut new_objs_hashes, mut del_objs_hashes, mut objs_modified) = get_diff();
// get copy, modified // get copy, modified
let staged_objs = get_staged(&mut new_objs_hashes, &mut del_objs_hashes); let staged_objs = get_staged(&mut new_objs_hashes);
staged_objs.clone() staged_objs.clone()
// todo opti getting staged and then finding differences ? // todo opti getting staged and then finding differences ?
} }
fn get_staged(new_objs_h: &mut HashMap<String, LocalObj>, del_objs_h: &mut HashMap<String, LocalObj>) -> Vec<LocalObj> { fn get_staged(hashes: &mut HashMap<String, LocalObj>) -> Vec<LocalObj> {
let mut lines: Vec<String> = vec![]; let mut lines: Vec<String> = vec![];
if let Ok(entries) = index::read_line() { if let Ok(entries) = index::read_line() {
@ -147,7 +151,6 @@ fn get_staged(new_objs_h: &mut HashMap<String, LocalObj>, del_objs_h: &mut HashM
} }
} }
let mut hasher = Sha1::new(); let mut hasher = Sha1::new();
let mut staged_objs: Vec<LocalObj> = vec![]; let mut staged_objs: Vec<LocalObj> = vec![];
@ -159,12 +162,9 @@ fn get_staged(new_objs_h: &mut HashMap<String, LocalObj>, del_objs_h: &mut HashM
hasher.reset(); hasher.reset();
// find it on the list of hashes // find it on the list of hashes
if new_objs_h.contains_key(&hash) { if hashes.contains_key(&hash) {
staged_objs.push(new_objs_h.get(&hash).unwrap().clone()); staged_objs.push(hashes.get(&hash).unwrap().clone());
new_objs_h.remove(&hash); hashes.remove(&hash);
} else if del_objs_h.contains_key(&hash) {
staged_objs.push(del_objs_h.get(&hash).unwrap().clone());
del_objs_h.remove(&hash);
}else { }else {
let mut t_path = ref_p.clone(); let mut t_path = ref_p.clone();
let relative_p = PathBuf::from(obj.clone()); let relative_p = PathBuf::from(obj.clone());
@ -334,7 +334,7 @@ fn print_object(obj: LocalObj) {
} else if obj.state == State::Moved { } else if obj.state == State::Moved {
println!(" {} {} => {}", String::from("moved:").red(), path_buf_to_string(obj.path_from.unwrap()).red(), path_buf_to_string(obj.path).red()); println!(" {} {} => {}", String::from("moved:").red(), path_buf_to_string(obj.path_from.unwrap()).red(), path_buf_to_string(obj.path).red());
} else if obj.state == State::Copied { } else if obj.state == State::Copied {
println!(" {} {} => {}", String::from("copied:").red(), path_buf_to_string(obj.path_from.unwrap()).red(), path_buf_to_string(obj.path).red()); println!(" {} {} => {}", String::from("copied:").red(), path_buf_to_string(obj.path_from.unwrap()), path_buf_to_string(obj.path).red());
} }
} }
@ -349,7 +349,7 @@ fn print_staged_object(obj: LocalObj) {
} else if obj.state == State::Moved { } else if obj.state == State::Moved {
println!(" {} {} => {}", String::from("moved:").green(), path_buf_to_string(obj.path_from.unwrap()).green(), path_buf_to_string(obj.path).green()); println!(" {} {} => {}", String::from("moved:").green(), path_buf_to_string(obj.path_from.unwrap()).green(), path_buf_to_string(obj.path).green());
} else if obj.state == State::Copied { } else if obj.state == State::Copied {
println!(" {} {} => {}", String::from("copied:").green(), path_buf_to_string(obj.path_from.unwrap()).green(), path_buf_to_string(obj.path).green()); println!(" {} {} => {}", String::from("copied:"), path_buf_to_string(obj.path_from.unwrap()).green(), path_buf_to_string(obj.path).green());
} }
} }