CodeMirror/czkawka
1
0
Fork 0
mirror of synced 2024-04-27 01:02:23 +12:00
Code Issues Projects Releases Wiki Activity

Unified look of enum elements

Browse source
This commit is contained in:
Rafał Mikrut 2020-09-24 22:25:24 +02:00
parent 343c57f098
commit 468c2d7a67
4 changed files with 59 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Changelog
View file

@ -1,6 +1,12 @@
## Version 0.1.2 dev
- Add basic search empty folders in GTK GUI
- Remember place where button are placed
- Read and parse more values from GUI
- Print errors/warnings/messages to text field in GUI
- Add upper notebook with included, excluded directories, items and extensions
- Improve a little GUI
- Add version argument which print version e.g. `czkawka_gui --version`
- Simple Empty folder support in GUI
## Version 0.1.1 - 20.09.2020r
- Added images to readme
@ -11,7 +17,7 @@
- Added support for non recursive search
- Improved finding number and size of duplicated files
- Saving results to file
- Print how much data was readed by duplicate finder(debug only)
- Print how much data was read by duplicate finder(debug only)
- Added Github CI
- Only debug build prints debug infos
- Clean code

6
czkawka_cli/src/main.rs
View file

@ -98,13 +98,13 @@ fn main() {
if ArgumentsPair::has_command(&arguments, "-o") {
df.set_recursive_search(false);
}
df.set_check_method(duplicate::CheckingMethod::HASH); // Default
df.set_check_method(duplicate::CheckingMethod::Hash); // Default
if ArgumentsPair::has_command(&arguments, "-l") {
let argument_name = ArgumentsPair::get_argument(&arguments, "-l", false).to_lowercase();
if argument_name == "size" {
df.set_check_method(duplicate::CheckingMethod::SIZE);
df.set_check_method(duplicate::CheckingMethod::Size);
} else if argument_name == "hash" {
df.set_check_method(duplicate::CheckingMethod::HASH);
df.set_check_method(duplicate::CheckingMethod::Hash);
} else {
println!("-l can only have values hash or size");
process::exit(1);

66
czkawka_core/src/duplicate.rs
View file

@ -10,9 +10,9 @@ use crate::common::{Common, Messages};
#[derive(PartialEq, Eq, Clone)]
pub enum CheckingMethod {
NONE,
SIZE,
HASH,
None,
Size,
Hash,
}
#[derive(Eq, PartialEq, Clone)]
@ -104,7 +104,7 @@ impl DuplicateFinder {
included_directories: vec![],
recursive_search: true,
allowed_extensions: vec![],
check_method: CheckingMethod::NONE,
check_method: CheckingMethod::None,
delete_method: DeleteMethod::None,
min_file_size: 1024,
}
@ -121,20 +121,11 @@ impl DuplicateFinder {
pub fn get_text_messages(&self) -> &Messages {
&self.text_messages
}
pub fn get_information(&self) -> &Info {
&self.information
}
pub fn find_duplicates(&mut self) {
self.optimize_directories();
self.check_files_size();
if self.check_method == CheckingMethod::HASH {
self.check_files_hash();
}
self.delete_files();
self.debug_print();
}
pub fn set_check_method(&mut self, check_method: CheckingMethod) {
self.check_method = check_method;
}
@ -150,6 +141,20 @@ impl DuplicateFinder {
pub fn set_recursive_search(&mut self, recursive_search: bool) {
self.recursive_search = recursive_search;
}
/// Finding duplicates, save results to internal struct variables
pub fn find_duplicates(&mut self) {
self.optimize_directories();
self.check_files_size();
if self.check_method == CheckingMethod::Hash {
self.check_files_hash();
}
self.delete_files();
self.debug_print();
}
/// Setting excluded items which needs to contains * wildcrard
/// Are a lot of slower than absolute path, so it should be used to heavy
pub fn set_excluded_items(&mut self, mut excluded_items: String) {
let start_time: SystemTime = SystemTime::now();
@ -217,6 +222,8 @@ impl DuplicateFinder {
}
Common::print_time(start_time, SystemTime::now(), "set_allowed_extensions".to_string());
}
/// Setting include directories, at least one must be provided
pub fn set_include_directory(&mut self, mut include_directory: String) -> bool {
let start_time: SystemTime = SystemTime::now();
@ -271,6 +278,7 @@ impl DuplicateFinder {
true
}
/// Setting absolute path to exclude
pub fn set_exclude_directory(&mut self, mut exclude_directory: String) {
let start_time: SystemTime = SystemTime::now();
if exclude_directory.is_empty() {
@ -320,6 +328,8 @@ impl DuplicateFinder {
Common::print_time(start_time, SystemTime::now(), "set_exclude_directory".to_string());
}
/// Read file length and puts it to different boxes(each for different lengths)
/// If in box is only 1 result, then it is removed
fn check_files_size(&mut self) {
// TODO maybe add multithreading checking for file hash
let start_time: SystemTime = SystemTime::now();
@ -475,6 +485,8 @@ impl DuplicateFinder {
Common::print_time(start_time, SystemTime::now(), "check_files_size".to_string());
}
/// Saving results to provided file
pub fn save_results_to_file(&mut self, file_name: &str) -> bool {
let start_time: SystemTime = SystemTime::now();
let file_name: String = match file_name {
@ -555,7 +567,7 @@ impl DuplicateFinder {
true
}
/// Should be slower than checking in different ways, but still needs to be checked
/// The slowest checking type, which must be applied after checking for size
fn check_files_hash(&mut self) {
let start_time: SystemTime = SystemTime::now();
let mut file_handler: File;
@ -619,7 +631,7 @@ impl DuplicateFinder {
#[allow(dead_code)]
#[allow(unreachable_code)]
/// Setting include directories, panics when there is not directories available
/// Debugging printing - only available on debug build
fn debug_print(&self) {
#[cfg(not(debug_assertions))]
{
@ -671,13 +683,14 @@ impl DuplicateFinder {
}
/// Print information's about duplicated entries
/// Only needed for CLI
pub fn print_duplicated_entries(&self) {
let start_time: SystemTime = SystemTime::now();
let mut number_of_files: u64 = 0;
let mut number_of_groups: u64 = 0;
match self.check_method {
CheckingMethod::HASH => {
CheckingMethod::Hash => {
for (_size, vector) in self.files_with_identical_hashes.iter() {
for j in vector {
number_of_files += j.len() as u64;
@ -701,7 +714,7 @@ impl DuplicateFinder {
println!();
}
}
CheckingMethod::SIZE => {
CheckingMethod::Size => {
for i in &self.files_with_identical_size {
number_of_files += i.1.len() as u64;
number_of_groups += 1;
@ -720,13 +733,14 @@ impl DuplicateFinder {
println!();
}
}
CheckingMethod::NONE => {
panic!("Checking Method shouldn't be ever set to NONE");
CheckingMethod::None => {
panic!("Checking Method shouldn't be ever set to None");
}
}
Common::print_time(start_time, SystemTime::now(), "print_duplicated_entries".to_string());
}
/// Remove unused entries when included or excluded overlaps with each other or are duplicated
/// Remove unused entries when included or excluded overlaps with each other or are duplicated etc.
fn optimize_directories(&mut self) -> bool {
let start_time: SystemTime = SystemTime::now();
@ -850,11 +864,13 @@ impl DuplicateFinder {
true
}
/// Function to delete files, from filed before BTreeMap
/// Using another function to delete files to avoid duplicates data
fn delete_files(&mut self) {
let start_time: SystemTime = SystemTime::now();
match self.check_method {
CheckingMethod::HASH => {
CheckingMethod::Hash => {
for entry in &self.files_with_identical_hashes {
for vector in entry.1 {
let tuple: (u64, usize, usize) = delete_files(&vector, &self.delete_method, &mut self.text_messages.warnings);
@ -864,7 +880,7 @@ impl DuplicateFinder {
}
}
}
CheckingMethod::SIZE => {
CheckingMethod::Size => {
for entry in &self.files_with_identical_size {
let tuple: (u64, usize, usize) = delete_files(&entry.1, &self.delete_method, &mut self.text_messages.warnings);
self.information.gained_space += tuple.0;
@ -872,7 +888,7 @@ impl DuplicateFinder {
self.information.number_of_failed_to_remove_files += tuple.2;
}
}
CheckingMethod::NONE => {
CheckingMethod::None => {
//Just do nothing
panic!("Checking method should never be none.");
}
@ -887,6 +903,8 @@ impl Default for DuplicateFinder {
}
}
/// Functions to remove slice(vector) of files with provided method
/// Returns size of removed elements, number of deleted and failed to delete files and modified warning list
fn delete_files(vector: &[FileEntry], delete_method: &DeleteMethod, warnings: &mut Vec<String>) -> (u64, usize, usize) {
assert!(vector.len() > 1, "Vector length must be bigger than 1(This should be done in previous steps).");
let mut q_index: usize = 0;

14
czkawka_gui/src/main.rs
View file

@ -250,7 +250,7 @@ fn main() {
// TODO Change to proper value
let mut df = DuplicateFinder::new();
let check_method = duplicate::CheckingMethod::HASH; // TODO
let check_method = duplicate::CheckingMethod::Hash; // TODO
{
df.set_include_directory(get_string_from_list_store(&scrolled_window_included_directories));
df.set_exclude_directory(get_string_from_list_store(&scrolled_window_excluded_directories));
@ -272,17 +272,17 @@ fn main() {
let duplicates_group: usize;
match check_method {
duplicate::CheckingMethod::HASH => {
CheckingMethod::Hash => {
duplicates_number = information.number_of_duplicated_files_by_hash;
duplicates_size = information.lost_space_by_hash;
duplicates_group = information.number_of_groups_by_hash;
}
duplicate::CheckingMethod::SIZE => {
CheckingMethod::Size => {
duplicates_number = information.number_of_duplicated_files_by_size;
duplicates_size = information.lost_space_by_size;
duplicates_group = information.number_of_groups_by_size;
}
duplicate::CheckingMethod::NONE => {
CheckingMethod::None => {
panic!();
}
}
@ -308,7 +308,7 @@ fn main() {
let col_indices = [0, 1, 2];
match check_method {
CheckingMethod::HASH => {
CheckingMethod::Hash => {
let btreemap = df.get_files_sorted_by_hash();
for (size, vectors_vector) in btreemap.iter().rev() {
@ -333,7 +333,7 @@ fn main() {
}
}
}
CheckingMethod::SIZE => {
CheckingMethod::Size => {
let btreemap = df.get_files_sorted_by_size();
for (size, vector) in btreemap.iter().rev() {
@ -356,7 +356,7 @@ fn main() {
}
}
}
CheckingMethod::NONE => {
CheckingMethod::None => {
panic!();
}
}