CodeMirror/czkawka
1
0
Fork 0
mirror of synced 2024-06-14 16:35:23 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
Meir Klemfner 2020-10-04 01:27:42 +03:00 committed by GitHub
parent 85a0ec761f 8d263fdff2
commit f33cdf78a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 47 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
czkawka_cli/src/main.rs
View file

@ -46,7 +46,7 @@ fn main() {
df.set_included_directory(path_list_to_str(directories.directories));
df.set_excluded_directory(path_list_to_str(excluded_directories.excluded_directories));
df.set_excluded_items(path_list_to_str(excluded_items.excluded_items));
df.set_min_file_size(min_size);
df.set_minimal_file_size(min_size);
df.set_allowed_extensions(allowed_extensions.allowed_extensions.join(","));
df.set_check_method(search_method);
df.set_delete_method(delete_method);

8
czkawka_core/src/big_file.rs
View file

@ -207,7 +207,13 @@ impl BigFile {
path: current_file_name.clone(),
size: metadata.len(),
modified_date: match metadata.modified() {
Ok(t) => t.duration_since(UNIX_EPOCH).expect("Invalid file date").as_secs(),
Ok(t) => match t.duration_since(UNIX_EPOCH) {
Ok(d) => d.as_secs(),
Err(_) => {
self.text_messages.warnings.push(format!("File {} seems to be modified before Unix Epoch.", current_file_name));
0
}
},
Err(_) => {
self.text_messages.warnings.push("Unable to get modification date from file ".to_string() + current_file_name.as_str());
continue;

23
czkawka_core/src/duplicate.rs
View file

@ -92,7 +92,7 @@ pub struct DuplicateFinder {
allowed_extensions: Extensions,
excluded_items: ExcludedItems,
recursive_search: bool,
min_file_size: u64,
minimal_file_size: u64,
check_method: CheckingMethod,
delete_method: DeleteMethod,
}
@ -108,7 +108,7 @@ impl DuplicateFinder {
allowed_extensions: Extensions::new(),
check_method: CheckingMethod::None,
delete_method: DeleteMethod::None,
min_file_size: 1024,
minimal_file_size: 1024,
directories: Directories::new(),
excluded_items: ExcludedItems::new(),
}
@ -149,8 +149,11 @@ impl DuplicateFinder {
self.delete_method = delete_method;
}
pub fn set_min_file_size(&mut self, min_size: u64) {
self.min_file_size = min_size;
pub fn set_minimal_file_size(&mut self, minimal_file_size: u64) {
self.minimal_file_size = match minimal_file_size {
0 => 1,
t => t,
};
}
pub fn set_recursive_search(&mut self, recursive_search: bool) {
@ -266,7 +269,7 @@ impl DuplicateFinder {
}
// Checking files
if metadata.len() >= self.min_file_size && have_valid_extension {
if metadata.len() >= self.minimal_file_size && have_valid_extension {
let current_file_name = "".to_owned() + &current_folder + &entry_data.file_name().into_string().unwrap();
// Checking expressions
@ -286,7 +289,13 @@ impl DuplicateFinder {
path: current_file_name.clone(),
size: metadata.len(),
modified_date: match metadata.modified() {
Ok(t) => t.duration_since(UNIX_EPOCH).expect("Invalid file date").as_secs(),
Ok(t) => match t.duration_since(UNIX_EPOCH) {
Ok(d) => d.as_secs(),
Err(_) => {
self.text_messages.warnings.push(format!("File {} seems to be modified before Unix Epoch.", current_file_name));
0
}
},
Err(_) => {
self.text_messages.warnings.push("Unable to get modification date from file ".to_string() + current_file_name.as_str());
continue;
@ -486,7 +495,7 @@ impl DebugPrint for DuplicateFinder {
println!("Included directories - {:?}", self.directories.included_directories);
println!("Excluded directories - {:?}", self.directories.excluded_directories);
println!("Recursive search - {}", self.recursive_search.to_string());
println!("Minimum file size - {:?}", self.min_file_size);
println!("Minimum file size - {:?}", self.minimal_file_size);
println!("Checking Method - {:?}", self.check_method);
println!("Delete Method - {:?}", self.delete_method);
println!("-----------------------------------------");

8
czkawka_core/src/empty_files.rs
View file

@ -232,7 +232,13 @@ impl EmptyFiles {
let fe: FileEntry = FileEntry {
path: current_file_name.clone(),
modified_date: match metadata.modified() {
Ok(t) => t.duration_since(UNIX_EPOCH).expect("Invalid file date").as_secs(),
Ok(t) => match t.duration_since(UNIX_EPOCH) {
Ok(d) => d.as_secs(),
Err(_) => {
self.text_messages.warnings.push(format!("File {} seems to be modified before Unix Epoch.", current_file_name));
0
}
},
Err(_) => {
self.text_messages.warnings.push("Unable to get modification date from file ".to_string() + current_file_name.as_str());
continue;

8
czkawka_core/src/empty_folder.rs
View file

@ -182,7 +182,13 @@ impl EmptyFolder {
parent_path: Option::from(current_folder.clone()),
is_empty: FolderEmptiness::Maybe,
modified_date: match metadata.modified() {
Ok(t) => t.duration_since(UNIX_EPOCH).expect("Invalid file date").as_secs(),
Ok(t) => match t.duration_since(UNIX_EPOCH) {
Ok(d) => d.as_secs(),
Err(_) => {
self.text_messages.warnings.push(format!("Folder {} seems to be modified before Unix Epoch.", current_folder));
0
}
},
Err(_) => {
self.text_messages.warnings.push(format!("Failed to read modification date of folder {}", current_folder));
continue;

2
czkawka_core/src/lib.rs
View file

@ -11,4 +11,4 @@ pub mod common_items;
pub mod common_messages;
pub mod common_traits;
pub const CZKAWKA_VERSION: &str = "1.0.0";
pub const CZKAWKA_VERSION: &str = env!("CARGO_PKG_VERSION");

8
czkawka_core/src/temporary.rs
View file

@ -222,7 +222,13 @@ impl Temporary {
let fe: FileEntry = FileEntry {
path: current_file_name.clone(),
modified_date: match metadata.modified() {
Ok(t) => t.duration_since(UNIX_EPOCH).expect("Invalid file date").as_secs(),
Ok(t) => match t.duration_since(UNIX_EPOCH) {
Ok(d) => d.as_secs(),
Err(_) => {
self.text_messages.warnings.push(format!("File {} seems to be modified before Unix Epoch.", current_file_name));
0
}
},
Err(_) => {
self.text_messages.warnings.push("Unable to get modification date from file ".to_string() + current_file_name.as_str());
continue;

2
czkawka_gui/src/main.rs
View file

@ -421,7 +421,7 @@ fn main() {
df.set_recursive_search(check_button_recursive.get_active());
df.set_excluded_items(entry_excluded_items.get_text().as_str().to_string());
df.set_allowed_extensions(entry_allowed_extensions.get_text().as_str().to_string());
df.set_min_file_size(match entry_duplicate_minimal_size.get_text().as_str().parse::<u64>() {
df.set_minimal_file_size(match entry_duplicate_minimal_size.get_text().as_str().parse::<u64>() {
Ok(t) => t,
Err(_) => 1024, // By default
});