Skip to content
Snippets Groups Projects
Commit 6839b4c3 authored by nicolas's avatar nicolas
Browse files

src/checkout.rs

parent b7d856b9
No related branches found
No related tags found
No related merge requests found
...@@ -203,12 +203,17 @@ mod remove_results { ...@@ -203,12 +203,17 @@ mod remove_results {
let mut content = content.lines().map(|x| { let mut content = content.lines().map(|x| {
format!("!{}", x) format!("!{}", x)
}).collect::<Vec<_>>(); }).collect::<Vec<_>>();
let mut ctmp = vec![String::from("**")]; let mut ctmp = vec![format!("{}/**", results.to_str().unwrap())];
let project_dir = results
.canonicalize()
.unwrap()
.parent()
.unwrap()
.to_owned();
ctmp.append(&mut content); ctmp.append(&mut content);
let ncontent = ctmp.iter().map(|x| {x.as_str()}).collect::<Vec<_>>(); let ncontent = ctmp.iter().map(|x| {x.as_str()}).collect::<Vec<_>>();
//env::set_current_dir(&results).unwrap();
let walker = globwalk::GlobWalkerBuilder::from_patterns( let walker = globwalk::GlobWalkerBuilder::from_patterns(
results, project_dir,
&ncontent, &ncontent,
) )
.max_depth(100) .max_depth(100)
...@@ -247,10 +252,8 @@ mod remove_results { ...@@ -247,10 +252,8 @@ mod remove_results {
/// # Arguments /// # Arguments
/// * `list_files` A vector containing a list of files to remove /// * `list_files` A vector containing a list of files to remove
fn remove_files(list_files: Vec<PathBuf>) -> () { fn remove_files(list_files: Vec<PathBuf>) -> () {
println!("Removing files :");
for my_file in list_files { for my_file in list_files {
println!("file: {:?} will be removed", my_file); fs::remove_file(my_file).unwrap();
// fs::remove_file(my_file).unwrap();
} }
} }
...@@ -263,8 +266,7 @@ mod remove_results { ...@@ -263,8 +266,7 @@ mod remove_results {
for dir in list_dirs.iter() { for dir in list_dirs.iter() {
let is_empty = dir.read_dir().unwrap().next().is_none(); let is_empty = dir.read_dir().unwrap().next().is_none();
if is_empty { if is_empty {
println!("Removing directory: {:?}", dir); fs::remove_dir(dir).unwrap();
// fs::remove_dir(dir).unwrap();
} }
} }
} }
...@@ -276,12 +278,9 @@ mod remove_results { ...@@ -276,12 +278,9 @@ mod remove_results {
/// * `borgignore` The borgignore files /// * `borgignore` The borgignore files
fn remove_with_borgignore(results: &PathBuf, borgignore: &PathBuf) { fn remove_with_borgignore(results: &PathBuf, borgignore: &PathBuf) {
let entries = get_entries_to_remove(results, borgignore); let entries = get_entries_to_remove(results, borgignore);
println!("entries: {:?}", entries);
let (files, dir) = separate_files_n_directory(entries); let (files, dir) = separate_files_n_directory(entries);
println!("files: {:?}", files);
remove_files(files); remove_files(files);
remove_directories(dir); remove_directories(dir);
exit(1);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment