CodeMirror
/
czkawka
mirror of
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update Rust to 1.54

This commit is contained in:
Rafał Mikrut 2021-07-29 21:09:44 +02:00
parent 0e9b8a1651
commit 03d3beb697
11 changed files with 58 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1473,9 +1473,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
[[package]]
name = "open"
version = "1.7.1"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcea7a30d6b81a2423cc59c43554880feff7b57d12916f231a79f8d6d9470201"
checksum = "970d0e0b8f5f39e6090f3d612e3a17b8e02b91c860fe9eb33665d1aed1f6f37f"
dependencies = [
"pathdiff",
"winapi",

8
czkawka_core/src/duplicate.rs
View File

@ -699,7 +699,7 @@ impl DuplicateFinder {
check_was_breaked.store(true, Ordering::Relaxed);
return None;
}
match hash_calculation(&mut buffer, &file_entry, &check_type, 0) {
match hash_calculation(&mut buffer, file_entry, &check_type, 0) {
Ok((hash_string, bytes)) => {
bytes_read += bytes;
hashmap_with_hash.entry(hash_string.clone()).or_insert_with(Vec::new);
@ -792,7 +792,7 @@ impl DuplicateFinder {
return None;
}
match hash_calculation(&mut buffer, &file_entry, &check_type, HASH_MB_LIMIT_BYTES) {
match hash_calculation(&mut buffer, file_entry, &check_type, HASH_MB_LIMIT_BYTES) {
Ok((hash_string, bytes)) => {
bytes_read += bytes;
hashmap_with_hash.entry(hash_string.to_string()).or_insert_with(Vec::new);
@ -864,7 +864,7 @@ impl DuplicateFinder {
return None;
}
match hash_calculation(&mut buffer, &file_entry, &check_type, u64::MAX) {
match hash_calculation(&mut buffer, file_entry, &check_type, u64::MAX) {
Ok((hash_string, bytes)) => {
bytes_read += bytes;
let mut file_entry = file_entry.clone();
@ -1278,7 +1278,7 @@ fn delete_files(vector: &[FileEntry], delete_method: &DeleteMethod, text_message
if dryrun {
Ok(Some(format!("Replace file {} with hard link to {}", file.path.display(), src.display())))
} else {
make_hard_link(&src, &file.path).map(|_| None)
make_hard_link(src, &file.path).map(|_| None)
}
}
DeleteMethod::None => Ok(None),

2
czkawka_core/src/similar_images.rs
View File

@ -410,7 +410,7 @@ impl SimilarImages {
let hash = hasher.hash_image(&image);
let mut buf = [0u8; 8];
buf.copy_from_slice(&hash.as_bytes());
buf.copy_from_slice(hash.as_bytes());
if buf.iter().all(|e| *e == 0) {
// A little broken image
return Some(None);

2
czkawka_gui/Cargo.toml
View File

@ -26,7 +26,7 @@ futures = "0.3.15"
directories-next = "2.0.0"
# For opening files
open = "1.7.1"
open = "2.0.0"
# To get image preview
image = "0.23.14"

10
czkawka_gui/src/connect_button_delete.rs
View File

@ -201,7 +201,7 @@ pub fn check_if_can_delete_files(check_button_settings_confirm_deletion: &gtk::C
}
pub fn check_if_deleting_all_files_in_group(tree_view: &gtk::TreeView, column_color: i32, column_selection: i32, window_main: &gtk::Window, check_button_settings_confirm_group_deletion: &gtk::CheckButton) -> bool {
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
let mut selected_all_records: bool = true;
@ -283,7 +283,7 @@ pub fn empty_folder_remover(tree_view: &gtk::TreeView, column_file_name: i32, co
let text_view_errors = gui_data.text_view_errors.clone();
let use_trash = gui_data.settings.check_button_settings_use_trash.clone().is_active();
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
let mut selected_rows = Vec::new();
@ -384,7 +384,7 @@ pub fn basic_remove(tree_view: &gtk::TreeView, column_file_name: i32, column_pat
let text_view_errors = gui_data.text_view_errors.clone();
let use_trash = gui_data.settings.check_button_settings_use_trash.clone().is_active();
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
let mut messages: String = "".to_string();
@ -434,7 +434,7 @@ pub fn tree_remove(tree_view: &gtk::TreeView, column_file_name: i32, column_path
let text_view_errors = gui_data.text_view_errors.clone();
let use_trash = gui_data.settings.check_button_settings_use_trash.clone().is_active();
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
let mut messages: String = "".to_string();
@ -554,7 +554,7 @@ pub fn tree_remove(tree_view: &gtk::TreeView, column_file_name: i32, column_path
}
}
for tree_path in vec_tree_path_to_delete.iter().rev() {
model.remove(&model.iter(&tree_path).unwrap());
model.remove(&model.iter(tree_path).unwrap());
}
}

2
czkawka_gui/src/connect_button_hardlink.rs
View File

@ -189,7 +189,7 @@ fn hardlink(tree_view: gtk::TreeView, column_file_name: i32, column_path: i32, c
}
}
for tree_path in vec_tree_path_to_delete.iter().rev() {
list_store.remove(&list_store.iter(&tree_path).unwrap());
list_store.remove(&list_store.iter(tree_path).unwrap());
}
}

2
czkawka_gui/src/connect_button_symlink.rs
View File

@ -210,7 +210,7 @@ fn symlink(tree_view: gtk::TreeView, column_file_name: i32, column_path: i32, co
}
}
for tree_path in vec_tree_path_to_delete.iter().rev() {
list_store.remove(&list_store.iter(&tree_path).unwrap());
list_store.remove(&list_store.iter(tree_path).unwrap());
}
}

46
czkawka_gui/src/connect_popovers.rs
View File

@ -10,7 +10,7 @@ use gtk::TreeIter;
// e.g. 'tar.gz' will be selected instead 'tar.gz (copy)' etc.
fn popover_select_all(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_button_selection: u32) {
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
if let Some(iter) = model.iter_first() {
loop {
@ -24,7 +24,7 @@ fn popover_select_all(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_
popover.popdown();
}
fn popover_unselect_all(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_button_selection: u32) {
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
if let Some(iter) = model.iter_first() {
loop {
@ -38,7 +38,7 @@ fn popover_unselect_all(popover: &gtk::Popover, tree_view: &gtk::TreeView, colum
popover.popdown();
}
fn popover_reverse(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_button_selection: u32) {
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
if let Some(iter) = model.iter_first() {
loop {
@ -54,7 +54,7 @@ fn popover_reverse(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_but
}
fn popover_all_except_oldest(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_color: i32, column_modification_as_secs: i32, column_file_name: i32, column_button_selection: u32) {
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
if let Some(iter) = model.iter_first() {
let mut end: bool = false;
@ -95,9 +95,9 @@ fn popover_all_except_oldest(popover: &gtk::Popover, tree_view: &gtk::TreeView,
}
for (index, tree_iter) in tree_iter_array.iter().enumerate() {
if index != oldest_index.unwrap() {
model.set_value(&tree_iter, column_button_selection, &true.to_value());
model.set_value(tree_iter, column_button_selection, &true.to_value());
} else {
model.set_value(&tree_iter, column_button_selection, &false.to_value());
model.set_value(tree_iter, column_button_selection, &false.to_value());
}
}
@ -110,7 +110,7 @@ fn popover_all_except_oldest(popover: &gtk::Popover, tree_view: &gtk::TreeView,
popover.popdown();
}
fn popover_all_except_newest(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_color: i32, column_modification_as_secs: i32, column_file_name: i32, column_button_selection: u32) {
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
if let Some(iter) = model.iter_first() {
let mut end: bool = false;
@ -151,9 +151,9 @@ fn popover_all_except_newest(popover: &gtk::Popover, tree_view: &gtk::TreeView,
}
for (index, tree_iter) in tree_iter_array.iter().enumerate() {
if index != newest_index.unwrap() {
model.set_value(&tree_iter, column_button_selection, &true.to_value());
model.set_value(tree_iter, column_button_selection, &true.to_value());
} else {
model.set_value(&tree_iter, column_button_selection, &false.to_value());
model.set_value(tree_iter, column_button_selection, &false.to_value());
}
}
@ -166,7 +166,7 @@ fn popover_all_except_newest(popover: &gtk::Popover, tree_view: &gtk::TreeView,
popover.popdown();
}
fn popover_one_oldest(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_color: i32, column_modification_as_secs: i32, column_file_name: i32, column_button_selection: u32) {
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
if let Some(iter) = model.iter_first() {
let mut end: bool = false;
@ -207,9 +207,9 @@ fn popover_one_oldest(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_
}
for (index, tree_iter) in tree_iter_array.iter().enumerate() {
if index == oldest_index.unwrap() {
model.set_value(&tree_iter, column_button_selection, &true.to_value());
model.set_value(tree_iter, column_button_selection, &true.to_value());
} else {
model.set_value(&tree_iter, column_button_selection, &false.to_value());
model.set_value(tree_iter, column_button_selection, &false.to_value());
}
}
@ -222,7 +222,7 @@ fn popover_one_oldest(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_
popover.popdown();
}
fn popover_one_newest(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_color: i32, column_modification_as_secs: i32, column_file_name: i32, column_button_selection: u32) {
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
if let Some(iter) = model.iter_first() {
let mut end: bool = false;
@ -262,9 +262,9 @@ fn popover_one_newest(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_
}
for (index, tree_iter) in tree_iter_array.iter().enumerate() {
if index == newest_index.unwrap() {
model.set_value(&tree_iter, column_button_selection, &true.to_value());
model.set_value(tree_iter, column_button_selection, &true.to_value());
} else {
model.set_value(&tree_iter, column_button_selection, &false.to_value());
model.set_value(tree_iter, column_button_selection, &false.to_value());
}
}
@ -356,7 +356,7 @@ fn popover_select_custom(popover: &gtk::Popover, gui_data: &GuiData, tree_view:
#[cfg(target_family = "windows")]
let wildcard = wildcard.as_str();
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
let iter = model.iter_first().unwrap(); // Never should be available button where there is no available records
@ -474,7 +474,7 @@ fn popover_unselect_custom(popover: &gtk::Popover, gui_data: &GuiData, tree_view
#[cfg(target_family = "windows")]
let wildcard = wildcard.as_str();
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
let iter = model.iter_first().unwrap(); // Never should be available button where there is no available records
@ -517,7 +517,7 @@ fn popover_unselect_custom(popover: &gtk::Popover, gui_data: &GuiData, tree_view
}
fn popover_all_except_biggest(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_color: i32, column_size_as_bytes: i32, column_dimensions: i32, column_button_selection: u32) {
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
if let Some(iter) = model.iter_first() {
let mut end: bool = false;
@ -561,9 +561,9 @@ fn popover_all_except_biggest(popover: &gtk::Popover, tree_view: &gtk::TreeView,
}
for (index, tree_iter) in tree_iter_array.iter().enumerate() {
if index != biggest_index.unwrap() {
model.set_value(&tree_iter, column_button_selection, &true.to_value());
model.set_value(tree_iter, column_button_selection, &true.to_value());
} else {
model.set_value(&tree_iter, column_button_selection, &false.to_value());
model.set_value(tree_iter, column_button_selection, &false.to_value());
}
}
@ -576,7 +576,7 @@ fn popover_all_except_biggest(popover: &gtk::Popover, tree_view: &gtk::TreeView,
popover.popdown();
}
fn popover_all_except_smallest(popover: &gtk::Popover, tree_view: &gtk::TreeView, column_color: i32, column_size_as_bytes: i32, column_dimensions: i32, column_button_selection: u32) {
let model = get_list_store(&tree_view);
let model = get_list_store(tree_view);
if let Some(iter) = model.iter_first() {
let mut end: bool = false;
@ -620,9 +620,9 @@ fn popover_all_except_smallest(popover: &gtk::Popover, tree_view: &gtk::TreeView
}
for (index, tree_iter) in tree_iter_array.iter().enumerate() {
if index != smallest_index.unwrap() {
model.set_value(&tree_iter, column_button_selection, &true.to_value());
model.set_value(tree_iter, column_button_selection, &true.to_value());
} else {
model.set_value(&tree_iter, column_button_selection, &false.to_value());
model.set_value(tree_iter, column_button_selection, &false.to_value());
}
}

11
czkawka_gui/src/double_click_opening.rs
View File

@ -175,15 +175,8 @@ pub fn common_open_function(tree_view: &gtk::TreeView, column_name: i32, column_
}
}
match open::that(&end_path) {
Ok(t) => {
if !t.success() {
println!("Failed to open {}, status {:?}", end_path, t.code());
}
}
Err(_) => {
println!("Failed to open {}", end_path);
}
if let Err(e) = open::that(&end_path) {
println!("Failed to open {} - Error {}", end_path, e);
}
}
}

2
czkawka_gui/src/help_functions.rs
View File

@ -134,7 +134,7 @@ pub const HEADER_ROW_COLOR: &str = "#272727";
//pub const HEADER_ROW_COLOR: &str = "#010101"; // TEST
pub fn get_string_from_list_store(tree_view: &gtk::TreeView) -> Vec<String> {
let list_store: gtk::ListStore = get_list_store(&tree_view);
let list_store: gtk::ListStore = get_list_store(tree_view);
let mut string_vector: Vec<String> = Vec::new();

34
czkawka_gui/src/initialize_gui.rs
View File

@ -114,7 +114,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
return gtk::Inhibit(false);
}
tree_remove(
&tree_view,
tree_view,
ColumnsDuplicates::Name as i32,
ColumnsDuplicates::Path as i32,
ColumnsDuplicates::Color as i32,
@ -149,7 +149,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
if let Some(button_number) = e.keycode() {
// Handle delete button
if button_number == 119 {
empty_folder_remover(&tree_view, ColumnsEmptyFolders::Name as i32, ColumnsEmptyFolders::Path as i32, ColumnsEmptyFolders::ActiveSelectButton as i32, &gui_data);
empty_folder_remover(tree_view, ColumnsEmptyFolders::Name as i32, ColumnsEmptyFolders::Path as i32, ColumnsEmptyFolders::ActiveSelectButton as i32, &gui_data);
}
}
gtk::Inhibit(false)
@ -178,7 +178,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
if let Some(button_number) = e.keycode() {
// Handle delete button
if button_number == 119 {
basic_remove(&tree_view, ColumnsEmptyFiles::Name as i32, ColumnsEmptyFiles::Path as i32, ColumnsEmptyFiles::ActiveSelectButton as i32, &gui_data);
basic_remove(tree_view, ColumnsEmptyFiles::Name as i32, ColumnsEmptyFiles::Path as i32, ColumnsEmptyFiles::ActiveSelectButton as i32, &gui_data);
}
}
gtk::Inhibit(false)
@ -207,7 +207,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
if let Some(button_number) = e.keycode() {
// Handle delete button
if button_number == 119 {
basic_remove(&tree_view, ColumnsTemporaryFiles::Name as i32, ColumnsTemporaryFiles::Path as i32, ColumnsTemporaryFiles::ActiveSelectButton as i32, &gui_data);
basic_remove(tree_view, ColumnsTemporaryFiles::Name as i32, ColumnsTemporaryFiles::Path as i32, ColumnsTemporaryFiles::ActiveSelectButton as i32, &gui_data);
}
}
gtk::Inhibit(false)
@ -236,7 +236,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
if let Some(button_number) = e.keycode() {
// Handle delete button
if button_number == 119 {
basic_remove(&tree_view, ColumnsBigFiles::Name as i32, ColumnsBigFiles::Path as i32, ColumnsBigFiles::ActiveSelectButton as i32, &gui_data);
basic_remove(tree_view, ColumnsBigFiles::Name as i32, ColumnsBigFiles::Path as i32, ColumnsBigFiles::ActiveSelectButton as i32, &gui_data);
}
}
gtk::Inhibit(false)
@ -307,7 +307,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
return gtk::Inhibit(false);
}
tree_remove(
&tree_view,
tree_view,
ColumnsSimilarImages::Name as i32,
ColumnsSimilarImages::Path as i32,
ColumnsSimilarImages::Color as i32,
@ -351,7 +351,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
if let Some(button_number) = e.keycode() {
// Handle delete button
if button_number == 119 {
basic_remove(&tree_view, ColumnsZeroedFiles::Name as i32, ColumnsZeroedFiles::Path as i32, ColumnsZeroedFiles::ActiveSelectButton as i32, &gui_data);
basic_remove(tree_view, ColumnsZeroedFiles::Name as i32, ColumnsZeroedFiles::Path as i32, ColumnsZeroedFiles::ActiveSelectButton as i32, &gui_data);
}
}
gtk::Inhibit(false)
@ -415,7 +415,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
return gtk::Inhibit(false);
}
tree_remove(
&tree_view,
tree_view,
ColumnsSameMusic::Name as i32,
ColumnsSameMusic::Path as i32,
ColumnsSameMusic::Color as i32,
@ -457,7 +457,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
if let Some(button_number) = e.keycode() {
// Handle delete button
if button_number == 119 {
basic_remove(&tree_view, ColumnsInvalidSymlinks::Name as i32, ColumnsInvalidSymlinks::Path as i32, ColumnsInvalidSymlinks::ActiveSelectButton as i32, &gui_data);
basic_remove(tree_view, ColumnsInvalidSymlinks::Name as i32, ColumnsInvalidSymlinks::Path as i32, ColumnsInvalidSymlinks::ActiveSelectButton as i32, &gui_data);
}
}
gtk::Inhibit(false)
@ -486,7 +486,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
if let Some(button_number) = e.keycode() {
// Handle delete button
if button_number == 119 {
basic_remove(&tree_view, ColumnsBrokenFiles::Name as i32, ColumnsBrokenFiles::Path as i32, ColumnsBrokenFiles::ActiveSelectButton as i32, &gui_data);
basic_remove(tree_view, ColumnsBrokenFiles::Name as i32, ColumnsBrokenFiles::Path as i32, ColumnsBrokenFiles::ActiveSelectButton as i32, &gui_data);
}
}
gtk::Inhibit(false)
@ -519,7 +519,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
if let Some(button_number) = e.keycode() {
// Handle delete button
if button_number == 119 {
let list_store = get_list_store(&tree_view);
let list_store = get_list_store(tree_view);
let selection = tree_view.selection();
let (vec_tree_path, _tree_model) = selection.selected_rows();
@ -551,7 +551,7 @@ pub fn initialize_gui(gui_data: &mut GuiData) {
if let Some(button_number) = e.keycode() {
// Handle delete button
if button_number == 119 {
let list_store = get_list_store(&tree_view);
let list_store = get_list_store(tree_view);
let selection = tree_view.selection();
let (vec_tree_path, _tree_model) = selection.selected_rows();
@ -594,11 +594,11 @@ fn show_preview(tree_view: &TreeView, text_view_errors: &TextView, check_button_
let cache_dir = proj_dirs.cache_dir();
if cache_dir.exists() {
if !cache_dir.is_dir() {
add_text_to_text_view(&text_view_errors, format!("Path {} doesn't point at folder, which is needed by image preview", cache_dir.display()).as_str());
add_text_to_text_view(text_view_errors, format!("Path {} doesn't point at folder, which is needed by image preview", cache_dir.display()).as_str());
break 'dir;
}
} else if fs::create_dir_all(cache_dir).is_err() {
add_text_to_text_view(&text_view_errors, format!("Failed to create dir {} needed by image preview", cache_dir.display()).as_str());
add_text_to_text_view(text_view_errors, format!("Failed to create dir {} needed by image preview", cache_dir.display()).as_str());
break 'dir;
}
let path = tree_model.value(&tree_model.iter(&tree_path).unwrap(), ColumnsSimilarImages::Path as i32).get::<String>().unwrap();
@ -611,12 +611,12 @@ fn show_preview(tree_view: &TreeView, text_view_errors: &TextView, check_button_
let img = match image::open(&file_name) {
Ok(t) => t,
Err(_) => {
add_text_to_text_view(&text_view_errors, format!("Failed to open temporary image file {}", file_name).as_str());
add_text_to_text_view(text_view_errors, format!("Failed to open temporary image file {}", file_name).as_str());
break 'dir;
}
};
if img.width() == 0 || img.height() == 0 {
add_text_to_text_view(&text_view_errors, format!("Cannot create preview of image {}, with 0 width or height", file_name).as_str());
add_text_to_text_view(text_view_errors, format!("Cannot create preview of image {}, with 0 width or height", file_name).as_str());
break 'dir;
}
let ratio = img.width() / img.height();
@ -639,7 +639,7 @@ fn show_preview(tree_view: &TreeView, text_view_errors: &TextView, check_button_
let img = img.resize(new_size.0, new_size.1, FilterType::Triangle);
let file_dir = cache_dir.join(format!("cached_file.{}", extension.to_string_lossy()));
if img.save(&file_dir).is_err() {
add_text_to_text_view(&text_view_errors, format!("Failed to save temporary image file to {}", file_dir.display()).as_str());
add_text_to_text_view(text_view_errors, format!("Failed to save temporary image file to {}", file_dir.display()).as_str());
break 'dir;
}
let string_dir = file_dir.to_string_lossy().to_string();