1
0
Fork 0
mirror of synced 2024-05-07 14:03:48 +12:00

Format better file save message

This commit is contained in:
Rafał Mikrut 2020-09-18 11:11:08 +02:00
parent 2b9c0d61df
commit 3d297b3657
3 changed files with 11 additions and 9 deletions

View file

@ -148,7 +148,6 @@ fn main() {
} }
df.get_text_messages().print_messages(); df.get_text_messages().print_messages();
//print_information(df.get_information());
} }
"--h" | "--help" => { "--h" | "--help" => {
print_help(); print_help();
@ -162,6 +161,13 @@ fn main() {
println!("FATAL ERROR: Parameter -i with set of included files is required."); println!("FATAL ERROR: Parameter -i with set of included files is required.");
process::exit(1); process::exit(1);
} }
if ArgumentsPair::has_command(&arguments, "-delete") {
ef.set_delete_folder(true);
}
ef.find_empty_folders();
#[allow(clippy::collapsible_if)] #[allow(clippy::collapsible_if)]
if ArgumentsPair::has_command(&arguments, "-f") { if ArgumentsPair::has_command(&arguments, "-f") {
if !ef.save_results_to_file(&ArgumentsPair::get_argument(&arguments, "-f", false)) { if !ef.save_results_to_file(&ArgumentsPair::get_argument(&arguments, "-f", false)) {
@ -170,12 +176,6 @@ fn main() {
} }
} }
if ArgumentsPair::has_command(&arguments, "-delete") {
ef.set_delete_folder(true);
}
ef.find_empty_folders();
ef.print_empty_folders(); ef.print_empty_folders();
} }
argum => { argum => {

View file

@ -481,7 +481,7 @@ impl DuplicateFinder {
} }
}; };
match file.write_all(b"Results of searching\n\n") { match file.write_all(format!("Results of searching in {:?}\n",self.included_directories).as_bytes()) {
Ok(_) => (), Ok(_) => (),
Err(_) => { Err(_) => {
self.text_messages.errors.push("Failed to save results to file ".to_string() + file_name.as_str()); self.text_messages.errors.push("Failed to save results to file ".to_string() + file_name.as_str());

View file

@ -99,7 +99,7 @@ impl EmptyFolder {
} }
}; };
match file.write_all(b"Results of searching\n") { match file.write_all(format!("Results of searching in {:?}\n",self.included_directories).as_bytes()) {
Ok(_) => (), Ok(_) => (),
Err(_) => { Err(_) => {
self.text_messages.errors.push("Failed to save results to file ".to_string() + file_name.as_str()); self.text_messages.errors.push("Failed to save results to file ".to_string() + file_name.as_str());
@ -139,6 +139,7 @@ impl EmptyFolder {
} }
} }
self.empty_folder_list = new_directory_folders; self.empty_folder_list = new_directory_folders;
self.information.number_of_empty_folders = self.empty_folder_list.len();
} }
/// Function to check if folder are empty. /// Function to check if folder are empty.
@ -177,6 +178,7 @@ impl EmptyFolder {
let mut current_folder: String; let mut current_folder: String;
let mut next_folder: String; let mut next_folder: String;
while !folders_to_check.is_empty() { while !folders_to_check.is_empty() {
self.information.number_of_checked_folders += 1;
current_folder = folders_to_check.pop().unwrap(); current_folder = folders_to_check.pop().unwrap();
// Checked folder may be deleted so we assume that cannot removed folder be empty // Checked folder may be deleted so we assume that cannot removed folder be empty
let read_dir = match fs::read_dir(&current_folder) { let read_dir = match fs::read_dir(&current_folder) {