From de1dc2794a4f5f0d5550b125bdc735bdfc5d309b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= Date: Sat, 10 Feb 2024 12:30:47 +0100 Subject: [PATCH] Dup --- Cargo.lock | 100 ++++++++++++++++++----------- czkawka_gui/Cargo.toml | 2 +- czkawka_gui/src/compute_results.rs | 66 +++++++++---------- 3 files changed, 97 insertions(+), 71 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 75b52e3..cde8c0d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -229,13 +229,13 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.3", - "event-listener-strategy", + "event-listener 5.0.0", + "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", ] @@ -332,7 +332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ "event-listener 4.0.3", - "event-listener-strategy", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -601,9 +601,9 @@ checksum = "bf8dba2868114ed769a1f2590fc9ae5eb331175b44313b6c9b922f8f7ca813d0" [[package]] name = "bytemuck" -version = "1.14.2" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea31d69bda4949c1c1562c1e6f042a1caefac98cdc8a298260a2ff41c1e2d42b" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" dependencies = [ "bytemuck_derive", ] @@ -749,9 +749,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.6" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", "target-lexicon", @@ -821,9 +821,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", "clap_derive", @@ -831,21 +831,21 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.0", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", @@ -855,9 +855,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clipboard-win" @@ -1321,7 +1321,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -1597,9 +1597,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "encode_unicode" @@ -1701,6 +1701,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72557800024fabbaa2449dd4bf24e37b93702d457a4d4f2b0dd1f0f039f20c1" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + [[package]] name = "event-listener-strategy" version = "0.4.0" @@ -1711,6 +1722,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.0.0", + "pin-project-lite", +] + [[package]] name = "exr" version = "1.72.0" @@ -1930,9 +1951,9 @@ dependencies = [ [[package]] name = "fontdb" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b88c54a38407f7352dd2c4238830115a6377741098ffd1f997c813d0e088a6" +checksum = "3890d0893c8253d3eb98337af18b3e1a10a9b2958f2a164b53a93fb3a3049e72" dependencies = [ "fontconfig-parser", "log", @@ -2960,7 +2981,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 2.0.48", "unic-langid", ] @@ -3113,9 +3134,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -3287,9 +3308,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] @@ -3876,19 +3897,18 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -5127,9 +5147,9 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smithay-client-toolkit" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ "bitflags 2.4.2", "calloop", @@ -5304,6 +5324,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + [[package]] name = "strum" version = "0.26.1" @@ -5878,9 +5904,9 @@ dependencies = [ [[package]] name = "trash" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55bb920006929bc37df8c151c3c063b6fc10f485dfe4937393f905861a632e53" +checksum = "9e0434017970a3b6770ee6f0117e9a7afe25b02e540fab01759e137e508e2f81" dependencies = [ "chrono", "libc", diff --git a/czkawka_gui/Cargo.toml b/czkawka_gui/Cargo.toml index 5a260bb..1bc9b5b 100644 --- a/czkawka_gui/Cargo.toml +++ b/czkawka_gui/Cargo.toml @@ -36,7 +36,7 @@ regex = "1.10" image_hasher = "1.2" # Move files to trash -trash = "3.2" +trash = "3.3" # For moving files(why std::fs doesn't have such features?) fs_extra = "1.3" diff --git a/czkawka_gui/src/compute_results.rs b/czkawka_gui/src/compute_results.rs index 4520378..23d713c 100644 --- a/czkawka_gui/src/compute_results.rs +++ b/czkawka_gui/src/compute_results.rs @@ -97,7 +97,7 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver { - computer_duplicate_finder( + compute_duplicate_finder( df, &entry_info, &tree_view_duplicate_finder, @@ -109,7 +109,7 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver { - computer_empty_folders( + compute_empty_folders( ef, &entry_info, &tree_view_empty_folder_finder, @@ -121,7 +121,7 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver { - computer_empty_files( + compute_empty_files( vf, &entry_info, &tree_view_empty_files_finder, @@ -133,7 +133,7 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver { - computer_big_files( + compute_big_files( bf, &entry_info, &tree_view_big_files_finder, @@ -145,7 +145,7 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver { - computer_temporary_files( + compute_temporary_files( tf, &entry_info, &tree_view_temporary_files_finder, @@ -157,7 +157,7 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver { - computer_similar_images( + compute_similar_images( sf, &entry_info, &tree_view_similar_images_finder, @@ -170,7 +170,7 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver { - computer_similar_videos( + compute_similar_videos( ff, &entry_info, &tree_view_similar_videos_finder, @@ -182,7 +182,7 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver { - computer_same_music( + compute_same_music( mf, &entry_info, &tree_view_same_music_finder, @@ -194,7 +194,7 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver { - computer_invalid_symlinks( + compute_invalid_symlinks( ifs, &entry_info, &tree_view_invalid_symlinks, @@ -206,7 +206,7 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver { - computer_broken_files( + compute_broken_files( br, &entry_info, &tree_view_broken_files, @@ -218,7 +218,7 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver { - computer_bad_extensions( + compute_bad_extensions( be, &entry_info, &tree_view_bad_extensions, @@ -239,8 +239,8 @@ pub fn connect_compute_results(gui_data: &GuiData, result_receiver: Receiver