DB

8 months ago · 4efc452e97
parent 3c67a35850
commit 4efc452e97
8 changed files with 71 additions and 59 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -51,9 +51,9 @@ dependencies = [

 [[package]]
 name = "anstream"
-version = "0.5.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@ -65,15 +65,15 @@ dependencies = [

 [[package]]
 name = "anstyle"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"

 [[package]]
 name = "anstyle-parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
 dependencies = [
 "utf8parse",
 ]
@ -89,9 +89,9 @@ dependencies = [

 [[package]]
 name = "anstyle-wincon"
-version = "2.1.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
 "anstyle",
 "windows-sys",
@ -368,9 +368,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.4.4"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
 dependencies = [
 "clap_builder",
 "clap_derive",
@ -378,9 +378,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.4.4"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
 "anstream",
 "anstyle",
@ -418,6 +418,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"

+[[package]]
+name = "const_fn"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@ -605,7 +611,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
 "cfg-if",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
 "lock_api",
 "once_cell",
 "parking_lot_core",
@ -766,9 +772,9 @@ dependencies = [

 [[package]]
 name = "fastrand"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"

 [[package]]
 name = "fax"
@ -1349,14 +1355,14 @@ checksum = "65043da274378d68241eb9a8f8f8aa54e349136f7b8e12f63e3ef44043cc30e1"

 [[package]]
 name = "handsome_logger"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ac61d38cad8014a5875328d4c6094d49e2431ae9d4f6265bb0aa5db486ca2f4"
+checksum = "c964c7058627d1cd74e3e91e9eab9ea654d18ca5bf09c32b78d070e9046b8112"
 dependencies = [
- "chrono",
 "log",
 "termcolor",
 "time",
+ "tz-rs",
 ]

 [[package]]
@ -1367,9 +1373,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"

 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"

 [[package]]
 name = "heck"
@ -1411,15 +1417,15 @@ dependencies = [
 "serde",
 "serde_derive",
 "thiserror",
- "toml 0.8.0",
+ "toml 0.8.1",
 "unic-langid",
 ]

 [[package]]
 name = "i18n-embed"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26261c73a1670a3f632a8765bb6b22c62fc391f3ddc805b87fd00cd6158e4456"
+checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c"
 dependencies = [
 "arc-swap",
 "fluent",
@ -1568,12 +1574,12 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
 "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
 ]

 [[package]]
@ -2514,9 +2520,9 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.38.14"
+version = "0.38.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f"
+checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531"
 dependencies = [
 "bitflags 2.4.0",
 "errno",
@ -2645,9 +2651,9 @@ dependencies = [

 [[package]]
 name = "sha2"
-version = "0.10.7"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
 "cfg-if",
 "cpufeatures",
@ -2656,9 +2662,9 @@ dependencies = [

 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b"
 dependencies = [
 "lazy_static",
 ]
@ -3001,18 +3007,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.48"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.48"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3117,14 +3123,14 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e"
+checksum = "1bc1433177506450fe920e46a4f9812d0c211f5dd556da10e731a0a3dfa151f0"
 dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "toml_edit 0.20.0",
+ "toml_edit 0.20.1",
 ]

 [[package]]
@ -3142,7 +3148,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
 "serde",
 "serde_spanned",
 "toml_datetime",
@ -3151,11 +3157,11 @@ dependencies = [

 [[package]]
 name = "toml_edit"
-version = "0.20.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95"
+checksum = "ca676d9ba1a322c1b64eb8045a5ec5c0cfb0c9d08e15e9ff622589ad5221c8fe"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
 "serde",
 "serde_spanned",
 "toml_datetime",
@ -3271,6 +3277,15 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"

+[[package]]
+name = "tz-rs"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33851b15c848fad2cf4b105c6bb66eb9512b6f6c44a4b13f57c53c73c707e2b4"
+dependencies = [
+ "const_fn",
+]
+
 [[package]]
 name = "unic-langid"
 version = "0.9.1"
--- a/czkawka_cli/Cargo.toml
+++ b/czkawka_cli/Cargo.toml
@ -16,7 +16,7 @@ clap = { version = "4.3", features = ["derive"] }
 image_hasher = "1.2"

 log = "0.4.20"
-handsome_logger = { version = "0.7.0", features = ["chrono-local-offset"] }
+handsome_logger = "0.8"
 czkawka_core = { path = "../czkawka_core", version = "6.0.0", features = [] }

 [features]
--- a/czkawka_cli/src/main.rs
+++ b/czkawka_cli/src/main.rs
@ -30,7 +30,7 @@ mod commands;
 fn main() {
    let command = Args::parse().command;

-    setup_logger();
+    setup_logger(true);

    #[cfg(debug_assertions)]
    println!("{command:?}");
--- a/czkawka_core/Cargo.toml
+++ b/czkawka_core/Cargo.toml
@ -12,7 +12,7 @@ repository = "https://github.com/qarmin/czkawka"

 [dependencies]
 humansize = "2.1"
-rayon = "1.7"
+rayon = "1.8"
 crossbeam-channel = "0.5"

 # For saving/loading config files to specific directories
@ -41,7 +41,7 @@ rusty-chromaprint = "0.1"
 symphonia = { version = "0.5", features = ["all"] }

 # Hashes for duplicate files
-blake3 = "1.4"
+blake3 = "1.5"
 crc32fast = "1.3"
 xxhash-rust = { version = "0.8", features = ["xxh3"] }

@ -80,7 +80,7 @@ anyhow = { version = "1.0" }
 state = "0.6"

 log = "0.4.20"
-handsome_logger = { version = "0.7.0", features = ["chrono-local-offset"] }
+handsome_logger = "0.8"

 [features]
 default = []
--- a/czkawka_core/src/common.rs
+++ b/czkawka_core/src/common.rs
@ -45,13 +45,10 @@ fn filtering_messages(record: &Record) -> bool {
    }
 }

-pub fn setup_logger() {
-    let config = ConfigBuilder::default()
-        .set_level(LevelFilter::Info)
-        .set_message_filtering(Some(filtering_messages))
-        .set_chrono_local_time_offset()
-        .unwrap()
-        .build();
+pub fn setup_logger(disabled_printing: bool) {
+    let log_level = if disabled_printing { LevelFilter::Off } else { LevelFilter::Info };
+
+    let config = ConfigBuilder::default().set_level(log_level).set_message_filtering(Some(filtering_messages)).build();
    handsome_logger::TermLogger::init(config, TerminalMode::Mixed, ColorChoice::Always).unwrap();
 }

--- a/czkawka_core/src/duplicate.rs
+++ b/czkawka_core/src/duplicate.rs
@ -723,9 +723,9 @@ impl DuplicateFinder {
            .while_some()
            .collect();

-        debug!("prehashing - ended prehashing, start sending info to progress thread");
+        debug!("prehashing - start sending info to progress thread");
        send_info_and_wait_for_ending_all_threads(&progress_thread_run, progress_thread_handle);
-        debug!("prehashing - ended prehashing, got info about progress thread end");
+        debug!("prehashing - got info about progress thread end");

        // Check if user aborted search(only from GUI)
        if check_was_stopped.load(Ordering::Relaxed) {
--- a/czkawka_gui/Cargo.toml
+++ b/czkawka_gui/Cargo.toml
@ -50,7 +50,7 @@ rust-embed = "8.0.0"
 once_cell = "1.18"

 log = "0.4.20"
-handsome_logger = { version = "0.7.0", features = ["chrono-local-offset"] }
+handsome_logger = "0.8"

 czkawka_core = { path = "../czkawka_core", version = "6.0.0", features = [] }
 gtk4 = { version = "0.7.2", default-features = false, features = ["v4_6"] }
--- a/czkawka_gui/src/main.rs
+++ b/czkawka_gui/src/main.rs
@ -71,7 +71,7 @@ mod tests;
 fn main() {
    let application = Application::new(None::<String>, ApplicationFlags::HANDLES_OPEN | ApplicationFlags::HANDLES_COMMAND_LINE);
    application.connect_command_line(move |app, cmdline| {
-        setup_logger();
+        setup_logger(false);
        build_ui(app, &cmdline.arguments());
        0
    });