Archives
/
czkawka
mirror of https://github.com/qarmin/czkawka
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Run pydantic clippy lints on project (#901)

Browse Source 
* Update dependencies

* Pydantic part 1

* Some renames, basic Cambalache view

* 2

* 3

* Unwrap

* Tests

* Update CLI to Ubuntu 20.04
pull/906/head
Rafał Mikrut 1 year ago committed by GitHub
parent d39354a51f
commit 8ea9b4b800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 782 additions and 695 deletions
Show Stats Download Patch File Download Diff File

2
.github/workflows/linux_cli.yml vendored
Unescape Escape View File

@ -14,7 +14,7 @@ jobs:
matrix: matrix:
toolchain: [ stable, 1.65.0 ] toolchain: [ stable, 1.65.0 ]
type: [ release ] type: [ release ]
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

313
Cargo.lock generated
Unescape Escape View File

@ -50,6 +50,12 @@ version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
[[package]]
name = "arc-swap"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
[[package]] [[package]]
name = "arrayref" name = "arrayref"
version = "0.3.6" version = "0.3.6"
@ -64,9 +70,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
[[package]] [[package]]
name = "async-trait" name = "async-trait"
version = "0.1.60" version = "0.1.63"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -184,15 +190,15 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.11.1" version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
[[package]] [[package]]
name = "bytemuck" name = "bytemuck"
version = "1.12.3" version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
[[package]] [[package]]
name = "byteorder" name = "byteorder"
@ -202,9 +208,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]] [[package]]
name = "bzip2" name = "bzip2"
version = "0.4.3" version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
dependencies = [ dependencies = [
"bzip2-sys", "bzip2-sys",
"libc", "libc",
@ -304,9 +310,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.0.32" version = "4.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"clap_derive", "clap_derive",
@ -319,9 +325,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "4.0.21" version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro-error", "proc-macro-error",
@ -332,9 +338,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_lex" name = "clap_lex"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
dependencies = [ dependencies = [
"os_str_bytes", "os_str_bytes",
] ]
@ -452,9 +458,9 @@ dependencies = [
[[package]] [[package]]
name = "cxx" name = "cxx"
version = "1.0.85" version = "1.0.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" checksum = "322296e2f2e5af4270b54df9e85a02ff037e271af20ba3e7fe1575515dc840b8"
dependencies = [ dependencies = [
"cc", "cc",
"cxxbridge-flags", "cxxbridge-flags",
@ -464,9 +470,9 @@ dependencies = [
[[package]] [[package]]
name = "cxx-build" name = "cxx-build"
version = "1.0.85" version = "1.0.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" checksum = "017a1385b05d631e7875b1f151c9f012d37b53491e2a87f65bff5c262b2111d8"
dependencies = [ dependencies = [
"cc", "cc",
"codespan-reporting", "codespan-reporting",
@ -479,15 +485,15 @@ dependencies = [
[[package]] [[package]]
name = "cxxbridge-flags" name = "cxxbridge-flags"
version = "1.0.85" version = "1.0.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" checksum = "c26bbb078acf09bc1ecda02d4223f03bdd28bd4874edcb0379138efc499ce971"
[[package]] [[package]]
name = "cxxbridge-macro" name = "cxxbridge-macro"
version = "1.0.85" version = "1.0.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" checksum = "357f40d1f06a24b60ae1fe122542c1fb05d28d32acb2aed064e84bc2ad1e252e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -663,9 +669,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]] [[package]]
name = "either" name = "either"
version = "1.8.0" version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]] [[package]]
name = "encoding_rs" name = "encoding_rs"
@ -990,9 +996,9 @@ dependencies = [
[[package]] [[package]]
name = "gdk4" name = "gdk4"
version = "0.5.4" version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "272db1bbb9b152ea1fea946f9d464085c86cfe14cafba450d7defa433caff8ec" checksum = "bb2181330ebf9d091f8ea7fed6877f7adc92114128592e1fdaeb1da28e0d01e9"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cairo-rs", "cairo-rs",
@ -1006,9 +1012,9 @@ dependencies = [
[[package]] [[package]]
name = "gdk4-sys" name = "gdk4-sys"
version = "0.5.4" version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45b571f36b889ab529b2e173248dafe83d75c703f5685b9845e490c7994ae309" checksum = "de55cb49432901fe2b3534177fa06844665b9b0911d85d8601a8d8b88b7791db"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
@ -1149,9 +1155,9 @@ dependencies = [
[[package]] [[package]]
name = "glob" name = "glob"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]] [[package]]
name = "globalcache" name = "globalcache"
@ -1198,9 +1204,9 @@ dependencies = [
[[package]] [[package]]
name = "gsk4" name = "gsk4"
version = "0.5.4" version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4053293b79099bdfecd9ab0d811d118a0eafce613dfe0b26075419d955f1f652" checksum = "591239f5c52ca803b222124ac9c47f230cd180cee9b114c4d672e4a94b74f491"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cairo-rs", "cairo-rs",
@ -1214,9 +1220,9 @@ dependencies = [
[[package]] [[package]]
name = "gsk4-sys" name = "gsk4-sys"
version = "0.5.4" version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08e0642edffdb35028d7d67b830678da98844216b6442e11eee52c91ad2a6dc2" checksum = "195a63f0be42529f98c3eb3bae0decfd0428ba2cc683b3e20ced88f340904ec5"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk4-sys", "gdk4-sys",
@ -1230,9 +1236,9 @@ dependencies = [
[[package]] [[package]]
name = "gtk4" name = "gtk4"
version = "0.5.4" version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8954da3659ff1cb35aa95110021b33fadcd8e306e8fe41f32146ffa009665a79" checksum = "fd89dba65def483a233dc4fdd3f3dab01576e3d83f80f6c9303ebe421661855e"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cairo-rs", "cairo-rs",
@ -1253,9 +1259,9 @@ dependencies = [
[[package]] [[package]]
name = "gtk4-macros" name = "gtk4-macros"
version = "0.5.4" version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58138cd3c595e04f82df050390aa7d2bd093795ce569e5f1d49eb496ef67fe7b" checksum = "832687a415d9d8bc11fe9c17dda1bf13ee262c41b995dd4df1d1cce33cead405"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"proc-macro-crate", "proc-macro-crate",
@ -1267,9 +1273,9 @@ dependencies = [
[[package]] [[package]]
name = "gtk4-sys" name = "gtk4-sys"
version = "0.5.4" version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef29e09e055b2f2550eb1882caa6961a1ae3c971a70bcb25cb9d5ab6cbd63821" checksum = "e370564e3fdacff7cffc99f7366b6a4689feb44e819d3ccee598a9a215b71605"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
@ -1286,9 +1292,9 @@ dependencies = [
[[package]] [[package]]
name = "half" name = "half"
version = "2.1.0" version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554" checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
dependencies = [ dependencies = [
"crunchy", "crunchy",
] ]
@ -1331,18 +1337,18 @@ dependencies = [
[[package]] [[package]]
name = "humansize" name = "humansize"
version = "2.1.2" version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e682e2bd70ecbcce5209f11a992a4ba001fea8e60acf7860ce007629e6d2756" checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
dependencies = [ dependencies = [
"libm", "libm",
] ]
[[package]] [[package]]
name = "i18n-config" name = "i18n-config"
version = "0.4.2" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b62affcd43abfb51f3cbd8736f9407908dc5b44fc558a9be07460bbfd104d983" checksum = "3d9f93ceee6543011739bc81699b5e0cf1f23f3a80364649b6d80de8636bc8df"
dependencies = [ dependencies = [
"log", "log",
"serde", "serde",
@ -1354,10 +1360,11 @@ dependencies = [
[[package]] [[package]]
name = "i18n-embed" name = "i18n-embed"
version = "0.13.4" version = "0.13.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7f21ed76e44de8ac3dfa36bb37ab2e6480be0dc75c612474949be1f3cb2c253" checksum = "2653dd1a8be0726315603f1c180b29f90e5b2a58f8b943d949d5170d9ad81101"
dependencies = [ dependencies = [
"arc-swap",
"fluent", "fluent",
"fluent-langneg", "fluent-langneg",
"fluent-syntax", "fluent-syntax",
@ -1375,9 +1382,9 @@ dependencies = [
[[package]] [[package]]
name = "i18n-embed-fl" name = "i18n-embed-fl"
version = "0.6.4" version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9420a9718ef9d0ab727840a398e25408ea0daff9ba3c681707ba05485face98e" checksum = "a425b9bbdc2e4cd797a2a79528662cb61894bd36db582e48da2c56c28eb727cd"
dependencies = [ dependencies = [
"dashmap", "dashmap",
"find-crate", "find-crate",
@ -1505,9 +1512,9 @@ dependencies = [
[[package]] [[package]]
name = "infer" name = "infer"
version = "0.11.0" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a6c16b11a665b26aeeb9b1d7f954cdeb034be38dd00adab4f2ae921a8fee804" checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3"
dependencies = [ dependencies = [
"cfb", "cfb",
] ]
@ -1551,9 +1558,9 @@ dependencies = [
[[package]] [[package]]
name = "io-lifetimes" name = "io-lifetimes"
version = "1.0.3" version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys", "windows-sys",
@ -1843,6 +1850,15 @@ dependencies = [
"getrandom", "getrandom",
] ]
[[package]]
name = "nom8"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "nu-ansi-term" name = "nu-ansi-term"
version = "0.46.0" version = "0.46.0"
@ -1864,9 +1880,9 @@ dependencies = [
[[package]] [[package]]
name = "num-complex" name = "num-complex"
version = "0.4.2" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
dependencies = [ dependencies = [
"num-traits", "num-traits",
] ]
@ -1951,9 +1967,9 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.16.0" version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
[[package]] [[package]]
name = "opaque-debug" name = "opaque-debug"
@ -2021,9 +2037,9 @@ dependencies = [
[[package]] [[package]]
name = "parking_lot_core" name = "parking_lot_core"
version = "0.9.5" version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
@ -2113,9 +2129,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]] [[package]]
name = "pest" name = "pest"
version = "2.5.2" version = "2.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f6e86fb9e7026527a0d46bc308b841d73170ef8f443e1807f6ef88526a816d4" checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f"
dependencies = [ dependencies = [
"thiserror", "thiserror",
"ucd-trie", "ucd-trie",
@ -2188,13 +2204,12 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro-crate" name = "proc-macro-crate"
version = "1.2.1" version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"thiserror", "toml_edit",
"toml",
] ]
[[package]] [[package]]
@ -2223,9 +2238,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.49" version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -2296,9 +2311,9 @@ dependencies = [
[[package]] [[package]]
name = "rayon-core" name = "rayon-core"
version = "1.10.1" version = "1.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b"
dependencies = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"crossbeam-deque", "crossbeam-deque",
@ -2328,9 +2343,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.7.0" version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -2457,7 +2472,7 @@ version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434"
dependencies = [ dependencies = [
"num-complex 0.4.2", "num-complex 0.4.3",
"num-integer", "num-integer",
"num-traits", "num-traits",
"primal-check", "primal-check",
@ -2468,9 +2483,9 @@ dependencies = [
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.36.6" version = "0.36.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"errno", "errno",
@ -2714,14 +2729,15 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]] [[package]]
name = "symphonia" name = "symphonia"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17033fe05e4f7f10a6ad602c272bafd2520b2e5cdd9feb61494d9cdce08e002f" checksum = "3671dd6f64f4f9d5c87179525054cfc1f60de23ba1f193bd6ceab812737403f1"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"symphonia-bundle-flac", "symphonia-bundle-flac",
"symphonia-bundle-mp3", "symphonia-bundle-mp3",
"symphonia-codec-aac", "symphonia-codec-aac",
"symphonia-codec-adpcm",
"symphonia-codec-alac", "symphonia-codec-alac",
"symphonia-codec-pcm", "symphonia-codec-pcm",
"symphonia-codec-vorbis", "symphonia-codec-vorbis",
@ -2735,9 +2751,9 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-bundle-flac" name = "symphonia-bundle-flac"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "044f655337892b217d6df1d8336ee119414c3886c89c72e0156989cd2ad7934a" checksum = "3dc2deed3204967871ba60f913378f95820cb47a2fe9b2eef5a9eedb417dfdc8"
dependencies = [ dependencies = [
"log", "log",
"symphonia-core", "symphonia-core",
@ -2747,9 +2763,9 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-bundle-mp3" name = "symphonia-bundle-mp3"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db5d3d53535ae2b7d0e39e82f683cac5398a6c8baca25ff1183e107d13959d3e" checksum = "55a0846e7a2c9a8081ff799fc83a975170417ad2a143f644a77ec2e3e82a2b73"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"lazy_static", "lazy_static",
@ -2760,20 +2776,30 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-codec-aac" name = "symphonia-codec-aac"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e9431b89428c31b01428563df18e52b1aff7c49e71fb80b2fa8e85632094776" checksum = "6fcdd4a10695ca0528572360ec020586320357350eb62791693667e7de8c871a"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"log", "log",
"symphonia-core", "symphonia-core",
] ]
[[package]]
name = "symphonia-codec-adpcm"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a5cfb8d4405e26eb9593157dc45b05e102b8d774b38ed2a95946d6bb9e26e3e"
dependencies = [
"log",
"symphonia-core",
]
[[package]] [[package]]
name = "symphonia-codec-alac" name = "symphonia-codec-alac"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "452438d6f32bf07f2f55f35371c3c8e9cce4a028a08b47fb301001f85a950f02" checksum = "c49e1b209318bcefa7ff452bd85f1f593210943a7d9786b7d4250e8991a7449c"
dependencies = [ dependencies = [
"log", "log",
"symphonia-core", "symphonia-core",
@ -2781,9 +2807,9 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-codec-pcm" name = "symphonia-codec-pcm"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17cca412c954abda6ab62b5e51223568eb604ed8266ec777d99e1d63c608443c" checksum = "8cb9a9f0b9991cccf3217b74644af412d5d082a4815e5e2943f26e0ecabdf3c9"
dependencies = [ dependencies = [
"log", "log",
"symphonia-core", "symphonia-core",
@ -2791,9 +2817,9 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-codec-vorbis" name = "symphonia-codec-vorbis"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "323b94435a1a807e1001e29490aeaef2660fb72b145d47497e8429a6cb1d67c3" checksum = "7dfed6f7b6bfa21d7cef1acefc8eae5db80df1608a1aca91871b07cbd28d7b74"
dependencies = [ dependencies = [
"log", "log",
"symphonia-core", "symphonia-core",
@ -2802,9 +2828,9 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-core" name = "symphonia-core"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "199a6417cd4115bac79289b64b859358ea050b7add0ceb364dc991f628c5b347" checksum = "6b9567e2d8a5f866b2f94f5d366d811e0c6826babcff6d37de9e1a6690d38869"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bitflags", "bitflags",
@ -2815,9 +2841,9 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-format-isomp4" name = "symphonia-format-isomp4"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dce84cea63247dfcc43e12edf2d19406fbb62ebc24bac1b8e6c49f1ba67b890" checksum = "c1818f6f54b4eaba5ec004a8dbcca637c57e617eb1ff4c9addbd3fc065eba437"
dependencies = [ dependencies = [
"encoding_rs", "encoding_rs",
"log", "log",
@ -2828,9 +2854,9 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-format-mkv" name = "symphonia-format-mkv"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f405400330b2cc0c70e19515198628ae9a6a99a59c77800541127d4cff113b96" checksum = "1bd22f2def8c8f078495ad66111648bfc7d5222ee33774f2077cb665588f3119"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"log", "log",
@ -2841,9 +2867,9 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-format-ogg" name = "symphonia-format-ogg"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d2f741469a0f103607ed1f2605f7f00b13ba044ea9ddc616764558c6d3d9b7d" checksum = "474df6e86b871dcb56913130bada1440245f483057c4a2d8a2981455494c4439"
dependencies = [ dependencies = [
"log", "log",
"symphonia-core", "symphonia-core",
@ -2853,9 +2879,9 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-format-wav" name = "symphonia-format-wav"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f9d771aa6889f05b771e629110f6a60b5e1c0ad580fc41da574bc490fbe2822" checksum = "06679bd5646b3037300f88891dfc8a6e1cc4e1133206cc17a98e5d7c22f88296"
dependencies = [ dependencies = [
"log", "log",
"symphonia-core", "symphonia-core",
@ -2864,9 +2890,9 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-metadata" name = "symphonia-metadata"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ed71acf6b5e6e8bee1509597b86365a06b78c1d73218df47357620a6fe5997b" checksum = "acd35c263223ef6161000be79b124a75de3e065eea563bf3ef169b3e94c7bb2e"
dependencies = [ dependencies = [
"encoding_rs", "encoding_rs",
"lazy_static", "lazy_static",
@ -2876,9 +2902,9 @@ dependencies = [
[[package]] [[package]]
name = "symphonia-utils-xiph" name = "symphonia-utils-xiph"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73cbb0766ce77a8aef535f9438db645e7b6f1b2c4cf3be9bf246b4e11a7d5531" checksum = "ce340a6c33ac06cb42de01220308ec056e8a2a3d5cc664aaf34567392557136b"
dependencies = [ dependencies = [
"symphonia-core", "symphonia-core",
"symphonia-metadata", "symphonia-metadata",
@ -2924,9 +2950,9 @@ dependencies = [
[[package]] [[package]]
name = "termcolor" name = "termcolor"
version = "1.1.3" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
dependencies = [ dependencies = [
"winapi-util", "winapi-util",
] ]
@ -3020,9 +3046,9 @@ dependencies = [
[[package]] [[package]]
name = "tinystr" name = "tinystr"
version = "0.7.0" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8aeafdfd935e4a7fe16a91ab711fa52d54df84f9c8f7ca5837a9d1d902ef4c2" checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef"
dependencies = [ dependencies = [
"displaydoc", "displaydoc",
] ]
@ -3044,13 +3070,30 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.5.10" version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
dependencies = [ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "toml_datetime"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
[[package]]
name = "toml_edit"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
dependencies = [
"indexmap",
"nom8",
"toml_datetime",
]
[[package]] [[package]]
name = "tracing" name = "tracing"
version = "0.1.37" version = "0.1.37"
@ -3196,9 +3239,9 @@ dependencies = [
[[package]] [[package]]
name = "unicode-bidi" name = "unicode-bidi"
version = "0.3.8" version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"
@ -3407,12 +3450,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
dependencies = [ dependencies = [
"windows_aarch64_gnullvm", "windows_aarch64_gnullvm",
"windows_aarch64_msvc 0.42.0", "windows_aarch64_msvc 0.42.1",
"windows_i686_gnu 0.42.0", "windows_i686_gnu 0.42.1",
"windows_i686_msvc 0.42.0", "windows_i686_msvc 0.42.1",
"windows_x86_64_gnu 0.42.0", "windows_x86_64_gnu 0.42.1",
"windows_x86_64_gnullvm", "windows_x86_64_gnullvm",
"windows_x86_64_msvc 0.42.0", "windows_x86_64_msvc 0.42.1",
] ]
[[package]] [[package]]
@ -3422,19 +3465,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [ dependencies = [
"windows_aarch64_gnullvm", "windows_aarch64_gnullvm",
"windows_aarch64_msvc 0.42.0", "windows_aarch64_msvc 0.42.1",
"windows_i686_gnu 0.42.0", "windows_i686_gnu 0.42.1",
"windows_i686_msvc 0.42.0", "windows_i686_msvc 0.42.1",
"windows_x86_64_gnu 0.42.0", "windows_x86_64_gnu 0.42.1",
"windows_x86_64_gnullvm", "windows_x86_64_gnullvm",
"windows_x86_64_msvc 0.42.0", "windows_x86_64_msvc 0.42.1",
] ]
[[package]] [[package]]
name = "windows_aarch64_gnullvm" name = "windows_aarch64_gnullvm"
version = "0.42.0" version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
[[package]] [[package]]
name = "windows_aarch64_msvc" name = "windows_aarch64_msvc"
@ -3444,9 +3487,9 @@ checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
[[package]] [[package]]
name = "windows_aarch64_msvc" name = "windows_aarch64_msvc"
version = "0.42.0" version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
[[package]] [[package]]
name = "windows_i686_gnu" name = "windows_i686_gnu"
@ -3456,9 +3499,9 @@ checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
[[package]] [[package]]
name = "windows_i686_gnu" name = "windows_i686_gnu"
version = "0.42.0" version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
[[package]] [[package]]
name = "windows_i686_msvc" name = "windows_i686_msvc"
@ -3468,9 +3511,9 @@ checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
[[package]] [[package]]
name = "windows_i686_msvc" name = "windows_i686_msvc"
version = "0.42.0" version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
[[package]] [[package]]
name = "windows_x86_64_gnu" name = "windows_x86_64_gnu"
@ -3480,15 +3523,15 @@ checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
[[package]] [[package]]
name = "windows_x86_64_gnu" name = "windows_x86_64_gnu"
version = "0.42.0" version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
[[package]] [[package]]
name = "windows_x86_64_gnullvm" name = "windows_x86_64_gnullvm"
version = "0.42.0" version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
[[package]] [[package]]
name = "windows_x86_64_msvc" name = "windows_x86_64_msvc"
@ -3498,9 +3541,9 @@ checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
[[package]] [[package]]
name = "windows_x86_64_msvc" name = "windows_x86_64_msvc"
version = "0.42.0" version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
[[package]] [[package]]
name = "xxhash-rust" name = "xxhash-rust"

2
czkawka_cli/Cargo.toml
Unescape Escape View File

@ -10,7 +10,7 @@ homepage = "https://github.com/qarmin/czkawka"
repository = "https://github.com/qarmin/czkawka" repository = "https://github.com/qarmin/czkawka"
[dependencies] [dependencies]
clap = { version = "4.0", features = ["derive"] } clap = { version = "4.1", features = ["derive"] }
# For enum types # For enum types
image_hasher = "1.1.2" image_hasher = "1.1.2"

10
czkawka_core/Cargo.toml
Unescape Escape View File

@ -11,7 +11,7 @@ repository = "https://github.com/qarmin/czkawka"
[dependencies] [dependencies]
humansize = "2.1.2" humansize = "2.1.3"
rayon = "1.6.1" rayon = "1.6.1"
crossbeam-channel = "0.5.6" crossbeam-channel = "0.5.6"
@ -53,10 +53,10 @@ bincode = "1.3.3"
serde_json = "1.0" serde_json = "1.0"
# Language # Language
i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] } i18n-embed = { version = "0.13.8", features = ["fluent-system", "desktop-requester"] }
i18n-embed-fl = "0.6.4" i18n-embed-fl = "0.6.5"
rust-embed = "6.4.2" rust-embed = "6.4.2"
once_cell = "1.16.0" once_cell = "1.17.0"
# Raw image files # Raw image files
rawloader = "0.37.1" rawloader = "0.37.1"
@ -64,7 +64,7 @@ imagepipe = "0.5.0"
# Checking for invalid extensions # Checking for invalid extensions
mime_guess = "2.0.4" mime_guess = "2.0.4"
infer = "0.11.0" infer = "0.12.0"
num_cpus = "1.15.0" num_cpus = "1.15.0"

71
czkawka_core/src/bad_extensions.rs
Unescape Escape View File

@ -166,6 +166,7 @@ pub struct Info {
} }
impl Info { impl Info {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
@ -188,6 +189,7 @@ pub struct BadExtensions {
} }
impl BadExtensions { impl BadExtensions {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
text_messages: Messages::new(), text_messages: Messages::new(),
@ -219,10 +221,12 @@ impl BadExtensions {
self.debug_print(); self.debug_print();
} }
#[must_use]
pub fn get_stopped_search(&self) -> bool { pub fn get_stopped_search(&self) -> bool {
self.stopped_search self.stopped_search
} }
#[must_use]
pub const fn get_bad_extensions_files(&self) -> &Vec<BadFileEntry> { pub const fn get_bad_extensions_files(&self) -> &Vec<BadFileEntry> {
&self.bad_extensions_files &self.bad_extensions_files
} }
@ -246,10 +250,12 @@ impl BadExtensions {
#[cfg(not(target_family = "unix"))] #[cfg(not(target_family = "unix"))]
pub fn set_exclude_other_filesystems(&mut self, _exclude_other_filesystems: bool) {} pub fn set_exclude_other_filesystems(&mut self, _exclude_other_filesystems: bool) {}
#[must_use]
pub const fn get_text_messages(&self) -> &Messages { pub const fn get_text_messages(&self) -> &Messages {
&self.text_messages &self.text_messages
} }
#[must_use]
pub const fn get_information(&self) -> &Info { pub const fn get_information(&self) -> &Info {
&self.information &self.information
} }
@ -301,7 +307,7 @@ impl BadExtensions {
self.files_to_check = files_to_check.clone(); self.files_to_check = files_to_check.clone();
} }
self.text_messages.warnings.extend(warnings); self.text_messages.warnings.extend(warnings);
Common::print_time(start_time, SystemTime::now(), "check_files".to_string()); Common::print_time(start_time, SystemTime::now(), "check_files");
true true
} }
DirTraversalResult::SuccessFolders { .. } => { DirTraversalResult::SuccessFolders { .. } => {
@ -388,12 +394,12 @@ impl BadExtensions {
} }
// Text longer than 10 characters is not considered as extension // Text longer than 10 characters is not considered as extension
if extension.len() > 10 { if extension.len() > 10 {
current_extension = "".to_string(); current_extension = String::new();
} else { } else {
current_extension = extension; current_extension = extension;
} }
} else { } else {
current_extension = "".to_string(); current_extension = String::new();
} }
// Already have proper extension, no need to do more things // Already have proper extension, no need to do more things
@ -403,36 +409,35 @@ impl BadExtensions {
// Check for all extensions that file can use(not sure if it is worth to do it) // Check for all extensions that file can use(not sure if it is worth to do it)
let mut all_available_extensions: BTreeSet<&str> = Default::default(); let mut all_available_extensions: BTreeSet<&str> = Default::default();
let think_extension = match current_extension.is_empty() { let think_extension = if current_extension.is_empty() {
true => "".to_string(), String::new()
false => { } else {
for mim in mime_guess::from_ext(proper_extension) { for mim in mime_guess::from_ext(proper_extension) {
if let Some(all_ext) = get_mime_extensions(&mim) { if let Some(all_ext) = get_mime_extensions(&mim) {
for ext in all_ext { for ext in all_ext {
all_available_extensions.insert(ext); all_available_extensions.insert(ext);
}
} }
} }
}
// Workarounds // Workarounds
if let Some(vec_pre) = hashmap_workarounds.get(current_extension.as_str()) { if let Some(vec_pre) = hashmap_workarounds.get(current_extension.as_str()) {
for pre in vec_pre { for pre in vec_pre {
if all_available_extensions.contains(pre) { if all_available_extensions.contains(pre) {
all_available_extensions.insert(current_extension.as_str()); all_available_extensions.insert(current_extension.as_str());
break; break;
}
} }
} }
}
let mut guessed_multiple_extensions = format!("({proper_extension}) - "); let mut guessed_multiple_extensions = format!("({proper_extension}) - ");
for ext in &all_available_extensions { for ext in &all_available_extensions {
guessed_multiple_extensions.push_str(ext); guessed_multiple_extensions.push_str(ext);
guessed_multiple_extensions.push(','); guessed_multiple_extensions.push(',');
}
guessed_multiple_extensions.pop();
guessed_multiple_extensions
} }
guessed_multiple_extensions.pop();
guessed_multiple_extensions
}; };
if all_available_extensions.is_empty() { if all_available_extensions.is_empty() {
@ -456,8 +461,8 @@ impl BadExtensions {
})) }))
}) })
.while_some() .while_some()
.filter(|file_entry| file_entry.is_some()) .filter(Option::is_some)
.map(|file_entry| file_entry.unwrap()) .map(Option::unwrap)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
// End thread which send info to gui // End thread which send info to gui
@ -471,7 +476,7 @@ impl BadExtensions {
self.information.number_of_files_with_bad_extension = self.bad_extensions_files.len(); self.information.number_of_files_with_bad_extension = self.bad_extensions_files.len();
Common::print_time(system_time, SystemTime::now(), "bad extension finding".to_string()); Common::print_time(system_time, SystemTime::now(), "bad extension finding");
// Clean unused data // Clean unused data
self.files_to_check = Default::default(); self.files_to_check = Default::default();
@ -540,13 +545,13 @@ impl SaveResults for BadExtensions {
if !self.bad_extensions_files.is_empty() { if !self.bad_extensions_files.is_empty() {
writeln!(writer, "Found {} files with invalid extension.", self.information.number_of_files_with_bad_extension).unwrap(); writeln!(writer, "Found {} files with invalid extension.", self.information.number_of_files_with_bad_extension).unwrap();
for file_entry in self.bad_extensions_files.iter() { for file_entry in &self.bad_extensions_files {
writeln!(writer, "{} ----- {}", file_entry.path.display(), file_entry.proper_extensions).unwrap(); writeln!(writer, "{} ----- {}", file_entry.path.display(), file_entry.proper_extensions).unwrap();
} }
} else { } else {
write!(writer, "Not found any files with invalid extension.").unwrap(); write!(writer, "Not found any files with invalid extension.").unwrap();
} }
Common::print_time(start_time, SystemTime::now(), "save_results_to_file".to_string()); Common::print_time(start_time, SystemTime::now(), "save_results_to_file");
true true
} }
} }
@ -557,10 +562,10 @@ impl PrintResults for BadExtensions {
fn print_results(&self) { fn print_results(&self) {
let start_time: SystemTime = SystemTime::now(); let start_time: SystemTime = SystemTime::now();
println!("Found {} files with invalid extension.\n", self.information.number_of_files_with_bad_extension); println!("Found {} files with invalid extension.\n", self.information.number_of_files_with_bad_extension);
for file_entry in self.bad_extensions_files.iter() { for file_entry in &self.bad_extensions_files {
println!("{} ----- {}", file_entry.path.display(), file_entry.proper_extensions); println!("{} ----- {}", file_entry.path.display(), file_entry.proper_extensions);
} }
Common::print_time(start_time, SystemTime::now(), "print_entries".to_string()); Common::print_time(start_time, SystemTime::now(), "print_entries");
} }
} }

18
czkawka_core/src/big_file.rs
Unescape Escape View File

@ -56,6 +56,7 @@ pub struct Info {
} }
impl Info { impl Info {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
@ -77,6 +78,7 @@ pub struct BigFile {
} }
impl BigFile { impl BigFile {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
text_messages: Default::default(), text_messages: Default::default(),
@ -102,6 +104,7 @@ impl BigFile {
self.delete_files(); self.delete_files();
self.debug_print(); self.debug_print();
} }
#[must_use]
pub fn get_stopped_search(&self) -> bool { pub fn get_stopped_search(&self) -> bool {
self.stopped_search self.stopped_search
} }
@ -110,14 +113,17 @@ impl BigFile {
self.search_mode = search_mode; self.search_mode = search_mode;
} }
#[must_use]
pub const fn get_big_files(&self) -> &Vec<(u64, FileEntry)> { pub const fn get_big_files(&self) -> &Vec<(u64, FileEntry)> {
&self.big_files &self.big_files
} }
#[must_use]
pub const fn get_text_messages(&self) -> &Messages { pub const fn get_text_messages(&self) -> &Messages {
&self.text_messages &self.text_messages
} }
#[must_use]
pub const fn get_information(&self) -> &Info { pub const fn get_information(&self) -> &Info {
&self.information &self.information
} }
@ -355,7 +361,7 @@ impl BigFile {
} }
} }
Common::print_time(start_time, SystemTime::now(), "look_for_big_files".to_string()); Common::print_time(start_time, SystemTime::now(), "look_for_big_files");
true true
} }
@ -398,7 +404,7 @@ impl BigFile {
} }
} }
Common::print_time(start_time, SystemTime::now(), "delete_files".to_string()); Common::print_time(start_time, SystemTime::now(), "delete_files");
} }
} }
@ -470,13 +476,13 @@ impl SaveResults for BigFile {
} else { } else {
write!(writer, "{} the smallest files.\n\n", self.information.number_of_real_files).unwrap(); write!(writer, "{} the smallest files.\n\n", self.information.number_of_real_files).unwrap();
} }
for (size, file_entry) in self.big_files.iter() { for (size, file_entry) in &self.big_files {
writeln!(writer, "{} ({}) - {}", format_size(*size, BINARY), size, file_entry.path.display()).unwrap(); writeln!(writer, "{} ({}) - {}", format_size(*size, BINARY), size, file_entry.path.display()).unwrap();
} }
} else { } else {
write!(writer, "Not found any files.").unwrap(); write!(writer, "Not found any files.").unwrap();
} }
Common::print_time(start_time, SystemTime::now(), "save_results_to_file".to_string()); Common::print_time(start_time, SystemTime::now(), "save_results_to_file");
true true
} }
} }
@ -489,9 +495,9 @@ impl PrintResults for BigFile {
} else { } else {
println!("{} the smallest files.\n\n", self.information.number_of_real_files); println!("{} the smallest files.\n\n", self.information.number_of_real_files);
} }
for (size, file_entry) in self.big_files.iter() { for (size, file_entry) in &self.big_files {
println!("{} ({}) - {}", format_size(*size, BINARY), size, file_entry.path.display()); println!("{} ({}) - {}", format_size(*size, BINARY), size, file_entry.path.display());
} }
Common::print_time(start_time, SystemTime::now(), "print_entries".to_string()); Common::print_time(start_time, SystemTime::now(), "print_entries");
} }
} }

28
czkawka_core/src/broken_files.rs
Unescape Escape View File

@ -75,6 +75,7 @@ pub struct Info {
} }
impl Info { impl Info {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
@ -98,6 +99,7 @@ pub struct BrokenFiles {
} }
impl BrokenFiles { impl BrokenFiles {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
text_messages: Messages::new(), text_messages: Messages::new(),
@ -131,10 +133,12 @@ impl BrokenFiles {
self.debug_print(); self.debug_print();
} }
#[must_use]
pub fn get_stopped_search(&self) -> bool { pub fn get_stopped_search(&self) -> bool {
self.stopped_search self.stopped_search
} }
#[must_use]
pub const fn get_broken_files(&self) -> &Vec<FileEntry> { pub const fn get_broken_files(&self) -> &Vec<FileEntry> {
&self.broken_files &self.broken_files
} }
@ -143,10 +147,12 @@ impl BrokenFiles {
self.checked_types = checked_types; self.checked_types = checked_types;
} }
#[must_use]
pub const fn get_text_messages(&self) -> &Messages { pub const fn get_text_messages(&self) -> &Messages {
&self.text_messages &self.text_messages
} }
#[must_use]
pub const fn get_information(&self) -> &Info { pub const fn get_information(&self) -> &Info {
&self.information &self.information
} }
@ -354,7 +360,7 @@ impl BrokenFiles {
}, },
size: metadata.len(), size: metadata.len(),
type_of_file, type_of_file,
error_string: "".to_string(), error_string: String::new(),
}; };
fe_result.push((current_file_name.to_string_lossy().to_string(), fe)); fe_result.push((current_file_name.to_string_lossy().to_string(), fe));
@ -381,7 +387,7 @@ impl BrokenFiles {
progress_thread_run.store(false, Ordering::Relaxed); progress_thread_run.store(false, Ordering::Relaxed);
progress_thread_handle.join().unwrap(); progress_thread_handle.join().unwrap();
Common::print_time(start_time, SystemTime::now(), "check_files".to_string()); Common::print_time(start_time, SystemTime::now(), "check_files");
true true
} }
fn look_for_broken_files(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&futures::channel::mpsc::UnboundedSender<ProgressData>>) -> bool { fn look_for_broken_files(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&futures::channel::mpsc::UnboundedSender<ProgressData>>) -> bool {
@ -556,8 +562,8 @@ impl BrokenFiles {
} }
}) })
.while_some() .while_some()
.filter(|file_entry| file_entry.is_some()) .filter(Option::is_some)
.map(|file_entry| file_entry.unwrap()) .map(Option::unwrap)
.collect::<Vec<FileEntry>>(); .collect::<Vec<FileEntry>>();
// End thread which send info to gui // End thread which send info to gui
@ -589,7 +595,7 @@ impl BrokenFiles {
self.information.number_of_broken_files = self.broken_files.len(); self.information.number_of_broken_files = self.broken_files.len();
Common::print_time(system_time, SystemTime::now(), "sort_images - reading data from files in parallel".to_string()); Common::print_time(system_time, SystemTime::now(), "sort_images - reading data from files in parallel");
// Clean unused data // Clean unused data
self.files_to_check = Default::default(); self.files_to_check = Default::default();
@ -602,7 +608,7 @@ impl BrokenFiles {
match self.delete_method { match self.delete_method {
DeleteMethod::Delete => { DeleteMethod::Delete => {
for file_entry in self.broken_files.iter() { for file_entry in &self.broken_files {
if fs::remove_file(&file_entry.path).is_err() { if fs::remove_file(&file_entry.path).is_err() {
self.text_messages.warnings.push(file_entry.path.display().to_string()); self.text_messages.warnings.push(file_entry.path.display().to_string());
} }
@ -613,7 +619,7 @@ impl BrokenFiles {
} }
} }
Common::print_time(start_time, SystemTime::now(), "delete_files".to_string()); Common::print_time(start_time, SystemTime::now(), "delete_files");
} }
} }
@ -680,13 +686,13 @@ impl SaveResults for BrokenFiles {
if !self.broken_files.is_empty() { if !self.broken_files.is_empty() {
writeln!(writer, "Found {} broken files.", self.information.number_of_broken_files).unwrap(); writeln!(writer, "Found {} broken files.", self.information.number_of_broken_files).unwrap();
for file_entry in self.broken_files.iter() { for file_entry in &self.broken_files {
writeln!(writer, "{} - {}", file_entry.path.display(), file_entry.error_string).unwrap(); writeln!(writer, "{} - {}", file_entry.path.display(), file_entry.error_string).unwrap();
} }
} else { } else {
write!(writer, "Not found any broken files.").unwrap(); write!(writer, "Not found any broken files.").unwrap();
} }
Common::print_time(start_time, SystemTime::now(), "save_results_to_file".to_string()); Common::print_time(start_time, SystemTime::now(), "save_results_to_file");
true true
} }
} }
@ -697,11 +703,11 @@ impl PrintResults for BrokenFiles {
fn print_results(&self) { fn print_results(&self) {
let start_time: SystemTime = SystemTime::now(); let start_time: SystemTime = SystemTime::now();
println!("Found {} broken files.\n", self.information.number_of_broken_files); println!("Found {} broken files.\n", self.information.number_of_broken_files);
for file_entry in self.broken_files.iter() { for file_entry in &self.broken_files {
println!("{} - {}", file_entry.path.display(), file_entry.error_string); println!("{} - {}", file_entry.path.display(), file_entry.error_string);
} }
Common::print_time(start_time, SystemTime::now(), "print_entries".to_string()); Common::print_time(start_time, SystemTime::now(), "print_entries");
} }
} }

13
czkawka_core/src/common.rs
Unescape Escape View File

@ -26,6 +26,7 @@ pub fn get_number_of_threads() -> usize {
pub fn set_default_number_of_threads() { pub fn set_default_number_of_threads() {
set_number_of_threads(num_cpus::get()); set_number_of_threads(num_cpus::get());
} }
#[must_use]
pub fn get_default_number_of_threads() -> usize { pub fn get_default_number_of_threads() -> usize {
num_cpus::get() num_cpus::get()
} }
@ -181,6 +182,7 @@ pub fn get_dynamic_image_from_raw_image(path: impl AsRef<Path> + std::fmt::Debug
Some(DynamicImage::ImageRgb8(image)) Some(DynamicImage::ImageRgb8(image))
} }
#[must_use]
pub fn split_path(path: &Path) -> (String, String) { pub fn split_path(path: &Path) -> (String, String) {
match (path.parent(), path.file_name()) { match (path.parent(), path.file_name()) {
(Some(dir), Some(file)) => (dir.display().to_string(), file.to_string_lossy().into_owned()), (Some(dir), Some(file)) => (dir.display().to_string(), file.to_string_lossy().into_owned()),
@ -189,6 +191,7 @@ pub fn split_path(path: &Path) -> (String, String) {
} }
} }
#[must_use]
pub fn create_crash_message(library_name: &str, file_path: &str, home_library_url: &str) -> String { pub fn create_crash_message(library_name: &str, file_path: &str, home_library_url: &str) -> String {
format!("{library_name} library crashed when opening \"{file_path}\", please check if this is fixed with the latest version of {library_name} (e.g. with https://github.com/qarmin/crates_tester) and if it is not fixed, please report bug here - {home_library_url}") format!("{library_name} library crashed when opening \"{file_path}\", please check if this is fixed with the latest version of {library_name} (e.g. with https://github.com/qarmin/crates_tester) and if it is not fixed, please report bug here - {home_library_url}")
} }
@ -196,7 +199,7 @@ pub fn create_crash_message(library_name: &str, file_path: &str, home_library_ur
impl Common { impl Common {
/// Printing time which took between start and stop point and prints also function name /// Printing time which took between start and stop point and prints also function name
#[allow(unused_variables)] #[allow(unused_variables)]
pub fn print_time(start_time: SystemTime, end_time: SystemTime, function_name: String) { pub fn print_time(start_time: SystemTime, end_time: SystemTime, function_name: &str) {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
println!( println!(
"Execution of function \"{}\" took {:?}", "Execution of function \"{}\" took {:?}",
@ -205,6 +208,7 @@ impl Common {
); );
} }
#[must_use]
pub fn delete_multiple_entries(entries: &[String]) -> Vec<String> { pub fn delete_multiple_entries(entries: &[String]) -> Vec<String> {
let mut path: &Path; let mut path: &Path;
let mut warnings: Vec<String> = Vec::new(); let mut warnings: Vec<String> = Vec::new();
@ -220,15 +224,16 @@ impl Common {
} }
warnings warnings
} }
#[must_use]
pub fn delete_one_entry(entry: &str) -> String { pub fn delete_one_entry(entry: &str) -> String {
let path: &Path = Path::new(entry); let path: &Path = Path::new(entry);
let mut warning: String = String::from(""); let mut warning: String = String::new();
if path.is_dir() { if path.is_dir() {
if let Err(e) = fs::remove_dir_all(entry) { if let Err(e) = fs::remove_dir_all(entry) {
warning = format!("Failed to remove folder {entry}, reason {e}") warning = format!("Failed to remove folder {entry}, reason {e}");
} }
} else if let Err(e) = fs::remove_file(entry) { } else if let Err(e) = fs::remove_file(entry) {
warning = format!("Failed to remove file {entry}, reason {e}") warning = format!("Failed to remove file {entry}, reason {e}");
} }
warning warning
} }

24
czkawka_core/src/common_dir_traversal.rs
Unescape Escape View File

@ -62,7 +62,7 @@ pub enum ErrorType {
// Empty folders // Empty folders
/// Enum with values which show if folder is empty. /// Enum with values which show if folder is empty.
/// In function "optimize_folders" automatically "Maybe" is changed to "Yes", so it is not necessary to put it here /// In function "`optimize_folders`" automatically "Maybe" is changed to "Yes", so it is not necessary to put it here
#[derive(Eq, PartialEq, Copy, Clone)] #[derive(Eq, PartialEq, Copy, Clone)]
pub(crate) enum FolderEmptiness { pub(crate) enum FolderEmptiness {
No, No,
@ -134,6 +134,7 @@ impl<'a, 'b> Default for DirTraversalBuilder<'a, 'b, ()> {
} }
impl<'a, 'b> DirTraversalBuilder<'a, 'b, ()> { impl<'a, 'b> DirTraversalBuilder<'a, 'b, ()> {
#[must_use]
pub fn new() -> DirTraversalBuilder<'a, 'b, ()> { pub fn new() -> DirTraversalBuilder<'a, 'b, ()> {
DirTraversalBuilder { DirTraversalBuilder {
group_by: None, group_by: None,
@ -154,67 +155,80 @@ impl<'a, 'b> DirTraversalBuilder<'a, 'b, ()> {
} }
impl<'a, 'b, F> DirTraversalBuilder<'a, 'b, F> { impl<'a, 'b, F> DirTraversalBuilder<'a, 'b, F> {
#[must_use]
pub fn root_dirs(mut self, dirs: Vec<PathBuf>) -> Self { pub fn root_dirs(mut self, dirs: Vec<PathBuf>) -> Self {
self.root_dirs = dirs; self.root_dirs = dirs;
self self
} }
#[must_use]
pub fn stop_receiver(mut self, stop_receiver: Option<&'a Receiver<()>>) -> Self { pub fn stop_receiver(mut self, stop_receiver: Option<&'a Receiver<()>>) -> Self {
self.stop_receiver = stop_receiver; self.stop_receiver = stop_receiver;
self self
} }
#[must_use]
pub fn progress_sender(mut self, progress_sender: Option<&'b futures::channel::mpsc::UnboundedSender<ProgressData>>) -> Self { pub fn progress_sender(mut self, progress_sender: Option<&'b futures::channel::mpsc::UnboundedSender<ProgressData>>) -> Self {
self.progress_sender = progress_sender; self.progress_sender = progress_sender;
self self
} }
#[must_use]
pub fn checking_method(mut self, checking_method: CheckingMethod) -> Self { pub fn checking_method(mut self, checking_method: CheckingMethod) -> Self {
self.checking_method = checking_method; self.checking_method = checking_method;
self self
} }
#[must_use]
pub fn max_stage(mut self, max_stage: u8) -> Self { pub fn max_stage(mut self, max_stage: u8) -> Self {
self.max_stage = max_stage; self.max_stage = max_stage;
self self
} }
#[must_use]
pub fn minimal_file_size(mut self, minimal_file_size: u64) -> Self { pub fn minimal_file_size(mut self, minimal_file_size: u64) -> Self {
self.minimal_file_size = Some(minimal_file_size); self.minimal_file_size = Some(minimal_file_size);
self self
} }
#[must_use]
pub fn maximal_file_size(mut self, maximal_file_size: u64) -> Self { pub fn maximal_file_size(mut self, maximal_file_size: u64) -> Self {
self.maximal_file_size = Some(maximal_file_size); self.maximal_file_size = Some(maximal_file_size);
self self
} }
#[must_use]
pub fn collect(mut self, collect: Collect) -> Self { pub fn collect(mut self, collect: Collect) -> Self {
self.collect = collect; self.collect = collect;
self self
} }
#[must_use]
pub fn directories(mut self, directories: Directories) -> Self { pub fn directories(mut self, directories: Directories) -> Self {
self.directories = Some(directories); self.directories = Some(directories);
self self
} }
#[must_use]
pub fn allowed_extensions(mut self, allowed_extensions: Extensions) -> Self { pub fn allowed_extensions(mut self, allowed_extensions: Extensions) -> Self {
self.allowed_extensions = Some(allowed_extensions); self.allowed_extensions = Some(allowed_extensions);
self self
} }
#[must_use]
pub fn excluded_items(mut self, excluded_items: ExcludedItems) -> Self { pub fn excluded_items(mut self, excluded_items: ExcludedItems) -> Self {
self.excluded_items = Some(excluded_items); self.excluded_items = Some(excluded_items);
self self
} }
#[must_use]
pub fn recursive_search(mut self, recursive_search: bool) -> Self { pub fn recursive_search(mut self, recursive_search: bool) -> Self {
self.recursive_search = recursive_search; self.recursive_search = recursive_search;
self self
} }
#[cfg(target_family = "unix")] #[cfg(target_family = "unix")]
#[must_use]
pub fn exclude_other_filesystems(mut self, exclude_other_filesystems: bool) -> Self { pub fn exclude_other_filesystems(mut self, exclude_other_filesystems: bool) -> Self {
match self.directories { match self.directories {
Some(ref mut directories) => directories.set_exclude_other_filesystems(exclude_other_filesystems), Some(ref mut directories) => directories.set_exclude_other_filesystems(exclude_other_filesystems),
@ -413,7 +427,7 @@ where
} }
}; };
match (entry_type(&metadata), collect) { match (entry_type(&metadata), collect) {
(EntryType::Dir, Collect::Files) | (EntryType::Dir, Collect::InvalidSymlinks) => { (EntryType::Dir, Collect::Files | Collect::InvalidSymlinks) => {
if !recursive_search { if !recursive_search {
continue 'dir; continue 'dir;
} }
@ -540,14 +554,14 @@ where
0 0
} }
}, },
hash: "".to_string(), hash: String::new(),
symlink_info: None, symlink_info: None,
}; };
fe_result.push(fe); fe_result.push(fe);
} }
} }
(EntryType::File, Collect::EmptyFolders) | (EntryType::Symlink, Collect::EmptyFolders) => { (EntryType::File | EntryType::Symlink, Collect::EmptyFolders) => {
#[cfg(target_family = "unix")] #[cfg(target_family = "unix")]
if directories.exclude_other_filesystems() { if directories.exclude_other_filesystems() {
match directories.is_on_other_filesystems(current_folder) { match directories.is_on_other_filesystems(current_folder) {
@ -653,7 +667,7 @@ where
} }
}, },
size: 0, size: 0,
hash: "".to_string(), hash: String::new(),
symlink_info: Some(SymlinkInfo { destination_path, type_of_error }), symlink_info: Some(SymlinkInfo { destination_path, type_of_error }),
}; };

12
czkawka_core/src/common_directory.rs
Unescape Escape View File

@ -19,12 +19,13 @@ pub struct Directories {
} }
impl Directories { impl Directories {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
pub fn set_reference_directory(&mut self, reference_directory: Vec<PathBuf>) { pub fn set_reference_directory(&mut self, reference_directory: Vec<PathBuf>) {
self.reference_directories = reference_directory self.reference_directories = reference_directory;
} }
/// Setting included directories, at least one must be provided or scan won't start /// Setting included directories, at least one must be provided or scan won't start
@ -89,7 +90,7 @@ impl Directories {
self.included_directories = checked_directories; self.included_directories = checked_directories;
Common::print_time(start_time, SystemTime::now(), "set_included_directory".to_string()); Common::print_time(start_time, SystemTime::now(), "set_included_directory");
true true
} }
@ -148,12 +149,12 @@ impl Directories {
} }
self.excluded_directories = checked_directories; self.excluded_directories = checked_directories;
Common::print_time(start_time, SystemTime::now(), "set_excluded_directory".to_string()); Common::print_time(start_time, SystemTime::now(), "set_excluded_directory");
} }
#[cfg(target_family = "unix")] #[cfg(target_family = "unix")]
pub fn set_exclude_other_filesystems(&mut self, exclude_other_filesystems: bool) { pub fn set_exclude_other_filesystems(&mut self, exclude_other_filesystems: bool) {
self.exclude_other_filesystems = Some(exclude_other_filesystems) self.exclude_other_filesystems = Some(exclude_other_filesystems);
} }
/// Remove unused entries when included or excluded overlaps with each other or are duplicated etc. /// Remove unused entries when included or excluded overlaps with each other or are duplicated etc.
@ -294,7 +295,7 @@ impl Directories {
// Not needed, but better is to have sorted everything // Not needed, but better is to have sorted everything
self.excluded_directories.sort_unstable(); self.excluded_directories.sort_unstable();
self.included_directories.sort_unstable(); self.included_directories.sort_unstable();
Common::print_time(start_time, SystemTime::now(), "optimize_directories".to_string()); Common::print_time(start_time, SystemTime::now(), "optimize_directories");
// Get device IDs for included directories // Get device IDs for included directories
#[cfg(target_family = "unix")] #[cfg(target_family = "unix")]
@ -323,6 +324,7 @@ impl Directories {
} }
#[cfg(target_family = "unix")] #[cfg(target_family = "unix")]
#[must_use]
pub fn exclude_other_filesystems(&self) -> bool { pub fn exclude_other_filesystems(&self) -> bool {
self.exclude_other_filesystems.unwrap_or(false) self.exclude_other_filesystems.unwrap_or(false)
} }

13
czkawka_core/src/common_extensions.rs
Unescape Escape View File

@ -9,6 +9,7 @@ pub struct Extensions {
} }
impl Extensions { impl Extensions {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
@ -24,7 +25,7 @@ impl Extensions {
allowed_extensions = allowed_extensions.replace("MUSIC", "mp3,flac,ogg,tta,wma,webm"); allowed_extensions = allowed_extensions.replace("MUSIC", "mp3,flac,ogg,tta,wma,webm");
allowed_extensions = allowed_extensions.replace("TEXT", "txt,doc,docx,odt,rtf"); allowed_extensions = allowed_extensions.replace("TEXT", "txt,doc,docx,odt,rtf");
let extensions: Vec<String> = allowed_extensions.split(',').map(|e| e.trim()).map(String::from).collect(); let extensions: Vec<String> = allowed_extensions.split(',').map(str::trim).map(String::from).collect();
for mut extension in extensions { for mut extension in extensions {
if extension.is_empty() || extension.replace(['.', ' '], "").trim().is_empty() { if extension.is_empty() || extension.replace(['.', ' '], "").trim().is_empty() {
continue; continue;
@ -56,9 +57,10 @@ impl Extensions {
.messages .messages
.push("No valid extensions were provided, so allowing all extensions by default.".to_string()); .push("No valid extensions were provided, so allowing all extensions by default.".to_string());
} }
Common::print_time(start_time, SystemTime::now(), "set_allowed_extensions".to_string()); Common::print_time(start_time, SystemTime::now(), "set_allowed_extensions");
} }
#[must_use]
pub fn matches_filename(&self, file_name: &str) -> bool { pub fn matches_filename(&self, file_name: &str) -> bool {
// assert_eq!(file_name, file_name.to_lowercase()); // assert_eq!(file_name, file_name.to_lowercase());
if !self.file_extensions.is_empty() && !self.file_extensions.iter().any(|e| file_name.ends_with(e)) { if !self.file_extensions.is_empty() && !self.file_extensions.iter().any(|e| file_name.ends_with(e)) {
@ -67,6 +69,7 @@ impl Extensions {
true true
} }
#[must_use]
pub fn using_custom_extensions(&self) -> bool { pub fn using_custom_extensions(&self) -> bool {
!self.file_extensions.is_empty() !self.file_extensions.is_empty()
} }
@ -74,7 +77,7 @@ impl Extensions {
pub fn extend_allowed_extensions(&mut self, file_extensions: &[&str]) { pub fn extend_allowed_extensions(&mut self, file_extensions: &[&str]) {
for extension in file_extensions { for extension in file_extensions {
assert!(extension.starts_with('.')); assert!(extension.starts_with('.'));
self.file_extensions.push(extension.to_string()); self.file_extensions.push((*extension).to_string());
} }
} }
@ -83,8 +86,8 @@ impl Extensions {
for extension in file_extensions { for extension in file_extensions {
assert!(extension.starts_with('.')); assert!(extension.starts_with('.'));
if self.file_extensions.contains(&extension.to_string()) { if self.file_extensions.contains(&(*extension).to_string()) {
current_file_extensions.push(extension.to_string()); current_file_extensions.push((*extension).to_string());
} }
} }
self.file_extensions = current_file_extensions; self.file_extensions = current_file_extensions;

3
czkawka_core/src/common_items.rs
Unescape Escape View File

@ -10,6 +10,7 @@ pub struct ExcludedItems {
} }
impl ExcludedItems { impl ExcludedItems {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
@ -54,7 +55,7 @@ impl ExcludedItems {
checked_expressions.push(expression); checked_expressions.push(expression);
} }
self.items = checked_expressions; self.items = checked_expressions;
Common::print_time(start_time, SystemTime::now(), "set_excluded_items".to_string()); Common::print_time(start_time, SystemTime::now(), "set_excluded_items");
} }
/// Checks whether a specified path is excluded from searching /// Checks whether a specified path is excluded from searching

4
czkawka_core/src/common_messages.rs
Unescape Escape View File

@ -6,14 +6,16 @@ pub struct Messages {
} }
impl Messages { impl Messages {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
pub fn print_messages(&self) { pub fn print_messages(&self) {
println!("{}", self.create_messages_text()); println!("{}", self.create_messages_text());
} }
#[must_use]
pub fn create_messages_text(&self) -> String { pub fn create_messages_text(&self) -> String {
let mut text_to_return: String = "".to_string(); let mut text_to_return: String = String::new();
if !self.messages.is_empty() { if !self.messages.is_empty() {
text_to_return += "-------------------------------MESSAGES--------------------------------\n"; text_to_return += "-------------------------------MESSAGES--------------------------------\n";

49
czkawka_core/src/duplicate.rs
Unescape Escape View File

@ -40,7 +40,6 @@ pub enum HashType {
} }
impl HashType { impl HashType {
#[inline(always)]
fn hasher(self: &HashType) -> Box<dyn MyHasher> { fn hasher(self: &HashType) -> Box<dyn MyHasher> {
match self { match self {
HashType::Blake3 => Box::new(blake3::Hasher::new()), HashType::Blake3 => Box::new(blake3::Hasher::new()),
@ -73,6 +72,7 @@ pub struct Info {
} }
impl Info { impl Info {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
@ -109,6 +109,7 @@ pub struct DuplicateFinder {
} }
impl DuplicateFinder { impl DuplicateFinder {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
text_messages: Messages::new(), text_messages: Messages::new(),
@ -184,10 +185,12 @@ impl DuplicateFinder {
self.case_sensitive_name_comparison = case_sensitive_name_comparison; self.case_sensitive_name_comparison = case_sensitive_name_comparison;
} }
#[must_use]
pub const fn get_check_method(&self) -> &CheckingMethod { pub const fn get_check_method(&self) -> &CheckingMethod {
&self.check_method &self.check_method
} }
#[must_use]
pub fn get_stopped_search(&self) -> bool { pub fn get_stopped_search(&self) -> bool {
self.stopped_search self.stopped_search
} }
@ -200,6 +203,7 @@ impl DuplicateFinder {
self.minimal_prehash_cache_file_size = minimal_prehash_cache_file_size; self.minimal_prehash_cache_file_size = minimal_prehash_cache_file_size;
} }
#[must_use]
pub const fn get_files_sorted_by_names(&self) -> &BTreeMap<String, Vec<FileEntry>> { pub const fn get_files_sorted_by_names(&self) -> &BTreeMap<String, Vec<FileEntry>> {
&self.files_with_identical_names &self.files_with_identical_names
} }
@ -212,10 +216,12 @@ impl DuplicateFinder {
self.use_prehash_cache = use_prehash_cache; self.use_prehash_cache = use_prehash_cache;
} }
#[must_use]
pub const fn get_files_sorted_by_size(&self) -> &BTreeMap<u64, Vec<FileEntry>> { pub const fn get_files_sorted_by_size(&self) -> &BTreeMap<u64, Vec<FileEntry>> {
&self.files_with_identical_size &self.files_with_identical_size
} }
#[must_use]
pub const fn get_files_sorted_by_hash(&self) -> &BTreeMap<u64, Vec<Vec<FileEntry>>> { pub const fn get_files_sorted_by_hash(&self) -> &BTreeMap<u64, Vec<Vec<FileEntry>>> {
&self.files_with_identical_hashes &self.files_with_identical_hashes
} }
@ -226,10 +232,12 @@ impl DuplicateFinder {
}; };
} }
#[must_use]
pub const fn get_text_messages(&self) -> &Messages { pub const fn get_text_messages(&self) -> &Messages {
&self.text_messages &self.text_messages
} }
#[must_use]
pub const fn get_information(&self) -> &Info { pub const fn get_information(&self) -> &Info {
&self.information &self.information
} }
@ -261,6 +269,7 @@ impl DuplicateFinder {
}; };
} }
#[must_use]
pub fn get_use_reference(&self) -> bool { pub fn get_use_reference(&self) -> bool {
self.use_reference_folders self.use_reference_folders
} }
@ -295,14 +304,17 @@ impl DuplicateFinder {
self.allowed_extensions.set_allowed_extensions(allowed_extensions, &mut self.text_messages); self.allowed_extensions.set_allowed_extensions(allowed_extensions, &mut self.text_messages);
} }
#[must_use]
pub fn get_files_with_identical_hashes_referenced(&self) -> &BTreeMap<u64, Vec<(FileEntry, Vec<FileEntry>)>> { pub fn get_files_with_identical_hashes_referenced(&self) -> &BTreeMap<u64, Vec<(FileEntry, Vec<FileEntry>)>> {
&self.files_with_identical_hashes_referenced &self.files_with_identical_hashes_referenced
} }
#[must_use]
pub fn get_files_with_identical_name_referenced(&self) -> &BTreeMap<String, (FileEntry, Vec<FileEntry>)> { pub fn get_files_with_identical_name_referenced(&self) -> &BTreeMap<String, (FileEntry, Vec<FileEntry>)> {
&self.files_with_identical_names_referenced &self.files_with_identical_names_referenced
} }
#[must_use]
pub fn get_files_with_identical_size_referenced(&self) -> &BTreeMap<u64, (FileEntry, Vec<FileEntry>)> { pub fn get_files_with_identical_size_referenced(&self) -> &BTreeMap<u64, (FileEntry, Vec<FileEntry>)> {
&self.files_with_identical_size_referenced &self.files_with_identical_size_referenced
} }
@ -389,7 +401,7 @@ impl DuplicateFinder {
} }
} }
Common::print_time(start_time, SystemTime::now(), "check_files_name".to_string()); Common::print_time(start_time, SystemTime::now(), "check_files_name");
true true
} }
DirTraversalResult::SuccessFolders { .. } => { DirTraversalResult::SuccessFolders { .. } => {
@ -491,7 +503,7 @@ impl DuplicateFinder {
} }
} }
Common::print_time(start_time, SystemTime::now(), "check_files_size".to_string()); Common::print_time(start_time, SystemTime::now(), "check_files_size");
true true
} }
DirTraversalResult::SuccessFolders { .. } => { DirTraversalResult::SuccessFolders { .. } => {
@ -520,7 +532,7 @@ impl DuplicateFinder {
let progress_send = progress_sender.clone(); let progress_send = progress_sender.clone();
let progress_thread_run = progress_thread_run.clone(); let progress_thread_run = progress_thread_run.clone();
let atomic_file_counter = atomic_file_counter.clone(); let atomic_file_counter = atomic_file_counter.clone();
let files_to_check = self.files_with_identical_size.values().map(|e| e.len()).sum(); let files_to_check = self.files_with_identical_size.values().map(Vec::len).sum();
let checking_method = self.check_method; let checking_method = self.check_method;
thread::spawn(move || loop { thread::spawn(move || loop {
progress_send progress_send
@ -665,7 +677,7 @@ impl DuplicateFinder {
///////////////////////////////////////////////////////////////////////////// PREHASHING END ///////////////////////////////////////////////////////////////////////////// PREHASHING END
Common::print_time(start_time, SystemTime::now(), "check_files_hash - prehash".to_string()); Common::print_time(start_time, SystemTime::now(), "check_files_hash - prehash");
let start_time: SystemTime = SystemTime::now(); let start_time: SystemTime = SystemTime::now();
///////////////////////// /////////////////////////
@ -679,7 +691,7 @@ impl DuplicateFinder {
let progress_send = progress_sender.clone(); let progress_send = progress_sender.clone();
let progress_thread_run = progress_thread_run.clone(); let progress_thread_run = progress_thread_run.clone();
let atomic_file_counter = atomic_file_counter.clone(); let atomic_file_counter = atomic_file_counter.clone();
let files_to_check = pre_checked_map.values().map(|vec_file_entry| vec_file_entry.len()).sum(); let files_to_check = pre_checked_map.values().map(Vec::len).sum();
let checking_method = self.check_method; let checking_method = self.check_method;
thread::spawn(move || loop { thread::spawn(move || loop {
progress_send progress_send
@ -853,9 +865,8 @@ impl DuplicateFinder {
if files_from_referenced_folders.is_empty() || normal_files.is_empty() { if files_from_referenced_folders.is_empty() || normal_files.is_empty() {
continue; continue;
} else {
all_results_with_same_size.push((files_from_referenced_folders.pop().unwrap(), normal_files))
} }
all_results_with_same_size.push((files_from_referenced_folders.pop().unwrap(), normal_files));
} }
if all_results_with_same_size.is_empty() { if all_results_with_same_size.is_empty() {
None None
@ -887,7 +898,7 @@ impl DuplicateFinder {
} }
} }
Common::print_time(start_time, SystemTime::now(), "check_files_hash - full hash".to_string()); Common::print_time(start_time, SystemTime::now(), "check_files_hash - full hash");
// Clean unused data // Clean unused data
self.files_with_identical_size = Default::default(); self.files_with_identical_size = Default::default();
@ -895,7 +906,7 @@ impl DuplicateFinder {
true true
} }
/// Function to delete files, from filed before BTreeMap /// Function to delete files, from filed before `BTreeMap`
/// Using another function to delete files to avoid duplicates data /// Using another function to delete files to avoid duplicates data
fn delete_files(&mut self) { fn delete_files(&mut self) {
let start_time: SystemTime = SystemTime::now(); let start_time: SystemTime = SystemTime::now();
@ -927,7 +938,7 @@ impl DuplicateFinder {
} }
} }
Common::print_time(start_time, SystemTime::now(), "delete_files".to_string()); Common::print_time(start_time, SystemTime::now(), "delete_files");
} }
} }
@ -1098,7 +1109,7 @@ impl SaveResults for DuplicateFinder {
panic!(); panic!();
} }
} }
Common::print_time(start_time, SystemTime::now(), "save_results_to_file".to_string()); Common::print_time(start_time, SystemTime::now(), "save_results_to_file");
true true
} }
} }
@ -1127,7 +1138,7 @@ impl PrintResults for DuplicateFinder {
} }
} }
CheckingMethod::Hash => { CheckingMethod::Hash => {
for (_size, vector) in self.files_with_identical_hashes.iter() { for vector in self.files_with_identical_hashes.values() {
for j in vector { for j in vector {
number_of_files += j.len() as u64; number_of_files += j.len() as u64;
number_of_groups += 1; number_of_groups += 1;
@ -1173,7 +1184,7 @@ impl PrintResults for DuplicateFinder {
panic!("Checking Method shouldn't be ever set to None"); panic!("Checking Method shouldn't be ever set to None");
} }
} }
Common::print_time(start_time, SystemTime::now(), "print_entries".to_string()); Common::print_time(start_time, SystemTime::now(), "print_entries");
} }
} }
@ -1190,7 +1201,7 @@ fn delete_files(vector: &[FileEntry], delete_method: &DeleteMethod, text_message
DeleteMethod::OneNewest | DeleteMethod::AllExceptOldest | DeleteMethod::HardLink => values.min_by(|(_, l), (_, r)| l.modified_date.cmp(&r.modified_date)), DeleteMethod::OneNewest | DeleteMethod::AllExceptOldest | DeleteMethod::HardLink => values.min_by(|(_, l), (_, r)| l.modified_date.cmp(&r.modified_date)),
DeleteMethod::None => values.next(), DeleteMethod::None => values.next(),
}; };
let q_index = q_index.map(|t| t.0).unwrap_or(0); let q_index = q_index.map_or(0, |t| t.0);
let n = match delete_method { let n = match delete_method {
DeleteMethod::OneNewest | DeleteMethod::OneOldest => 1, DeleteMethod::OneNewest | DeleteMethod::OneOldest => 1,
DeleteMethod::AllExceptNewest | DeleteMethod::AllExceptOldest | DeleteMethod::None | DeleteMethod::HardLink => usize::MAX, DeleteMethod::AllExceptNewest | DeleteMethod::AllExceptOldest | DeleteMethod::None | DeleteMethod::HardLink => usize::MAX,
@ -1198,7 +1209,8 @@ fn delete_files(vector: &[FileEntry], delete_method: &DeleteMethod, text_message
for (index, file) in vector.iter().enumerate() { for (index, file) in vector.iter().enumerate() {
if q_index == index { if q_index == index {
continue; continue;
} else if removed_files + failed_to_remove_files >= n { }
if removed_files + failed_to_remove_files >= n {
break; break;
} }
@ -1287,9 +1299,8 @@ pub fn save_hashes_to_file(hashmap: &BTreeMap<String, FileEntry>, text_messages:
.warnings .warnings
.push(format!("Failed to save some data to cache file {}, reason {}", cache_file.display(), e)); .push(format!("Failed to save some data to cache file {}, reason {}", cache_file.display(), e));
return; return;
} else {
how_much += 1;
} }
how_much += 1;
} }
} }
@ -1372,7 +1383,7 @@ pub fn load_hashes_from_file(text_messages: &mut Messages, delete_outdated_cache
text_messages.messages.push(flc!( text_messages.messages.push(flc!(
"core_loading_from_cache", "core_loading_from_cache",
generate_translation_hashmap(vec![("number", hashmap_loaded_entries.values().map(|e| e.len()).sum::<usize>().to_string())]) generate_translation_hashmap(vec![("number", hashmap_loaded_entries.values().map(std::vec::Vec::len).sum::<usize>().to_string())])
)); ));
return Some(hashmap_loaded_entries); return Some(hashmap_loaded_entries);

18
czkawka_core/src/empty_files.rs
Unescape Escape View File

@ -28,6 +28,7 @@ pub struct Info {
} }
impl Info { impl Info {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
@ -47,6 +48,7 @@ pub struct EmptyFiles {
} }
impl EmptyFiles { impl EmptyFiles {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
text_messages: Messages::new(), text_messages: Messages::new(),
@ -72,18 +74,22 @@ impl EmptyFiles {
self.debug_print(); self.debug_print();
} }
#[must_use]
pub fn get_stopped_search(&self) -> bool { pub fn get_stopped_search(&self) -> bool {
self.stopped_search self.stopped_search
} }
#[must_use]
pub const fn get_empty_files(&self) -> &Vec<FileEntry> { pub const fn get_empty_files(&self) -> &Vec<FileEntry> {
&self.empty_files &self.empty_files
} }
#[must_use]
pub const fn get_text_messages(&self) -> &Messages { pub const fn get_text_messages(&self) -> &Messages {
&self.text_messages &self.text_messages
} }
#[must_use]
pub const fn get_information(&self) -> &Info { pub const fn get_information(&self) -> &Info {
&self.information &self.information
} }
@ -144,7 +150,7 @@ impl EmptyFiles {
} }
self.information.number_of_empty_files = self.empty_files.len(); self.information.number_of_empty_files = self.empty_files.len();
self.text_messages.warnings.extend(warnings); self.text_messages.warnings.extend(warnings);
Common::print_time(start_time, SystemTime::now(), "check_files_name".to_string()); Common::print_time(start_time, SystemTime::now(), "check_files_name");
true true
} }
DirTraversalResult::SuccessFolders { .. } => { DirTraversalResult::SuccessFolders { .. } => {
@ -171,7 +177,7 @@ impl EmptyFiles {
} }
} }
Common::print_time(start_time, SystemTime::now(), "delete_files".to_string()); Common::print_time(start_time, SystemTime::now(), "delete_files");
} }
} }
@ -239,13 +245,13 @@ impl SaveResults for EmptyFiles {
if !self.empty_files.is_empty() { if !self.empty_files.is_empty() {
writeln!(writer, "Found {} empty files.", self.information.number_of_empty_files).unwrap(); writeln!(writer, "Found {} empty files.", self.information.number_of_empty_files).unwrap();
for file_entry in self.empty_files.iter() { for file_entry in &self.empty_files {
writeln!(writer, "{}", file_entry.path.display()).unwrap(); writeln!(writer, "{}", file_entry.path.display()).unwrap();
} }
} else { } else {
write!(writer, "Not found any empty files.").unwrap(); write!(writer, "Not found any empty files.").unwrap();
} }
Common::print_time(start_time, SystemTime::now(), "save_results_to_file".to_string()); Common::print_time(start_time, SystemTime::now(), "save_results_to_file");
true true
} }
} }
@ -256,10 +262,10 @@ impl PrintResults for EmptyFiles {
fn print_results(&self) { fn print_results(&self) {
let start_time: SystemTime = SystemTime::now(); let start_time: SystemTime = SystemTime::now();
println!("Found {} empty files.\n", self.information.number_of_empty_files); println!("Found {} empty files.\n", self.information.number_of_empty_files);
for file_entry in self.empty_files.iter() { for file_entry in &self.empty_files {
println!("{}", file_entry.path.display()); println!("{}", file_entry.path.display());
} }
Common::print_time(start_time, SystemTime::now(), "print_entries".to_string()); Common::print_time(start_time, SystemTime::now(), "print_entries");
} }
} }

16
czkawka_core/src/empty_folder.rs
Unescape Escape View File

@ -32,14 +32,16 @@ pub struct Info {
} }
impl Info { impl Info {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
} }
/// Method implementation for EmptyFolder /// Method implementation for `EmptyFolder`
impl EmptyFolder { impl EmptyFolder {
/// New function providing basics values /// New function providing basics values
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
information: Default::default(), information: Default::default(),
@ -52,17 +54,21 @@ impl EmptyFolder {
} }
} }
#[must_use]
pub fn get_stopped_search(&self) -> bool { pub fn get_stopped_search(&self) -> bool {
self.stopped_search self.stopped_search
} }
#[must_use]
pub const fn get_empty_folder_list(&self) -> &BTreeMap<PathBuf, FolderEntry> { pub const fn get_empty_folder_list(&self) -> &BTreeMap<PathBuf, FolderEntry> {
&self.empty_folder_list &self.empty_folder_list
} }
#[must_use]
pub const fn get_text_messages(&self) -> &Messages { pub const fn get_text_messages(&self) -> &Messages {
&self.text_messages &self.text_messages
} }
#[must_use]
pub const fn get_information(&self) -> &Info { pub const fn get_information(&self) -> &Info {
&self.information &self.information
} }
@ -121,7 +127,7 @@ impl EmptyFolder {
} }
/// Function to check if folder are empty. /// Function to check if folder are empty.
/// Parameter initial_checking for second check before deleting to be sure that checked folder is still empty /// Parameter `initial_checking` for second check before deleting to be sure that checked folder is still empty
fn check_for_empty_folders(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&futures::channel::mpsc::UnboundedSender<ProgressData>>) -> bool { fn check_for_empty_folders(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&futures::channel::mpsc::UnboundedSender<ProgressData>>) -> bool {
let result = DirTraversalBuilder::new() let result = DirTraversalBuilder::new()
.root_dirs(self.directories.included_directories.clone()) .root_dirs(self.directories.included_directories.clone())
@ -153,7 +159,7 @@ impl EmptyFolder {
self.text_messages.warnings.extend(warnings); self.text_messages.warnings.extend(warnings);
Common::print_time(start_time, SystemTime::now(), "check_for_empty_folder".to_string()); Common::print_time(start_time, SystemTime::now(), "check_for_empty_folder");
true true
} }
DirTraversalResult::Stopped => false, DirTraversalResult::Stopped => false,
@ -171,7 +177,7 @@ impl EmptyFolder {
}; };
} }
Common::print_time(start_time, SystemTime::now(), "delete_files".to_string()); Common::print_time(start_time, SystemTime::now(), "delete_files");
} }
/// Set included dir which needs to be relative, exists etc. /// Set included dir which needs to be relative, exists etc.
@ -241,7 +247,7 @@ impl SaveResults for EmptyFolder {
} else { } else {
write!(writer, "Not found any empty folders.").unwrap(); write!(writer, "Not found any empty folders.").unwrap();
} }
Common::print_time(start_time, SystemTime::now(), "save_results_to_file".to_string()); Common::print_time(start_time, SystemTime::now(), "save_results_to_file");
true true
} }
} }

18
czkawka_core/src/invalid_symlinks.rs
Unescape Escape View File

@ -28,6 +28,7 @@ pub struct Info {
} }
impl Info { impl Info {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
@ -47,6 +48,7 @@ pub struct InvalidSymlinks {
} }
impl InvalidSymlinks { impl InvalidSymlinks {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
text_messages: Messages::new(), text_messages: Messages::new(),
@ -71,18 +73,22 @@ impl InvalidSymlinks {
self.debug_print(); self.debug_print();
} }
#[must_use]
pub fn get_stopped_search(&self) -> bool { pub fn get_stopped_search(&self) -> bool {
self.stopped_search self.stopped_search
} }
#[must_use]
pub const fn get_invalid_symlinks(&self) -> &Vec<FileEntry> { pub const fn get_invalid_symlinks(&self) -> &Vec<FileEntry> {
&self.invalid_symlinks &self.invalid_symlinks
} }
#[must_use]
pub const fn get_text_messages(&self) -> &Messages { pub const fn get_text_messages(&self) -> &Messages {
&self.text_messages &self.text_messages
} }
#[must_use]
pub const fn get_information(&self) -> &Info { pub const fn get_information(&self) -> &Info {
&self.information &self.information
} }
@ -142,7 +148,7 @@ impl InvalidSymlinks {
} }
self.information.number_of_invalid_symlinks = self.invalid_symlinks.len(); self.information.number_of_invalid_symlinks = self.invalid_symlinks.len();
self.text_messages.warnings.extend(warnings); self.text_messages.warnings.extend(warnings);
Common::print_time(start_time, SystemTime::now(), "check_files_name".to_string()); Common::print_time(start_time, SystemTime::now(), "check_files_name");
true true
} }
DirTraversalResult::SuccessFolders { .. } => unreachable!(), DirTraversalResult::SuccessFolders { .. } => unreachable!(),
@ -167,7 +173,7 @@ impl InvalidSymlinks {
} }
} }
Common::print_time(start_time, SystemTime::now(), "delete_files".to_string()); Common::print_time(start_time, SystemTime::now(), "delete_files");
} }
} }
@ -235,7 +241,7 @@ impl SaveResults for InvalidSymlinks {
if !self.invalid_symlinks.is_empty() { if !self.invalid_symlinks.is_empty() {
writeln!(writer, "Found {} invalid symlinks.", self.information.number_of_invalid_symlinks).unwrap(); writeln!(writer, "Found {} invalid symlinks.", self.information.number_of_invalid_symlinks).unwrap();
for file_entry in self.invalid_symlinks.iter() { for file_entry in &self.invalid_symlinks {
writeln!( writeln!(
writer, writer,
"{}\t\t{}\t\t{}", "{}\t\t{}\t\t{}",
@ -251,7 +257,7 @@ impl SaveResults for InvalidSymlinks {
} else { } else {
write!(writer, "Not found any invalid symlinks.").unwrap(); write!(writer, "Not found any invalid symlinks.").unwrap();
} }
Common::print_time(start_time, SystemTime::now(), "save_results_to_file".to_string()); Common::print_time(start_time, SystemTime::now(), "save_results_to_file");
true true
} }
} }
@ -262,7 +268,7 @@ impl PrintResults for InvalidSymlinks {
fn print_results(&self) { fn print_results(&self) {
let start_time: SystemTime = SystemTime::now(); let start_time: SystemTime = SystemTime::now();
println!("Found {} invalid symlinks.\n", self.information.number_of_invalid_symlinks); println!("Found {} invalid symlinks.\n", self.information.number_of_invalid_symlinks);
for file_entry in self.invalid_symlinks.iter() { for file_entry in &self.invalid_symlinks {
println!( println!(
"{}\t\t{}\t\t{}", "{}\t\t{}\t\t{}",
file_entry.path.display(), file_entry.path.display(),
@ -274,6 +280,6 @@ impl PrintResults for InvalidSymlinks {
); );
} }
Common::print_time(start_time, SystemTime::now(), "print_entries".to_string()); Common::print_time(start_time, SystemTime::now(), "print_entries");
} }
} }

4
czkawka_core/src/localizer_core.rs
Unescape Escape View File

@ -31,10 +31,12 @@ macro_rules! flc {
} }
// Get the `Localizer` to be used for localizing this library. // Get the `Localizer` to be used for localizing this library.
#[must_use]
pub fn localizer_core() -> Box<dyn Localizer> { pub fn localizer_core() -> Box<dyn Localizer> {
Box::from(DefaultLocalizer::new(&*LANGUAGE_LOADER_CORE, &Localizations)) Box::from(DefaultLocalizer::new(&*LANGUAGE_LOADER_CORE, &Localizations))
} }
#[must_use]
pub fn generate_translation_hashmap(vec: Vec<(&'static str, String)>) -> HashMap<&'static str, String> { pub fn generate_translation_hashmap(vec: Vec<(&'static str, String)>) -> HashMap<&'static str, String> {
let mut hashmap: HashMap<&'static str, String> = Default::default(); let mut hashmap: HashMap<&'static str, String> = Default::default();
for (key, value) in vec { for (key, value) in vec {
@ -43,10 +45,12 @@ pub fn generate_translation_hashmap(vec: Vec<(&'static str, String)>) -> HashMap
hashmap hashmap
} }
#[must_use]
pub fn fnc_get_similarity_very_high() -> String { pub fn fnc_get_similarity_very_high() -> String {
flc!("core_similarity_very_high") flc!("core_similarity_very_high")
} }
#[must_use]
pub fn fnc_get_similarity_minimal() -> String { pub fn fnc_get_similarity_minimal() -> String {
flc!("core_similarity_minimal") flc!("core_similarity_minimal")
} }

71
czkawka_core/src/same_music.rs
Unescape Escape View File

@ -39,7 +39,7 @@ bitflags! {
const YEAR = 0b100; const YEAR = 0b100;
const LENGTH = 0b1000; const LENGTH = 0b1000;
const GENRE = 0b10000; const GENRE = 0b10000;
const BITRATE = 0b100000; const BITRATE = 0b10_0000;
} }
} }
@ -65,11 +65,11 @@ impl FileEntry {
path: self.path.clone(), path: self.path.clone(),
modified_date: self.modified_date, modified_date: self.modified_date,
track_title: "".to_string(), track_title: String::new(),
track_artist: "".to_string(), track_artist: String::new(),
year: "".to_string(), year: String::new(),
length: "".to_string(), length: String::new(),
genre: "".to_string(), genre: String::new(),
bitrate: 0, bitrate: 0,
} }
} }
@ -83,6 +83,7 @@ pub struct Info {
} }
impl Info { impl Info {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
@ -113,6 +114,7 @@ pub struct SameMusic {
} }
impl SameMusic { impl SameMusic {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
text_messages: Messages::new(), text_messages: Messages::new(),
@ -157,21 +159,26 @@ impl SameMusic {
self.debug_print(); self.debug_print();
} }
#[must_use]
pub fn get_stopped_search(&self) -> bool { pub fn get_stopped_search(&self) -> bool {
self.stopped_search self.stopped_search
} }
#[must_use]
pub const fn get_duplicated_music_entries(&self) -> &Vec<Vec<MusicEntry>> { pub const fn get_duplicated_music_entries(&self) -> &Vec<Vec<MusicEntry>> {
&self.duplicated_music_entries &self.duplicated_music_entries
} }
#[must_use]
pub const fn get_music_similarity(&self) -> &MusicSimilarity { pub const fn get_music_similarity(&self) -> &MusicSimilarity {
&self.music_similarity &self.music_similarity
} }
#[must_use]
pub const fn get_text_messages(&self) -> &Messages { pub const fn get_text_messages(&self) -> &Messages {
&self.text_messages &self.text_messages
} }
#[must_use]
pub const fn get_information(&self) -> &Info { pub const fn get_information(&self) -> &Info {
&self.information &self.information
} }
@ -235,10 +242,12 @@ impl SameMusic {
}; };
} }
#[must_use]
pub fn get_similar_music_referenced(&self) -> &Vec<(MusicEntry, Vec<MusicEntry>)> { pub fn get_similar_music_referenced(&self) -> &Vec<(MusicEntry, Vec<MusicEntry>)> {
&self.duplicated_music_entries_referenced &self.duplicated_music_entries_referenced
} }
#[must_use]
pub fn get_number_of_base_duplicated_files(&self) -> usize { pub fn get_number_of_base_duplicated_files(&self) -> usize {
if self.use_reference_folders { if self.use_reference_folders {
self.duplicated_music_entries_referenced.len() self.duplicated_music_entries_referenced.len()
@ -247,6 +256,7 @@ impl SameMusic {
} }
} }
#[must_use]
pub fn get_use_reference(&self) -> bool { pub fn get_use_reference(&self) -> bool {
self.use_reference_folders self.use_reference_folders
} }
@ -287,7 +297,7 @@ impl SameMusic {
} }
} }
self.text_messages.warnings.extend(warnings); self.text_messages.warnings.extend(warnings);
Common::print_time(start_time, SystemTime::now(), "check_files".to_string()); Common::print_time(start_time, SystemTime::now(), "check_files");
true true
} }
DirTraversalResult::SuccessFolders { .. } => { DirTraversalResult::SuccessFolders { .. } => {
@ -386,26 +396,25 @@ impl SameMusic {
} }
}); });
let tagged_file = match result { let tagged_file = if let Ok(t) = result {
Ok(t) => match t { match t {
Some(r) => r, Some(r) => r,
None => { None => {
return Some(Some(music_entry)); return Some(Some(music_entry));
} }
},
Err(_) => {
let message = create_crash_message("Lofty", &path, "https://github.com/image-rs/image/issues");
println!("{message}");
return Some(None);
} }
} else {
let message = create_crash_message("Lofty", &path, "https://github.com/image-rs/image/issues");
println!("{message}");
return Some(None);
}; };
let properties = tagged_file.properties(); let properties = tagged_file.properties();
let mut track_title = "".to_string(); let mut track_title = String::new();
let mut track_artist = "".to_string(); let mut track_artist = String::new();
let mut year = "".to_string(); let mut year = String::new();
let mut genre = "".to_string(); let mut genre = String::new();
let bitrate = properties.audio_bitrate().unwrap_or(0); let bitrate = properties.audio_bitrate().unwrap_or(0);
let mut length = properties.duration().as_millis().to_string(); let mut length = properties.duration().as_millis().to_string();
@ -451,10 +460,10 @@ impl SameMusic {
// That means, that audio have length smaller that second, but length is properly read // That means, that audio have length smaller that second, but length is properly read
length = "0:01".to_string(); length = "0:01".to_string();
} else { } else {
length = "".to_string(); length = String::new();
} }
} else { } else {
length = "".to_string(); length = String::new();
} }
music_entry.track_title = track_title; music_entry.track_title = track_title;
@ -467,8 +476,8 @@ impl SameMusic {
Some(Some(music_entry)) Some(Some(music_entry))
}) })
.while_some() .while_some()
.filter(|music_entry| music_entry.is_some()) .filter(Option::is_some)
.map(|music_entry| music_entry.unwrap()) .map(Option::unwrap)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
// End thread which send info to gui // End thread which send info to gui
@ -497,14 +506,12 @@ impl SameMusic {
return false; return false;
} }
Common::print_time(start_time, SystemTime::now(), "check_records_multithreaded".to_string()); Common::print_time(start_time, SystemTime::now(), "check_records_multithreaded");
true true
} }
fn check_for_duplicates(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&futures::channel::mpsc::UnboundedSender<ProgressData>>) -> bool { fn check_for_duplicates(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&futures::channel::mpsc::UnboundedSender<ProgressData>>) -> bool {
if MusicSimilarity::NONE == self.music_similarity { assert!(MusicSimilarity::NONE != self.music_similarity, "This can't be none");
panic!("This can't be none");
}
let start_time: SystemTime = SystemTime::now(); let start_time: SystemTime = SystemTime::now();
//// PROGRESS THREAD START //// PROGRESS THREAD START
@ -743,7 +750,7 @@ impl SameMusic {
} }
} }
Common::print_time(start_time, SystemTime::now(), "check_for_duplicates".to_string()); Common::print_time(start_time, SystemTime::now(), "check_for_duplicates");
// Clear unused data // Clear unused data
self.music_entries.clear(); self.music_entries.clear();
@ -775,7 +782,7 @@ impl SameMusic {
// } // }
// } // }
Common::print_time(start_time, SystemTime::now(), "delete_files".to_string()); Common::print_time(start_time, SystemTime::now(), "delete_files");
} }
} }
@ -915,13 +922,13 @@ impl SaveResults for SameMusic {
if !self.music_entries.is_empty() { if !self.music_entries.is_empty() {
writeln!(writer, "Found {} same music files.", self.information.number_of_duplicates).unwrap(); writeln!(writer, "Found {} same music files.", self.information.number_of_duplicates).unwrap();
for file_entry in self.music_entries.iter() { for file_entry in &self.music_entries {
writeln!(writer, "{}", file_entry.path.display()).unwrap(); writeln!(writer, "{}", file_entry.path.display()).unwrap();
} }
} else { } else {
write!(writer, "Not found any empty files.").unwrap(); write!(writer, "Not found any empty files.").unwrap();
} }
Common::print_time(start_time, SystemTime::now(), "save_results_to_file".to_string()); Common::print_time(start_time, SystemTime::now(), "save_results_to_file");
true true
} }
} }
@ -932,7 +939,7 @@ impl PrintResults for SameMusic {
fn print_results(&self) { fn print_results(&self) {
let start_time: SystemTime = SystemTime::now(); let start_time: SystemTime = SystemTime::now();
println!("Found {} similar music files.\n", self.duplicated_music_entries.len()); println!("Found {} similar music files.\n", self.duplicated_music_entries.len());
for vec_file_entry in self.duplicated_music_entries.iter() { for vec_file_entry in &self.duplicated_music_entries {
for file_entry in vec_file_entry { for file_entry in vec_file_entry {
println!( println!(
"TT: {} - TA: {} - Y: {} - L: {} - G: {} - B: {} - P: {}", "TT: {} - TA: {} - Y: {} - L: {} - G: {} - B: {} - P: {}",
@ -948,7 +955,7 @@ impl PrintResults for SameMusic {
println!(); println!();
} }
Common::print_time(start_time, SystemTime::now(), "print_entries".to_string()); Common::print_time(start_time, SystemTime::now(), "print_entries");
} }
} }

68
czkawka_core/src/similar_images.rs
Unescape Escape View File

@ -119,14 +119,16 @@ pub struct Info {
} }
impl Info { impl Info {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
} }
/// Method implementation for EmptyFolder /// Method implementation for `EmptyFolder`
impl SimilarImages { impl SimilarImages {
/// New function providing basics values /// New function providing basics values
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
information: Default::default(), information: Default::default(),
@ -184,26 +186,32 @@ impl SimilarImages {
self.save_also_as_json = save_also_as_json; self.save_also_as_json = save_also_as_json;
} }
#[must_use]
pub fn get_stopped_search(&self) -> bool { pub fn get_stopped_search(&self) -> bool {
self.stopped_search self.stopped_search
} }
#[must_use]
pub const fn get_text_messages(&self) -> &Messages { pub const fn get_text_messages(&self) -> &Messages {
&self.text_messages &self.text_messages
} }
#[must_use]
pub const fn get_similar_images(&self) -> &Vec<Vec<FileEntry>> { pub const fn get_similar_images(&self) -> &Vec<Vec<FileEntry>> {
&self.similar_vectors &self.similar_vectors
} }
#[must_use]
pub fn get_similar_images_referenced(&self) -> &Vec<(FileEntry, Vec<FileEntry>)> { pub fn get_similar_images_referenced(&self) -> &Vec<(FileEntry, Vec<FileEntry>)> {
&self.similar_referenced_vectors &self.similar_referenced_vectors
} }
#[must_use]
pub fn get_use_reference(&self) -> bool { pub fn get_use_reference(&self) -> bool {
self.use_reference_folders self.use_reference_folders
} }
#[must_use]
pub const fn get_information(&self) -> &Info { pub const fn get_information(&self) -> &Info {
&self.information &self.information
} }
@ -270,7 +278,7 @@ impl SimilarImages {
// } // }
/// Function to check if folder are empty. /// Function to check if folder are empty.
/// Parameter initial_checking for second check before deleting to be sure that checked folder is still empty /// Parameter `initial_checking` for second check before deleting to be sure that checked folder is still empty
fn check_for_similar_images(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&futures::channel::mpsc::UnboundedSender<ProgressData>>) -> bool { fn check_for_similar_images(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&futures::channel::mpsc::UnboundedSender<ProgressData>>) -> bool {
let start_time: SystemTime = SystemTime::now(); let start_time: SystemTime = SystemTime::now();
let mut folders_to_check: Vec<PathBuf> = Vec::with_capacity(1024 * 2); // This should be small enough too not see to big difference and big enough to store most of paths without needing to resize vector let mut folders_to_check: Vec<PathBuf> = Vec::with_capacity(1024 * 2); // This should be small enough too not see to big difference and big enough to store most of paths without needing to resize vector
@ -422,7 +430,7 @@ impl SimilarImages {
let fe: FileEntry = FileEntry { let fe: FileEntry = FileEntry {
path: current_file_name.clone(), path: current_file_name.clone(),
size: metadata.len(), size: metadata.len(),
dimensions: "".to_string(), dimensions: String::new(),
modified_date: match metadata.modified() { modified_date: match metadata.modified() {
Ok(t) => match t.duration_since(UNIX_EPOCH) { Ok(t) => match t.duration_since(UNIX_EPOCH) {
Ok(d) => d.as_secs(), Ok(d) => d.as_secs(),
@ -471,7 +479,7 @@ impl SimilarImages {
// End thread which send info to gui // End thread which send info to gui
progress_thread_run.store(false, Ordering::Relaxed); progress_thread_run.store(false, Ordering::Relaxed);
progress_thread_handle.join().unwrap(); progress_thread_handle.join().unwrap();
Common::print_time(start_time, SystemTime::now(), "check_for_similar_images".to_string()); Common::print_time(start_time, SystemTime::now(), "check_for_similar_images");
true true
} }
@ -514,11 +522,7 @@ impl SimilarImages {
mem::swap(&mut self.images_to_check, &mut non_cached_files_to_check); mem::swap(&mut self.images_to_check, &mut non_cached_files_to_check);
} }
Common::print_time( Common::print_time(hash_map_modification, SystemTime::now(), "sort_images - reading data from cache and preparing them");
hash_map_modification,
SystemTime::now(),
"sort_images - reading data from cache and preparing them".to_string(),
);
let hash_map_modification = SystemTime::now(); let hash_map_modification = SystemTime::now();
//// PROGRESS THREAD START //// PROGRESS THREAD START
@ -629,15 +633,15 @@ impl SimilarImages {
Some(Some((file_entry, buf))) Some(Some((file_entry, buf)))
}) })
.while_some() .while_some()
.filter(|file_entry| file_entry.is_some()) .filter(Option::is_some)
.map(|file_entry| file_entry.unwrap()) .map(Option::unwrap)
.collect::<Vec<(FileEntry, Vec<u8>)>>(); .collect::<Vec<(FileEntry, Vec<u8>)>>();
// End thread which send info to gui // End thread which send info to gui
progress_thread_run.store(false, Ordering::Relaxed); progress_thread_run.store(false, Ordering::Relaxed);
progress_thread_handle.join().unwrap(); progress_thread_handle.join().unwrap();
Common::print_time(hash_map_modification, SystemTime::now(), "sort_images - reading data from files in parallel".to_string()); Common::print_time(hash_map_modification, SystemTime::now(), "sort_images - reading data from files in parallel");
let hash_map_modification = SystemTime::now(); let hash_map_modification = SystemTime::now();
// Just connect loaded results with already calculated hashes // Just connect loaded results with already calculated hashes
@ -674,7 +678,7 @@ impl SimilarImages {
return false; return false;
} }
Common::print_time(hash_map_modification, SystemTime::now(), "sort_images - saving data to files".to_string()); Common::print_time(hash_map_modification, SystemTime::now(), "sort_images - saving data to files");
true true
} }
@ -760,7 +764,7 @@ impl SimilarImages {
if vec_files.len() >= 2 { if vec_files.len() >= 2 {
hashes_with_multiple_images.insert(hash); hashes_with_multiple_images.insert(hash);
} }
self.bktree.add(hash.to_vec()); self.bktree.add(hash.clone());
} }
for (hash, vec_files) in &files_from_referenced_folders { for (hash, vec_files) in &files_from_referenced_folders {
if vec_files.len() >= 2 { if vec_files.len() >= 2 {
@ -781,7 +785,7 @@ impl SimilarImages {
additional_chunk_to_check.push(hash); additional_chunk_to_check.push(hash);
hashes_with_multiple_images.insert(hash); hashes_with_multiple_images.insert(hash);
} else { } else {
self.bktree.add(hash.to_vec()); self.bktree.add(hash.clone());
} }
} }
chunk_size = all_hashes.len() / number_of_processors; chunk_size = all_hashes.len() / number_of_processors;
@ -809,7 +813,7 @@ impl SimilarImages {
for (index, hash_to_check) in hashes_to_check.iter().enumerate() { for (index, hash_to_check) in hashes_to_check.iter().enumerate() {
// Don't check for user stop too often // Don't check for user stop too often
// Also don't add too often data to atomic variable // Also don't add too often data to atomic variable
const CYCLES_COUNTER: usize = 0b111111; const CYCLES_COUNTER: usize = 0b11_1111;
if ((index & CYCLES_COUNTER) == CYCLES_COUNTER) && index != 0 { if ((index & CYCLES_COUNTER) == CYCLES_COUNTER) && index != 0 {
atomic_mode_counter.fetch_add(CYCLES_COUNTER, Ordering::Relaxed); atomic_mode_counter.fetch_add(CYCLES_COUNTER, Ordering::Relaxed);
if stop_receiver.is_some() && stop_receiver.unwrap().try_recv().is_ok() { if stop_receiver.is_some() && stop_receiver.unwrap().try_recv().is_ok() {
@ -841,7 +845,7 @@ impl SimilarImages {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
if !self.use_reference_folders { if !self.use_reference_folders {
debug_check_for_duplicated_things(hashes_parents.clone(), hashes_similarity.clone(), all_hashed_images.clone(), "BEFORE"); debug_check_for_duplicated_things(&hashes_parents, &hashes_similarity, &all_hashed_images, "BEFORE");
} }
Some((hashes_parents, hashes_similarity)) Some((hashes_parents, hashes_similarity))
@ -889,7 +893,7 @@ impl SimilarImages {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
if !self.use_reference_folders { if !self.use_reference_folders {
debug_check_for_duplicated_things(hashes_parents.clone(), hashes_similarity.clone(), all_hashed_images.clone(), "LATTER"); debug_check_for_duplicated_things(&hashes_parents, &hashes_similarity, &all_hashed_images, "LATTER");
} }
// Just simple check if all original hashes with multiple entries are available in end results // Just simple check if all original hashes with multiple entries are available in end results
@ -959,7 +963,7 @@ impl SimilarImages {
{ {
let mut result_hashset: HashSet<String> = Default::default(); let mut result_hashset: HashSet<String> = Default::default();
let mut found = false; let mut found = false;
for (_hash, vec_file_entry) in collected_similar_images.iter() { for vec_file_entry in collected_similar_images.values() {
if vec_file_entry.is_empty() { if vec_file_entry.is_empty() {
println!("Empty Element {vec_file_entry:?}"); println!("Empty Element {vec_file_entry:?}");
found = true; found = true;
@ -980,9 +984,7 @@ impl SimilarImages {
} }
} }
} }
if found { assert!(!found, "Found Invalid entries");
panic!("Found Invalid entries");
}
} }
self.similar_vectors = collected_similar_images.into_values().collect(); self.similar_vectors = collected_similar_images.into_values().collect();
@ -1030,7 +1032,7 @@ impl SimilarImages {
.collect::<Vec<(FileEntry, Vec<FileEntry>)>>(); .collect::<Vec<(FileEntry, Vec<FileEntry>)>>();
} }
Common::print_time(hash_map_modification, SystemTime::now(), "sort_images - selecting data from HashMap".to_string()); Common::print_time(hash_map_modification, SystemTime::now(), "sort_images - selecting data from HashMap");
if self.use_reference_folders { if self.use_reference_folders {
for (_fe, vector) in &self.similar_referenced_vectors { for (_fe, vector) in &self.similar_referenced_vectors {
@ -1110,7 +1112,7 @@ fn image_to_check<'a>(
} }
// But when there is no record, just add it // But when there is no record, just add it
else { else {
need_to_add = true need_to_add = true;
} }
} }
@ -1179,7 +1181,7 @@ impl SaveResults for SimilarImages {
if !self.similar_vectors.is_empty() { if !self.similar_vectors.is_empty() {
write!(writer, "{} images which have similar friends\n\n", self.similar_vectors.len()).unwrap(); write!(writer, "{} images which have similar friends\n\n", self.similar_vectors.len()).unwrap();
for struct_similar in self.similar_vectors.iter() { for struct_similar in &self.similar_vectors {
writeln!(writer, "Found {} images which have similar friends", self.similar_vectors.len()).unwrap(); writeln!(writer, "Found {} images which have similar friends", self.similar_vectors.len()).unwrap();
for file_entry in struct_similar { for file_entry in struct_similar {
writeln!( writeln!(
@ -1198,7 +1200,7 @@ impl SaveResults for SimilarImages {
write!(writer, "Not found any similar images.").unwrap(); write!(writer, "Not found any similar images.").unwrap();
} }
Common::print_time(start_time, SystemTime::now(), "save_results_to_file".to_string()); Common::print_time(start_time, SystemTime::now(), "save_results_to_file");
true true
} }
} }
@ -1316,6 +1318,7 @@ fn get_cache_file(hash_size: &u8, hash_alg: &HashAlg, image_filter: &FilterType)
) )
} }
#[must_use]
pub fn get_string_from_similarity(similarity: &u32, hash_size: u8) -> String { pub fn get_string_from_similarity(similarity: &u32, hash_size: u8) -> String {
let index_preset = match hash_size { let index_preset = match hash_size {
8 => 0, 8 => 0,
@ -1364,6 +1367,7 @@ pub fn get_string_from_similarity(similarity: &u32, hash_size: u8) -> String {
} }
} }
#[must_use]
pub fn return_similarity_from_similarity_preset(similarity_preset: &SimilarityPreset, hash_size: u8) -> u32 { pub fn return_similarity_from_similarity_preset(similarity_preset: &SimilarityPreset, hash_size: u8) -> u32 {
let index_preset = match hash_size { let index_preset = match hash_size {
8 => 0, 8 => 0,
@ -1452,21 +1456,21 @@ pub fn test_image_conversion_speed() {
// E.g. /a.jpg is used also as master and similar image which is forbidden, because may // E.g. /a.jpg is used also as master and similar image which is forbidden, because may
// cause accidentally delete more pictures that user wanted // cause accidentally delete more pictures that user wanted
fn debug_check_for_duplicated_things( fn debug_check_for_duplicated_things(
hashes_parents: HashMap<&Vec<u8>, u32>, hashes_parents: &HashMap<&Vec<u8>, u32>,
hashes_similarity: HashMap<&Vec<u8>, (&Vec<u8>, u32)>, hashes_similarity: &HashMap<&Vec<u8>, (&Vec<u8>, u32)>,
all_hashed_images: HashMap<Vec<u8>, Vec<FileEntry>>, all_hashed_images: &HashMap<Vec<u8>, Vec<FileEntry>>,
numm: &str, numm: &str,
) { ) {
let mut found_broken_thing = false; let mut found_broken_thing = false;
let mut hashmap_hashes: HashSet<_> = Default::default(); let mut hashmap_hashes: HashSet<_> = Default::default();
let mut hashmap_names: HashSet<_> = Default::default(); let mut hashmap_names: HashSet<_> = Default::default();
for (hash, number_of_children) in &hashes_parents { for (hash, number_of_children) in hashes_parents {
if *number_of_children > 0 { if *number_of_children > 0 {
if hashmap_hashes.contains(*hash) { if hashmap_hashes.contains(*hash) {
println!("------1--HASH--{} {:?}", numm, all_hashed_images.get(*hash).unwrap()); println!("------1--HASH--{} {:?}", numm, all_hashed_images.get(*hash).unwrap());
found_broken_thing = true; found_broken_thing = true;
} }
hashmap_hashes.insert(hash.to_vec()); hashmap_hashes.insert((*hash).clone());
for i in all_hashed_images.get(*hash).unwrap() { for i in all_hashed_images.get(*hash).unwrap() {
let name = i.path.to_string_lossy().to_string(); let name = i.path.to_string_lossy().to_string();
@ -1483,7 +1487,7 @@ fn debug_check_for_duplicated_things(
println!("------2--HASH--{} {:?}", numm, all_hashed_images.get(*hash).unwrap()); println!("------2--HASH--{} {:?}", numm, all_hashed_images.get(*hash).unwrap());
found_broken_thing = true; found_broken_thing = true;
} }
hashmap_hashes.insert(hash.to_vec()); hashmap_hashes.insert((*hash).clone());
for i in all_hashed_images.get(*hash).unwrap() { for i in all_hashed_images.get(*hash).unwrap() {
let name = i.path.to_string_lossy().to_string(); let name = i.path.to_string_lossy().to_string();

40
czkawka_core/src/similar_videos.rs
Unescape Escape View File

@ -51,12 +51,12 @@ pub struct FileEntry {
struct Hamming; struct Hamming;
impl bk_tree::Metric<Vec<u8>> for Hamming { impl bk_tree::Metric<Vec<u8>> for Hamming {
#[inline(always)] #[inline]
fn distance(&self, a: &Vec<u8>, b: &Vec<u8>) -> u32 { fn distance(&self, a: &Vec<u8>, b: &Vec<u8>) -> u32 {
hamming::distance_fast(a, b).unwrap() as u32 hamming::distance_fast(a, b).unwrap() as u32
} }
#[inline(always)] #[inline]
fn threshold_distance(&self, a: &Vec<u8>, b: &Vec<u8>, _threshold: u32) -> Option<u32> { fn threshold_distance(&self, a: &Vec<u8>, b: &Vec<u8>, _threshold: u32) -> Option<u32> {
Some(self.distance(a, b)) Some(self.distance(a, b))
} }
@ -93,14 +93,16 @@ pub struct Info {
} }
impl Info { impl Info {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
} }
/// Method implementation for EmptyFolder /// Method implementation for `EmptyFolder`
impl SimilarVideos { impl SimilarVideos {
/// New function providing basics values /// New function providing basics values
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
information: Default::default(), information: Default::default(),
@ -135,16 +137,18 @@ impl SimilarVideos {
pub fn set_tolerance(&mut self, tolerance: i32) { pub fn set_tolerance(&mut self, tolerance: i32) {
assert!((0..=MAX_TOLERANCE).contains(&tolerance)); assert!((0..=MAX_TOLERANCE).contains(&tolerance));
self.tolerance = tolerance self.tolerance = tolerance;
} }
pub fn set_save_also_as_json(&mut self, save_also_as_json: bool) { pub fn set_save_also_as_json(&mut self, save_also_as_json: bool) {
self.save_also_as_json = save_also_as_json; self.save_also_as_json = save_also_as_json;
} }
#[must_use]
pub fn get_stopped_search(&self) -> bool { pub fn get_stopped_search(&self) -> bool {
self.stopped_search self.stopped_search
} }
#[must_use]
pub const fn get_text_messages(&self) -> &Messages { pub const fn get_text_messages(&self) -> &Messages {
&self.text_messages &self.text_messages
} }
@ -153,10 +157,12 @@ impl SimilarVideos {
self.allowed_extensions.set_allowed_extensions(allowed_extensions, &mut self.text_messages); self.allowed_extensions.set_allowed_extensions(allowed_extensions, &mut self.text_messages);
} }
#[must_use]
pub const fn get_similar_videos(&self) -> &Vec<Vec<FileEntry>> { pub const fn get_similar_videos(&self) -> &Vec<Vec<FileEntry>> {
&self.similar_vectors &self.similar_vectors
} }
#[must_use]
pub const fn get_information(&self) -> &Info { pub const fn get_information(&self) -> &Info {
&self.information &self.information
} }
@ -188,10 +194,12 @@ impl SimilarVideos {
t => t, t => t,
}; };
} }
#[must_use]
pub fn get_similar_videos_referenced(&self) -> &Vec<(FileEntry, Vec<FileEntry>)> { pub fn get_similar_videos_referenced(&self) -> &Vec<(FileEntry, Vec<FileEntry>)> {
&self.similar_referenced_vectors &self.similar_referenced_vectors
} }
#[must_use]
pub fn get_number_of_base_duplicated_files(&self) -> usize { pub fn get_number_of_base_duplicated_files(&self) -> usize {
if self.use_reference_folders { if self.use_reference_folders {
self.similar_referenced_vectors.len() self.similar_referenced_vectors.len()
@ -200,6 +208,7 @@ impl SimilarVideos {
} }
} }
#[must_use]
pub fn get_use_reference(&self) -> bool { pub fn get_use_reference(&self) -> bool {
self.use_reference_folders self.use_reference_folders
} }
@ -238,7 +247,7 @@ impl SimilarVideos {
// } // }
/// Function to check if folder are empty. /// Function to check if folder are empty.
/// Parameter initial_checking for second check before deleting to be sure that checked folder is still empty /// Parameter `initial_checking` for second check before deleting to be sure that checked folder is still empty
fn check_for_similar_videos(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&futures::channel::mpsc::UnboundedSender<ProgressData>>) -> bool { fn check_for_similar_videos(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&futures::channel::mpsc::UnboundedSender<ProgressData>>) -> bool {
let start_time: SystemTime = SystemTime::now(); let start_time: SystemTime = SystemTime::now();
let mut folders_to_check: Vec<PathBuf> = Vec::with_capacity(1024 * 2); // This should be small enough too not see to big difference and big enough to store most of paths without needing to resize vector let mut folders_to_check: Vec<PathBuf> = Vec::with_capacity(1024 * 2); // This should be small enough too not see to big difference and big enough to store most of paths without needing to resize vector
@ -406,7 +415,7 @@ impl SimilarVideos {
} }
}, },
vhash: Default::default(), vhash: Default::default(),
error: "".to_string(), error: String::new(),
}; };
fe_result.push((current_file_name.to_string_lossy().to_string(), fe)); fe_result.push((current_file_name.to_string_lossy().to_string(), fe));
@ -433,7 +442,7 @@ impl SimilarVideos {
// End thread which send info to gui // End thread which send info to gui
progress_thread_run.store(false, Ordering::Relaxed); progress_thread_run.store(false, Ordering::Relaxed);
progress_thread_handle.join().unwrap(); progress_thread_handle.join().unwrap();
Common::print_time(start_time, SystemTime::now(), "check_for_similar_videos".to_string()); Common::print_time(start_time, SystemTime::now(), "check_for_similar_videos");
true true
} }
@ -469,11 +478,7 @@ impl SimilarVideos {
mem::swap(&mut self.videos_to_check, &mut non_cached_files_to_check); mem::swap(&mut self.videos_to_check, &mut non_cached_files_to_check);
} }
Common::print_time( Common::print_time(hash_map_modification, SystemTime::now(), "sort_videos - reading data from cache and preparing them");
hash_map_modification,
SystemTime::now(),
"sort_videos - reading data from cache and preparing them".to_string(),
);
let hash_map_modification = SystemTime::now(); let hash_map_modification = SystemTime::now();
//// PROGRESS THREAD START //// PROGRESS THREAD START
@ -536,7 +541,7 @@ impl SimilarVideos {
progress_thread_run.store(false, Ordering::Relaxed); progress_thread_run.store(false, Ordering::Relaxed);
progress_thread_handle.join().unwrap(); progress_thread_handle.join().unwrap();
Common::print_time(hash_map_modification, SystemTime::now(), "sort_videos - reading data from files in parallel".to_string()); Common::print_time(hash_map_modification, SystemTime::now(), "sort_videos - reading data from files in parallel");
let hash_map_modification = SystemTime::now(); let hash_map_modification = SystemTime::now();
// Just connect loaded results with already calculated hashes // Just connect loaded results with already calculated hashes
@ -570,7 +575,7 @@ impl SimilarVideos {
return false; return false;
} }
Common::print_time(hash_map_modification, SystemTime::now(), "sort_videos - saving data to files".to_string()); Common::print_time(hash_map_modification, SystemTime::now(), "sort_videos - saving data to files");
let hash_map_modification = SystemTime::now(); let hash_map_modification = SystemTime::now();
let match_group = vid_dup_finder_lib::search(vector_of_hashes, NormalizedTolerance::new(self.tolerance as f64 / 100.0f64)); let match_group = vid_dup_finder_lib::search(vector_of_hashes, NormalizedTolerance::new(self.tolerance as f64 / 100.0f64));
@ -635,7 +640,7 @@ impl SimilarVideos {
} }
} }
Common::print_time(hash_map_modification, SystemTime::now(), "sort_videos - selecting data from BtreeMap".to_string()); Common::print_time(hash_map_modification, SystemTime::now(), "sort_videos - selecting data from BtreeMap");
// Clean unused data // Clean unused data
self.videos_hashes = Default::default(); self.videos_hashes = Default::default();
@ -712,7 +717,7 @@ impl SaveResults for SimilarVideos {
if !self.similar_vectors.is_empty() { if !self.similar_vectors.is_empty() {
write!(writer, "{} videos which have similar friends\n\n", self.similar_vectors.len()).unwrap(); write!(writer, "{} videos which have similar friends\n\n", self.similar_vectors.len()).unwrap();
for struct_similar in self.similar_vectors.iter() { for struct_similar in &self.similar_vectors {
writeln!(writer, "Found {} videos which have similar friends", self.similar_vectors.len()).unwrap(); writeln!(writer, "Found {} videos which have similar friends", self.similar_vectors.len()).unwrap();
for file_entry in struct_similar { for file_entry in struct_similar {
writeln!(writer, "{} - {}", file_entry.path.display(), format_size(file_entry.size, BINARY)).unwrap(); writeln!(writer, "{} - {}", file_entry.path.display(), format_size(file_entry.size, BINARY)).unwrap();
@ -723,7 +728,7 @@ impl SaveResults for SimilarVideos {
write!(writer, "Not found any similar videos.").unwrap(); write!(writer, "Not found any similar videos.").unwrap();
} }
Common::print_time(start_time, SystemTime::now(), "save_results_to_file".to_string()); Common::print_time(start_time, SystemTime::now(), "save_results_to_file");
true true
} }
} }
@ -813,6 +818,7 @@ fn get_cache_file() -> String {
"cache_similar_videos.bin".to_string() "cache_similar_videos.bin".to_string()
} }
#[must_use]
pub fn check_if_ffmpeg_is_installed() -> bool { pub fn check_if_ffmpeg_is_installed() -> bool {
let vid = "9999czekoczekoczekolada999.txt"; let vid = "9999czekoczekoczekolada999.txt";
if let Err(DetermineVideo { if let Err(DetermineVideo {

18
czkawka_core/src/temporary.rs
Unescape Escape View File

@ -45,6 +45,7 @@ pub struct Info {
} }
impl Info { impl Info {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Default::default() Default::default()
} }
@ -63,6 +64,7 @@ pub struct Temporary {
} }
impl Temporary { impl Temporary {
#[must_use]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
text_messages: Messages::new(), text_messages: Messages::new(),
@ -86,17 +88,21 @@ impl Temporary {
self.delete_files(); self.delete_files();
self.debug_print(); self.debug_print();
} }
#[must_use]
pub fn get_stopped_search(&self) -> bool { pub fn get_stopped_search(&self) -> bool {
self.stopped_search self.stopped_search
} }
#[must_use]
pub const fn get_temporary_files(&self) -> &Vec<FileEntry> { pub const fn get_temporary_files(&self) -> &Vec<FileEntry> {
&self.temporary_files &self.temporary_files
} }
#[must_use]
pub const fn get_text_messages(&self) -> &Messages { pub const fn get_text_messages(&self) -> &Messages {
&self.text_messages &self.text_messages
} }
#[must_use]
pub const fn get_information(&self) -> &Info { pub const fn get_information(&self) -> &Info {
&self.information &self.information
} }
@ -325,7 +331,7 @@ impl Temporary {
progress_thread_handle.join().unwrap(); progress_thread_handle.join().unwrap();
self.information.number_of_temporary_files = self.temporary_files.len(); self.information.number_of_temporary_files = self.temporary_files.len();
Common::print_time(start_time, SystemTime::now(), "check_files_size".to_string()); Common::print_time(start_time, SystemTime::now(), "check_files_size");
true true
} }
@ -346,7 +352,7 @@ impl Temporary {
} }
} }
Common::print_time(start_time, SystemTime::now(), "delete_files".to_string()); Common::print_time(start_time, SystemTime::now(), "delete_files");
} }
} }
@ -413,13 +419,13 @@ impl SaveResults for Temporary {
if !self.temporary_files.is_empty() { if !self.temporary_files.is_empty() {
writeln!(writer, "Found {} temporary files.", self.information.number_of_temporary_files).unwrap(); writeln!(writer, "Found {} temporary files.", self.information.number_of_temporary_files).unwrap();
for file_entry in self.temporary_files.iter() { for file_entry in &self.temporary_files {
writeln!(writer, "{}", file_entry.path.display()).unwrap(); writeln!(writer, "{}", file_entry.path.display()).unwrap();
} }
} else { } else {
write!(writer, "Not found any temporary files.").unwrap(); write!(writer, "Not found any temporary files.").unwrap();
} }
Common::print_time(start_time, SystemTime::now(), "save_results_to_file".to_string()); Common::print_time(start_time, SystemTime::now(), "save_results_to_file");
true true
} }
} }
@ -428,10 +434,10 @@ impl PrintResults for Temporary {
fn print_results(&self) { fn print_results(&self) {
let start_time: SystemTime = SystemTime::now(); let start_time: SystemTime = SystemTime::now();
println!("Found {} temporary files.\n", self.information.number_of_temporary_files); println!("Found {} temporary files.\n", self.information.number_of_temporary_files);
for file_entry in self.temporary_files.iter() { for file_entry in &self.temporary_files {
println!("{}", file_entry.path.display()); println!("{}", file_entry.path.display());
} }
Common::print_time(start_time, SystemTime::now(), "print_entries".to_string()); Common::print_time(start_time, SystemTime::now(), "print_entries");
} }
} }

14
czkawka_gui/Cargo.toml
Unescape Escape View File

@ -10,10 +10,10 @@ homepage = "https://github.com/qarmin/czkawka"
repository = "https://github.com/qarmin/czkawka" repository = "https://github.com/qarmin/czkawka"
[dependencies] [dependencies]
gdk4 = "0.5.4" gdk4 = "0.5.5"
glib = "0.16.7" glib = "0.16.7"
humansize = "2.1.2" humansize = "2.1.3"
chrono = "0.4.23" chrono = "0.4.23"
# Used for sending stop signal across threads # Used for sending stop signal across threads
@ -32,7 +32,7 @@ open = "3.2.0"
image = "0.24.5" image = "0.24.5"
# To be able to use custom select # To be able to use custom select
regex = "1.7.0" regex = "1.7.1"
# To get image_hasher types # To get image_hasher types
image_hasher = "1.1.2" image_hasher = "1.1.2"
@ -44,16 +44,16 @@ trash = "3.0.0"
fs_extra = "1.2.0" fs_extra = "1.2.0"
# Language # Language
i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] } i18n-embed = { version = "0.13.8", features = ["fluent-system", "desktop-requester"] }
i18n-embed-fl = "0.6.4" i18n-embed-fl = "0.6.5"
rust-embed = "6.4.2" rust-embed = "6.4.2"
once_cell = "1.16.0" once_cell = "1.17.0"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.9", features = ["combaseapi", "objbase", "shobjidl_core", "windef", "winerror", "wtypesbase", "winuser"] } winapi = { version = "0.3.9", features = ["combaseapi", "objbase", "shobjidl_core", "windef", "winerror", "wtypesbase", "winuser"] }
[dependencies.gtk4] [dependencies.gtk4]
version = "0.5.4" version = "0.5.5"
default-features = false default-features = false
features = ["v4_6"] features = ["v4_6"]

112
czkawka_gui/src/compute_results.rs
Unescape Escape View File

@ -352,11 +352,11 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
let values: [(u32, &dyn ToValue); 10] = [ let values: [(u32, &dyn ToValue); 10] = [
(ColumnsDuplicates::ActivatableSelectButton as u32, &false), (ColumnsDuplicates::ActivatableSelectButton as u32, &false),
(ColumnsDuplicates::SelectionButton as u32, &false), (ColumnsDuplicates::SelectionButton as u32, &false),
(ColumnsDuplicates::Size as u32, (&"".to_string())), (ColumnsDuplicates::Size as u32, (&String::new())),
(ColumnsDuplicates::Name as u32, (&"".to_string())), (ColumnsDuplicates::Name as u32, (&String::new())),
(ColumnsDuplicates::Path as u32, (&(format!("{} results", vector.len())))), (ColumnsDuplicates::Path as u32, (&(format!("{} results", vector.len())))),
(ColumnsDuplicates::Modification as u32, (&"".to_string())), // No text in 3 column (ColumnsDuplicates::Modification as u32, (&String::new())), // No text in 3 column
(ColumnsDuplicates::ModificationAsSecs as u32, (&(0))), // Not used here (ColumnsDuplicates::ModificationAsSecs as u32, (&(0))), // Not used here
(ColumnsDuplicates::Color as u32, &(HEADER_ROW_COLOR.to_string())), (ColumnsDuplicates::Color as u32, &(HEADER_ROW_COLOR.to_string())),
(ColumnsDuplicates::IsHeader as u32, &true), (ColumnsDuplicates::IsHeader as u32, &true),
(ColumnsDuplicates::TextColor as u32, &(TEXT_COLOR.to_string())), (ColumnsDuplicates::TextColor as u32, &(TEXT_COLOR.to_string())),
@ -408,10 +408,10 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
let values: [(u32, &dyn ToValue); 10] = [ let values: [(u32, &dyn ToValue); 10] = [
(ColumnsDuplicates::ActivatableSelectButton as u32, &false), (ColumnsDuplicates::ActivatableSelectButton as u32, &false),
(ColumnsDuplicates::SelectionButton as u32, &false), (ColumnsDuplicates::SelectionButton as u32, &false),
(ColumnsDuplicates::Size as u32, (&"".to_string())), (ColumnsDuplicates::Size as u32, (&String::new())),
(ColumnsDuplicates::Name as u32, (&"".to_string())), (ColumnsDuplicates::Name as u32, (&String::new())),
(ColumnsDuplicates::Path as u32, (&"".to_string())), (ColumnsDuplicates::Path as u32, (&String::new())),
(ColumnsDuplicates::Modification as u32, &"".to_string()), // No text in 3 column (ColumnsDuplicates::Modification as u32, &String::new()), // No text in 3 column
(ColumnsDuplicates::ModificationAsSecs as u32, &(0)), (ColumnsDuplicates::ModificationAsSecs as u32, &(0)),
(ColumnsDuplicates::Color as u32, &(HEADER_ROW_COLOR.to_string())), (ColumnsDuplicates::Color as u32, &(HEADER_ROW_COLOR.to_string())),
(ColumnsDuplicates::IsHeader as u32, &true), (ColumnsDuplicates::IsHeader as u32, &true),
@ -461,11 +461,11 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
let values: [(u32, &dyn ToValue); 10] = [ let values: [(u32, &dyn ToValue); 10] = [
(ColumnsDuplicates::ActivatableSelectButton as u32, &false), (ColumnsDuplicates::ActivatableSelectButton as u32, &false),
(ColumnsDuplicates::SelectionButton as u32, &false), (ColumnsDuplicates::SelectionButton as u32, &false),
(ColumnsDuplicates::Size as u32, (&"".to_string())), (ColumnsDuplicates::Size as u32, (&String::new())),
(ColumnsDuplicates::Name as u32, (&"".to_string())), (ColumnsDuplicates::Name as u32, (&String::new())),
(ColumnsDuplicates::Path as u32, (&"".to_string())), (ColumnsDuplicates::Path as u32, (&String::new())),
(ColumnsDuplicates::Modification as u32, &"".to_string()), // No text in 3 column (ColumnsDuplicates::Modification as u32, &String::new()), // No text in 3 column
(ColumnsDuplicates::ModificationAsSecs as u32, &(0)), // Not used here (ColumnsDuplicates::ModificationAsSecs as u32, &(0)), // Not used here
(ColumnsDuplicates::Color as u32, &(HEADER_ROW_COLOR.to_string())), (ColumnsDuplicates::Color as u32, &(HEADER_ROW_COLOR.to_string())),
(ColumnsDuplicates::IsHeader as u32, &true), (ColumnsDuplicates::IsHeader as u32, &true),
(ColumnsDuplicates::TextColor as u32, &(TEXT_COLOR.to_string())), (ColumnsDuplicates::TextColor as u32, &(TEXT_COLOR.to_string())),
@ -831,7 +831,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
let values: [(u32, &dyn ToValue); 13] = [ let values: [(u32, &dyn ToValue); 13] = [
(ColumnsSimilarImages::ActivatableSelectButton as u32, &false), (ColumnsSimilarImages::ActivatableSelectButton as u32, &false),
(ColumnsSimilarImages::SelectionButton as u32, &false), (ColumnsSimilarImages::SelectionButton as u32, &false),
(ColumnsSimilarImages::Similarity as u32, &"".to_string()), (ColumnsSimilarImages::Similarity as u32, &String::new()),
(ColumnsSimilarImages::Size as u32, &format_size(base_file_entry.size, BINARY)), (ColumnsSimilarImages::Size as u32, &format_size(base_file_entry.size, BINARY)),
(ColumnsSimilarImages::SizeAsBytes as u32, &base_file_entry.size), (ColumnsSimilarImages::SizeAsBytes as u32, &base_file_entry.size),
(ColumnsSimilarImages::Dimensions as u32, &base_file_entry.dimensions), (ColumnsSimilarImages::Dimensions as u32, &base_file_entry.dimensions),
@ -849,7 +849,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
list_store.set(&list_store.append(), &values); list_store.set(&list_store.append(), &values);
// Meat // Meat
for file_entry in vec_file_entry.iter() { for file_entry in &vec_file_entry {
let (directory, file) = split_path(&file_entry.path); let (directory, file) = split_path(&file_entry.path);
let values: [(u32, &dyn ToValue); 13] = [ let values: [(u32, &dyn ToValue); 13] = [
(ColumnsSimilarImages::ActivatableSelectButton as u32, &true), (ColumnsSimilarImages::ActivatableSelectButton as u32, &true),
@ -892,13 +892,13 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
let values: [(u32, &dyn ToValue); 13] = [ let values: [(u32, &dyn ToValue); 13] = [
(ColumnsSimilarImages::ActivatableSelectButton as u32, &false), (ColumnsSimilarImages::ActivatableSelectButton as u32, &false),
(ColumnsSimilarImages::SelectionButton as u32, &false), (ColumnsSimilarImages::SelectionButton as u32, &false),
(ColumnsSimilarImages::Similarity as u32, &"".to_string()), (ColumnsSimilarImages::Similarity as u32, &String::new()),
(ColumnsSimilarImages::Size as u32, &"".to_string()), (ColumnsSimilarImages::Size as u32, &String::new()),
(ColumnsSimilarImages::SizeAsBytes as u32, &(0)), (ColumnsSimilarImages::SizeAsBytes as u32, &(0)),
(ColumnsSimilarImages::Dimensions as u32, &"".to_string()), (ColumnsSimilarImages::Dimensions as u32, &String::new()),
(ColumnsSimilarImages::Name as u32, &"".to_string()), (ColumnsSimilarImages::Name as u32, &String::new()),
(ColumnsSimilarImages::Path as u32, &"".to_string()), (ColumnsSimilarImages::Path as u32, &String::new()),
(ColumnsSimilarImages::Modification as u32, &"".to_string()), (ColumnsSimilarImages::Modification as u32, &String::new()),
(ColumnsSimilarImages::ModificationAsSecs as u32, &(0)), (ColumnsSimilarImages::ModificationAsSecs as u32, &(0)),
(ColumnsSimilarImages::Color as u32, &(HEADER_ROW_COLOR.to_string())), (ColumnsSimilarImages::Color as u32, &(HEADER_ROW_COLOR.to_string())),
(ColumnsSimilarImages::IsHeader as u32, &true), (ColumnsSimilarImages::IsHeader as u32, &true),
@ -907,7 +907,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
list_store.set(&list_store.append(), &values); list_store.set(&list_store.append(), &values);
// Meat // Meat
for file_entry in vec_file_entry.iter() { for file_entry in &vec_file_entry {
let (directory, file) = split_path(&file_entry.path); let (directory, file) = split_path(&file_entry.path);
let values: [(u32, &dyn ToValue); 13] = [ let values: [(u32, &dyn ToValue); 13] = [
(ColumnsSimilarImages::ActivatableSelectButton as u32, &true), (ColumnsSimilarImages::ActivatableSelectButton as u32, &true),
@ -1030,7 +1030,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
list_store.set(&list_store.append(), &values); list_store.set(&list_store.append(), &values);
// Meat // Meat
for file_entry in vec_file_entry.iter() { for file_entry in &vec_file_entry {
let (directory, file) = split_path(&file_entry.path); let (directory, file) = split_path(&file_entry.path);
let values: [(u32, &dyn ToValue); 11] = [ let values: [(u32, &dyn ToValue); 11] = [
(ColumnsSimilarVideos::ActivatableSelectButton as u32, &true), (ColumnsSimilarVideos::ActivatableSelectButton as u32, &true),
@ -1071,11 +1071,11 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
let values: [(u32, &dyn ToValue); 11] = [ let values: [(u32, &dyn ToValue); 11] = [
(ColumnsSimilarVideos::ActivatableSelectButton as u32, &false), (ColumnsSimilarVideos::ActivatableSelectButton as u32, &false),
(ColumnsSimilarVideos::SelectionButton as u32, &false), (ColumnsSimilarVideos::SelectionButton as u32, &false),
(ColumnsSimilarVideos::Size as u32, &"".to_string()), (ColumnsSimilarVideos::Size as u32, &String::new()),
(ColumnsSimilarVideos::SizeAsBytes as u32, &(0)), (ColumnsSimilarVideos::SizeAsBytes as u32, &(0)),
(ColumnsSimilarVideos::Name as u32, &"".to_string()), (ColumnsSimilarVideos::Name as u32, &String::new()),
(ColumnsSimilarVideos::Path as u32, &"".to_string()), (ColumnsSimilarVideos::Path as u32, &String::new()),
(ColumnsSimilarVideos::Modification as u32, &"".to_string()), (ColumnsSimilarVideos::Modification as u32, &String::new()),
(ColumnsSimilarVideos::ModificationAsSecs as u32, &(0)), (ColumnsSimilarVideos::ModificationAsSecs as u32, &(0)),
(ColumnsSimilarVideos::Color as u32, &(HEADER_ROW_COLOR.to_string())), (ColumnsSimilarVideos::Color as u32, &(HEADER_ROW_COLOR.to_string())),
(ColumnsSimilarVideos::IsHeader as u32, &true), (ColumnsSimilarVideos::IsHeader as u32, &true),
@ -1084,7 +1084,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
list_store.set(&list_store.append(), &values); list_store.set(&list_store.append(), &values);
// Meat // Meat
for file_entry in vec_file_entry.iter() { for file_entry in &vec_file_entry {
let (directory, file) = split_path(&file_entry.path); let (directory, file) = split_path(&file_entry.path);
let values: [(u32, &dyn ToValue); 11] = [ let values: [(u32, &dyn ToValue); 11] = [
(ColumnsSimilarVideos::ActivatableSelectButton as u32, &true), (ColumnsSimilarVideos::ActivatableSelectButton as u32, &true),
@ -1265,54 +1265,18 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
let values: [(u32, &dyn ToValue); 18] = [ let values: [(u32, &dyn ToValue); 18] = [
(ColumnsSameMusic::ActivatableSelectButton as u32, &false), (ColumnsSameMusic::ActivatableSelectButton as u32, &false),
(ColumnsSameMusic::SelectionButton as u32, &false), (ColumnsSameMusic::SelectionButton as u32, &false),
(ColumnsSameMusic::Size as u32, &"".to_string()), (ColumnsSameMusic::Size as u32, &String::new()),
(ColumnsSameMusic::SizeAsBytes as u32, &(0)), (ColumnsSameMusic::SizeAsBytes as u32, &(0)),
(ColumnsSameMusic::Name as u32, &"".to_string()), (ColumnsSameMusic::Name as u32, &String::new()),
(ColumnsSameMusic::Path as u32, &"".to_string()), (ColumnsSameMusic::Path as u32, &String::new()),
( (ColumnsSameMusic::Title as u32, &(if is_track_title { text.clone() } else { String::new() })),
ColumnsSameMusic::Title as u32, (ColumnsSameMusic::Artist as u32, &(if is_track_artist { text.clone() } else { String::new() })),
&(match is_track_title { (ColumnsSameMusic::Year as u32, &(if is_year { text.clone() } else { String::new() })),
true => text.clone(), (ColumnsSameMusic::Bitrate as u32, &(if is_bitrate { text.clone() } else { String::new() })),
false => "".to_string(),
}),
),
(
ColumnsSameMusic::Artist as u32,
&(match is_track_artist {
true => text.clone(),
false => "".to_string(),
}),
),
(
ColumnsSameMusic::Year as u32,
&(match is_year {
true => text.clone(),
false => "".to_string(),
}),
),
(
ColumnsSameMusic::Bitrate as u32,
&(match is_bitrate {
true => text.clone(),
false => "".to_string(),
}),
),
(ColumnsSameMusic::BitrateAsNumber as u32, &(0)), (ColumnsSameMusic::BitrateAsNumber as u32, &(0)),
( (ColumnsSameMusic::Genre as u32, &(if is_genre { text.clone() } else { String::new() })),
ColumnsSameMusic::Genre as u32, (ColumnsSameMusic::Length as u32, &(if is_length { text.clone() } else { String::new() })),
&(match is_genre { (ColumnsSameMusic::Modification as u32, &String::new()),
true => text.clone(),
false => "".to_string(),
}),
),
(
ColumnsSameMusic::Length as u32,
&(match is_length {
true => text.clone(),
false => "".to_string(),
}),
),
(ColumnsSameMusic::Modification as u32, &"".to_string()),
(ColumnsSameMusic::ModificationAsSecs as u32, &(0)), (ColumnsSameMusic::ModificationAsSecs as u32, &(0)),
(ColumnsSameMusic::Color as u32, &(HEADER_ROW_COLOR.to_string())), (ColumnsSameMusic::Color as u32, &(HEADER_ROW_COLOR.to_string())),
(ColumnsSameMusic::IsHeader as u32, &true), (ColumnsSameMusic::IsHeader as u32, &true),

8
czkawka_gui/src/connect_things/connect_about_buttons.rs
Unescape Escape View File

@ -11,28 +11,28 @@ pub fn connect_about_buttons(gui_data: &GuiData) {
let button_donation = gui_data.about.button_donation.clone(); let button_donation = gui_data.about.button_donation.clone();
button_donation.connect_clicked(move |_| { button_donation.connect_clicked(move |_| {
if let Err(e) = open::that(SPONSOR_SITE) { if let Err(e) = open::that(SPONSOR_SITE) {
println!("Failed to open sponsor site: {SPONSOR_SITE}, reason {e}") println!("Failed to open sponsor site: {SPONSOR_SITE}, reason {e}");
}; };
}); });
let button_instruction = gui_data.about.button_instruction.clone(); let button_instruction = gui_data.about.button_instruction.clone();
button_instruction.connect_clicked(move |_| { button_instruction.connect_clicked(move |_| {
if let Err(e) = open::that(INSTRUCTION_SITE) { if let Err(e) = open::that(INSTRUCTION_SITE) {
println!("Failed to open instruction site: {INSTRUCTION_SITE}, reason {e}") println!("Failed to open instruction site: {INSTRUCTION_SITE}, reason {e}");
}; };
}); });
let button_repository = gui_data.about.button_repository.clone(); let button_repository = gui_data.about.button_repository.clone();
button_repository.connect_clicked(move |_| { button_repository.connect_clicked(move |_| {
if let Err(e) = open::that(REPOSITORY_SITE) { if let Err(e) = open::that(REPOSITORY_SITE) {
println!("Failed to open repository site: {REPOSITORY_SITE}, reason {e}") println!("Failed to open repository site: {REPOSITORY_SITE}, reason {e}");
}; };
}); });
let button_translation = gui_data.about.button_translation.clone(); let button_translation = gui_data.about.button_translation.clone();
button_translation.connect_clicked(move |_| { button_translation.connect_clicked(move |_| {
if let Err(e) = open::that(TRANSLATION_SITE) { if let Err(e) = open::that(TRANSLATION_SITE) {
println!("Failed to open repository site: {TRANSLATION_SITE}, reason {e}") println!("Failed to open repository site: {TRANSLATION_SITE}, reason {e}");
}; };
}); });
} }

64
czkawka_gui/src/connect_things/connect_button_compare.rs
Unescape Escape View File

@ -60,7 +60,7 @@ pub fn connect_button_compare(gui_data: &GuiData) {
} }
// Check selected items // Check selected items
let (current_group, tree_path) = get_current_group_and_iter_from_selection(&model, tree_view.selection(), nb_object.column_header.unwrap()); let (current_group, tree_path) = get_current_group_and_iter_from_selection(&model, &tree_view.selection(), nb_object.column_header.unwrap());
*shared_current_of_groups.borrow_mut() = current_group; *shared_current_of_groups.borrow_mut() = current_group;
*shared_numbers_of_groups.borrow_mut() = group_number; *shared_numbers_of_groups.borrow_mut() = group_number;
@ -68,7 +68,7 @@ pub fn connect_button_compare(gui_data: &GuiData) {
populate_groups_at_start( populate_groups_at_start(
nb_object, nb_object,
&model, &model,
shared_current_path.clone(), &shared_current_path,
tree_path, tree_path,
&image_compare_left, &image_compare_left,
&image_compare_right, &image_compare_right,
@ -78,8 +78,8 @@ pub fn connect_button_compare(gui_data: &GuiData) {
&check_button_right_preview_text, &check_button_right_preview_text,
&scrolled_window_compare_choose_images, &scrolled_window_compare_choose_images,
&label_group_info, &label_group_info,
shared_image_cache.clone(), &shared_image_cache,
shared_using_for_preview.clone(), &shared_using_for_preview,
&button_go_previous_compare_group, &button_go_previous_compare_group,
&button_go_next_compare_group, &button_go_next_compare_group,
); );
@ -142,7 +142,7 @@ pub fn connect_button_compare(gui_data: &GuiData) {
populate_groups_at_start( populate_groups_at_start(
nb_object, nb_object,
&model, &model,
shared_current_path.clone(), &shared_current_path,
tree_path, tree_path,
&image_compare_left, &image_compare_left,
&image_compare_right, &image_compare_right,
@ -152,8 +152,8 @@ pub fn connect_button_compare(gui_data: &GuiData) {
&check_button_right_preview_text, &check_button_right_preview_text,
&scrolled_window_compare_choose_images, &scrolled_window_compare_choose_images,
&label_group_info, &label_group_info,
shared_image_cache.clone(), &shared_image_cache,
shared_using_for_preview.clone(), &shared_using_for_preview,
button_go_previous_compare_group, button_go_previous_compare_group,
&button_go_next_compare_group, &button_go_next_compare_group,
); );
@ -194,7 +194,7 @@ pub fn connect_button_compare(gui_data: &GuiData) {
populate_groups_at_start( populate_groups_at_start(
nb_object, nb_object,
&model, &model,
shared_current_path.clone(), &shared_current_path,
tree_path, tree_path,
&image_compare_left, &image_compare_left,
&image_compare_right, &image_compare_right,
@ -204,8 +204,8 @@ pub fn connect_button_compare(gui_data: &GuiData) {
&check_button_right_preview_text, &check_button_right_preview_text,
&scrolled_window_compare_choose_images, &scrolled_window_compare_choose_images,
&label_group_info, &label_group_info,
shared_image_cache.clone(), &shared_image_cache,
shared_using_for_preview.clone(), &shared_using_for_preview,
&button_go_previous_compare_group, &button_go_previous_compare_group,
button_go_next_compare_group, button_go_next_compare_group,
); );
@ -261,7 +261,7 @@ pub fn connect_button_compare(gui_data: &GuiData) {
fn populate_groups_at_start( fn populate_groups_at_start(
nb_object: &NotebookObject, nb_object: &NotebookObject,
model: &TreeModel, model: &TreeModel,
shared_current_path: Rc<RefCell<Option<TreePath>>>, shared_current_path: &Rc<RefCell<Option<TreePath>>>,
tree_path: TreePath, tree_path: TreePath,
image_compare_left: &Image, image_compare_left: &Image,
image_compare_right: &Image, image_compare_right: &Image,
@ -271,8 +271,8 @@ fn populate_groups_at_start(
check_button_right_preview_text: &CheckButton, check_button_right_preview_text: &CheckButton,
scrolled_window_compare_choose_images: &ScrolledWindow, scrolled_window_compare_choose_images: &ScrolledWindow,
label_group_info: &gtk4::Label, label_group_info: &gtk4::Label,
shared_image_cache: Rc<RefCell<Vec<(String, String, Image, Image, TreePath)>>>, shared_image_cache: &Rc<RefCell<Vec<(String, String, Image, Image, TreePath)>>>,
shared_using_for_preview: Rc<RefCell<(Option<TreePath>, Option<TreePath>)>>, shared_using_for_preview: &Rc<RefCell<(Option<TreePath>, Option<TreePath>)>>,
button_go_previous_compare_group: &gtk4::Button, button_go_previous_compare_group: &gtk4::Button,
button_go_next_compare_group: &gtk4::Button, button_go_next_compare_group: &gtk4::Button,
) { ) {
@ -318,8 +318,8 @@ fn populate_groups_at_start(
&cache_all_images, &cache_all_images,
image_compare_left, image_compare_left,
image_compare_right, image_compare_right,
shared_using_for_preview.clone(), shared_using_for_preview,
shared_image_cache.clone(), shared_image_cache,
check_button_left_preview_text, check_button_left_preview_text,
check_button_right_preview_text, check_button_right_preview_text,
model, model,
@ -371,12 +371,12 @@ fn generate_cache_for_results(vector_with_path: Vec<(String, String, TreePath)>)
pixbuf = t; pixbuf = t;
} }
Err(e) => { Err(e) => {
println!("Failed to open image {}, reason {}", full_path, e); println!("Failed to open image {full_path}, reason {e}");
} }
}; };
} }
Err(e) => { Err(e) => {
println!("Failed to open image {}, reason {}", full_path, e); println!("Failed to open image {full_path}, reason {e}");
} }
}; };
break 'czystka; break 'czystka;
@ -414,14 +414,14 @@ fn generate_cache_for_results(vector_with_path: Vec<(String, String, TreePath)>)
#[allow(clippy::never_loop)] #[allow(clippy::never_loop)]
loop { loop {
let pixbuf_big = match resize_pixbuf_dimension(pixbuf, (BIG_PREVIEW_SIZE, BIG_PREVIEW_SIZE), InterpType::Bilinear) { let pixbuf_big = match resize_pixbuf_dimension(&pixbuf, (BIG_PREVIEW_SIZE, BIG_PREVIEW_SIZE), InterpType::Bilinear) {
None => { None => {
println!("Failed to resize image {full_path}."); println!("Failed to resize image {full_path}.");
break; break;
} }
Some(pixbuf) => pixbuf, Some(pixbuf) => pixbuf,
}; };
let pixbuf_small = match resize_pixbuf_dimension(pixbuf_big.clone(), (SMALL_PREVIEW_SIZE, SMALL_PREVIEW_SIZE), InterpType::Bilinear) { let pixbuf_small = match resize_pixbuf_dimension(&pixbuf_big, (SMALL_PREVIEW_SIZE, SMALL_PREVIEW_SIZE), InterpType::Bilinear) {
None => { None => {
println!("Failed to resize image {full_path}."); println!("Failed to resize image {full_path}.");
break; break;
@ -457,9 +457,7 @@ fn get_all_path(model: &TreeModel, current_path: &TreePath, column_header: i32,
returned_vector.push((full_name, name, model.path(&used_iter))); returned_vector.push((full_name, name, model.path(&used_iter)));
} }
if !model.iter_next(&used_iter) { assert!(model.iter_next(&used_iter), "Found only header!");
panic!("Found only header!");
}
loop { loop {
let name = model.get::<String>(&used_iter, column_name); let name = model.get::<String>(&used_iter, column_name);
@ -490,13 +488,9 @@ fn move_iter(model: &TreeModel, tree_path: &TreePath, column_header: i32, go_nex
assert!(model.get::<bool>(&tree_iter, column_header)); assert!(model.get::<bool>(&tree_iter, column_header));
if go_next { if go_next {
if !model.iter_next(&tree_iter) { assert!(model.iter_next(&tree_iter), "Found only header!");
panic!("Found only header!");
}
} else { } else {
if !model.iter_previous(&tree_iter) { assert!(model.iter_previous(&tree_iter), "Found only header!");
panic!("Found only header!");
}
} }
loop { loop {
@ -523,8 +517,8 @@ fn populate_similar_scrolled_view(
image_cache: &[(String, String, Image, Image, TreePath)], image_cache: &[(String, String, Image, Image, TreePath)],
image_compare_left: &Image, image_compare_left: &Image,
image_compare_right: &Image, image_compare_right: &Image,
shared_using_for_preview: Rc<RefCell<(Option<TreePath>, Option<TreePath>)>>, shared_using_for_preview: &Rc<RefCell<(Option<TreePath>, Option<TreePath>)>>,
shared_image_cache: Rc<RefCell<Vec<(String, String, Image, Image, TreePath)>>>, shared_image_cache: &Rc<RefCell<Vec<(String, String, Image, Image, TreePath)>>>,
check_button_left_preview_text: &CheckButton, check_button_left_preview_text: &CheckButton,
check_button_right_preview_text: &CheckButton, check_button_right_preview_text: &CheckButton,
model: &TreeModel, model: &TreeModel,
@ -560,7 +554,7 @@ fn populate_similar_scrolled_view(
button_left.connect_clicked(move |_button_left| { button_left.connect_clicked(move |_button_left| {
shared_using_for_preview_clone.borrow_mut().0 = Some(tree_path_clone.clone()); shared_using_for_preview_clone.borrow_mut().0 = Some(tree_path_clone.clone());
update_bottom_buttons(&all_gtk_box_clone, shared_using_for_preview_clone.clone(), shared_image_cache_clone.clone()); update_bottom_buttons(&all_gtk_box_clone, &shared_using_for_preview_clone, &shared_image_cache_clone);
image_compare_left.set_paintable(big_thumbnail_clone.paintable().as_ref()); image_compare_left.set_paintable(big_thumbnail_clone.paintable().as_ref());
let is_active = model_clone.get::<bool>(&model_clone.iter(&tree_path_clone).unwrap(), column_selection); let is_active = model_clone.get::<bool>(&model_clone.iter(&tree_path_clone).unwrap(), column_selection);
@ -579,7 +573,7 @@ fn populate_similar_scrolled_view(
button_right.connect_clicked(move |_button_right| { button_right.connect_clicked(move |_button_right| {
shared_using_for_preview_clone.borrow_mut().1 = Some(tree_path_clone.clone()); shared_using_for_preview_clone.borrow_mut().1 = Some(tree_path_clone.clone());
update_bottom_buttons(&all_gtk_box_clone, shared_using_for_preview_clone.clone(), shared_image_cache_clone.clone()); update_bottom_buttons(&all_gtk_box_clone, &shared_using_for_preview_clone, &shared_image_cache_clone);
image_compare_right.set_paintable(big_thumbnail_clone.paintable().as_ref()); image_compare_right.set_paintable(big_thumbnail_clone.paintable().as_ref());
let is_active = model_clone.get::<bool>(&model_clone.iter(&tree_path_clone).unwrap(), column_selection); let is_active = model_clone.get::<bool>(&model_clone.iter(&tree_path_clone).unwrap(), column_selection);
@ -615,8 +609,8 @@ fn populate_similar_scrolled_view(
/// Disables/Enables L/R buttons at the bottom scrolled view /// Disables/Enables L/R buttons at the bottom scrolled view
fn update_bottom_buttons( fn update_bottom_buttons(
all_gtk_box: &gtk4::Box, all_gtk_box: &gtk4::Box,
shared_using_for_preview: Rc<RefCell<(Option<TreePath>, Option<TreePath>)>>, shared_using_for_preview: &Rc<RefCell<(Option<TreePath>, Option<TreePath>)>>,
image_cache: Rc<RefCell<Vec<(String, String, Image, Image, TreePath)>>>, image_cache: &Rc<RefCell<Vec<(String, String, Image, Image, TreePath)>>>,
) { ) {
let left_tree_view = (shared_using_for_preview.borrow()).0.clone().unwrap(); let left_tree_view = (shared_using_for_preview.borrow()).0.clone().unwrap();
let right_tree_view = (shared_using_for_preview.borrow()).1.clone().unwrap(); let right_tree_view = (shared_using_for_preview.borrow()).1.clone().unwrap();
@ -635,7 +629,7 @@ fn update_bottom_buttons(
} }
} }
fn get_current_group_and_iter_from_selection(model: &TreeModel, selection: TreeSelection, column_header: i32) -> (u32, TreePath) { fn get_current_group_and_iter_from_selection(model: &TreeModel, selection: &TreeSelection, column_header: i32) -> (u32, TreePath) {
let mut current_group = 1; let mut current_group = 1;
let mut possible_group = 1; let mut possible_group = 1;
let mut header_clone: TreeIter; let mut header_clone: TreeIter;

32
czkawka_gui/src/connect_things/connect_button_delete.rs
Unescape Escape View File

@ -108,7 +108,7 @@ pub async fn delete_things(gui_data: GuiData) {
} else { } else {
image_preview_duplicates.hide(); image_preview_duplicates.hide();
} }
*preview_path.borrow_mut() = "".to_string(); *preview_path.borrow_mut() = String::new();
} }
_ => {} _ => {}
} }
@ -245,22 +245,22 @@ pub async fn check_if_deleting_all_files_in_group(
if !selected_all_records { if !selected_all_records {
return false; return false;
} else { }
let (confirmation_dialog_group_delete, check_button) = create_dialog_group_deletion(window_main);
let response_type = confirmation_dialog_group_delete.run_future().await; let (confirmation_dialog_group_delete, check_button) = create_dialog_group_deletion(window_main);
if response_type == ResponseType::Ok {
if !check_button.is_active() { let response_type = confirmation_dialog_group_delete.run_future().await;
check_button_settings_confirm_group_deletion.set_active(false); if response_type == ResponseType::Ok {
} if !check_button.is_active() {
} else { check_button_settings_confirm_group_deletion.set_active(false);
confirmation_dialog_group_delete.hide();
confirmation_dialog_group_delete.close();
return true;
} }
} else {
confirmation_dialog_group_delete.hide(); confirmation_dialog_group_delete.hide();
confirmation_dialog_group_delete.close(); confirmation_dialog_group_delete.close();
return true;
} }
confirmation_dialog_group_delete.hide();
confirmation_dialog_group_delete.close();
false false
} }
@ -294,7 +294,7 @@ pub fn empty_folder_remover(
return; // No selected rows return; // No selected rows
} }
let mut messages: String = "".to_string(); let mut messages: String = String::new();
// Must be deleted from end to start, because when deleting entries, TreePath(and also TreeIter) will points to invalid data // Must be deleted from end to start, because when deleting entries, TreePath(and also TreeIter) will points to invalid data
for tree_path in selected_rows.iter().rev() { for tree_path in selected_rows.iter().rev() {
@ -334,7 +334,7 @@ pub fn empty_folder_remover(
} }
}; };
if metadata.is_dir() { if metadata.is_dir() {
next_folder = "".to_owned() next_folder = String::new()
+ &current_folder + &current_folder
+ "/" + "/"
+ match &entry_data.file_name().into_string() { + match &entry_data.file_name().into_string() {
@ -392,7 +392,7 @@ pub fn basic_remove(
let model = get_list_store(tree_view); let model = get_list_store(tree_view);
let mut messages: String = "".to_string(); let mut messages: String = String::new();
let mut selected_rows = Vec::new(); let mut selected_rows = Vec::new();
@ -468,7 +468,7 @@ pub fn tree_remove(
let model = get_list_store(tree_view); let model = get_list_store(tree_view);
let mut messages: String = "".to_string(); let mut messages: String = String::new();
let mut vec_path_to_delete: Vec<(String, String)> = Vec::new(); let mut vec_path_to_delete: Vec<(String, String)> = Vec::new();
let mut map_with_path_to_delete: BTreeMap<String, Vec<String>> = Default::default(); // BTreeMap<Path,Vec<FileName>> let mut map_with_path_to_delete: BTreeMap<String, Vec<String>> = Default::default(); // BTreeMap<Path,Vec<FileName>>

31
czkawka_gui/src/connect_things/connect_button_hardlink.rs
Unescape Escape View File

@ -19,6 +19,12 @@ enum TypeOfTool {
Symlinking, Symlinking,
} }
#[derive(Debug)]
struct SymHardlinkData {
original_data: String,
files_to_symhardlink: Vec<String>,
}
pub fn connect_button_hardlink_symlink(gui_data: &GuiData) { pub fn connect_button_hardlink_symlink(gui_data: &GuiData) {
// Hardlinking // Hardlinking
{ {
@ -62,7 +68,7 @@ async fn sym_hard_link_things(gui_data: GuiData, hardlinking: TypeOfTool) {
let check_button_settings_confirm_link = gui_data.settings.check_button_settings_confirm_link.clone(); let check_button_settings_confirm_link = gui_data.settings.check_button_settings_confirm_link.clone();
if !check_if_anything_is_selected_async(tree_view, column_header, nb_object.column_selection).await { if !check_if_anything_is_selected_async(tree_view, column_header, nb_object.column_selection) {
return; return;
} }
@ -80,7 +86,7 @@ async fn sym_hard_link_things(gui_data: GuiData, hardlinking: TypeOfTool) {
nb_object.column_path, nb_object.column_path,
column_header, column_header,
nb_object.column_selection, nb_object.column_selection,
hardlinking, &hardlinking,
&text_view_errors, &text_view_errors,
); );
@ -91,7 +97,7 @@ async fn sym_hard_link_things(gui_data: GuiData, hardlinking: TypeOfTool) {
} else { } else {
image_preview_duplicates.hide(); image_preview_duplicates.hide();
} }
*preview_path.borrow_mut() = "".to_string(); *preview_path.borrow_mut() = String::new();
} }
_ => {} _ => {}
} }
@ -103,18 +109,13 @@ fn hardlink_symlink(
column_path: i32, column_path: i32,
column_header: i32, column_header: i32,
column_selection: i32, column_selection: i32,
hardlinking: TypeOfTool, hardlinking: &TypeOfTool,
text_view_errors: &TextView, text_view_errors: &TextView,
) { ) {
reset_text_view(text_view_errors); reset_text_view(text_view_errors);
let model = get_list_store(tree_view); let model = get_list_store(tree_view);
#[derive(Debug)]
struct SymHardlinkData {
original_data: String,
files_to_symhardlink: Vec<String>,
}
let mut vec_tree_path_to_remove: Vec<TreePath> = Vec::new(); // List of hardlinked files without its root let mut vec_tree_path_to_remove: Vec<TreePath> = Vec::new(); // List of hardlinked files without its root
let mut vec_symhardlink_data: Vec<SymHardlinkData> = Vec::new(); let mut vec_symhardlink_data: Vec<SymHardlinkData> = Vec::new();
@ -154,9 +155,7 @@ fn hardlink_symlink(
} }
current_symhardlink_data = None; current_symhardlink_data = None;
if !model.iter_next(&current_iter) { assert!(model.iter_next(&current_iter), "HEADER, shouldn't be a last item.");
panic!("HEADER, shouldn't be a last item.");
}
continue; continue;
} }
@ -199,9 +198,9 @@ fn hardlink_symlink(
break; break;
} }
} }
if hardlinking == TypeOfTool::Hardlinking { if hardlinking == &TypeOfTool::Hardlinking {
for symhardlink_data in vec_symhardlink_data { for symhardlink_data in vec_symhardlink_data {
for file_to_hardlink in symhardlink_data.files_to_symhardlink.into_iter() { for file_to_hardlink in symhardlink_data.files_to_symhardlink {
if let Err(e) = make_hard_link(&PathBuf::from(&symhardlink_data.original_data), &PathBuf::from(&file_to_hardlink)) { if let Err(e) = make_hard_link(&PathBuf::from(&symhardlink_data.original_data), &PathBuf::from(&file_to_hardlink)) {
add_text_to_text_view(text_view_errors, format!("{} {}, reason {}", flg!("hardlink_failed"), file_to_hardlink, e).as_str()); add_text_to_text_view(text_view_errors, format!("{} {}, reason {}", flg!("hardlink_failed"), file_to_hardlink, e).as_str());
continue; continue;
@ -210,7 +209,7 @@ fn hardlink_symlink(
} }
} else { } else {
for symhardlink_data in vec_symhardlink_data { for symhardlink_data in vec_symhardlink_data {
for file_to_symlink in symhardlink_data.files_to_symhardlink.into_iter() { for file_to_symlink in symhardlink_data.files_to_symhardlink {
if let Err(e) = fs::remove_file(&file_to_symlink) { if let Err(e) = fs::remove_file(&file_to_symlink) {
add_text_to_text_view( add_text_to_text_view(
text_view_errors, text_view_errors,
@ -330,7 +329,7 @@ pub async fn check_if_changing_one_item_in_group_and_continue(tree_view: &gtk4::
true true
} }
pub async fn check_if_anything_is_selected_async(tree_view: &gtk4::TreeView, column_header: i32, column_selection: i32) -> bool { pub fn check_if_anything_is_selected_async(tree_view: &gtk4::TreeView, column_header: i32, column_selection: i32) -> bool {
let model = get_list_store(tree_view); let model = get_list_store(tree_view);
if let Some(iter) = model.iter_first() { if let Some(iter) = model.iter_first() {

16
czkawka_gui/src/connect_things/connect_button_move.rs
Unescape Escape View File

@ -55,7 +55,7 @@ pub fn connect_button_move(gui_data: &GuiData) {
} else { } else {
image_preview_duplicates.hide(); image_preview_duplicates.hide();
} }
*preview_path.borrow_mut() = "".to_string(); *preview_path.borrow_mut() = String::new();
} }
_ => {} _ => {}
} }
@ -122,12 +122,12 @@ fn move_things(
column_path, column_path,
column_header, column_header,
column_selection, column_selection,
folder, &folder,
&entry_info, &entry_info,
&text_view_errors, &text_view_errors,
); );
} else { } else {
move_with_list(&tree_view, column_file_name, column_path, column_selection, folder, &entry_info, &text_view_errors); move_with_list(&tree_view, column_file_name, column_path, column_selection, &folder, &entry_info, &text_view_errors);
} }
} }
} }
@ -141,7 +141,7 @@ fn move_with_tree(
column_path: i32, column_path: i32,
column_header: i32, column_header: i32,
column_selection: i32, column_selection: i32,
destination_folder: PathBuf, destination_folder: &Path,
entry_info: &gtk4::Entry, entry_info: &gtk4::Entry,
text_view_errors: &gtk4::TextView, text_view_errors: &gtk4::TextView,
) { ) {
@ -169,7 +169,7 @@ fn move_with_tree(
return; // No selected rows return; // No selected rows
} }
move_files_common(&selected_rows, &model, column_file_name, column_path, &destination_folder, entry_info, text_view_errors); move_files_common(&selected_rows, &model, column_file_name, column_path, destination_folder, entry_info, text_view_errors);
clean_invalid_headers(&model, column_header, column_path); clean_invalid_headers(&model, column_header, column_path);
} }
@ -179,7 +179,7 @@ fn move_with_list(
column_file_name: i32, column_file_name: i32,
column_path: i32, column_path: i32,
column_selection: i32, column_selection: i32,
destination_folder: PathBuf, destination_folder: &Path,
entry_info: &gtk4::Entry, entry_info: &gtk4::Entry,
text_view_errors: &gtk4::TextView, text_view_errors: &gtk4::TextView,
) { ) {
@ -203,7 +203,7 @@ fn move_with_list(
return; // No selected rows return; // No selected rows
} }
move_files_common(&selected_rows, &model, column_file_name, column_path, &destination_folder, entry_info, text_view_errors) move_files_common(&selected_rows, &model, column_file_name, column_path, destination_folder, entry_info, text_view_errors);
} }
fn move_files_common( fn move_files_common(
@ -215,7 +215,7 @@ fn move_files_common(
entry_info: &gtk4::Entry, entry_info: &gtk4::Entry,
text_view_errors: &gtk4::TextView, text_view_errors: &gtk4::TextView,
) { ) {
let mut messages: String = "".to_string(); let mut messages: String = String::new();
let mut moved_files: u32 = 0; let mut moved_files: u32 = 0;

36
czkawka_gui/src/connect_things/connect_button_search.rs
Unescape Escape View File

@ -124,15 +124,21 @@ pub fn connect_button_search(
return; return;
} }
let included_directories = get_path_buf_from_vector_of_strings(get_string_from_list_store(&tree_view_included_directories, ColumnsIncludedDirectory::Path as i32, None)); let included_directories = get_path_buf_from_vector_of_strings(&get_string_from_list_store(&tree_view_included_directories, ColumnsIncludedDirectory::Path as i32, None));
let excluded_directories = get_path_buf_from_vector_of_strings(get_string_from_list_store(&tree_view_excluded_directories, ColumnsExcludedDirectory::Path as i32, None)); let excluded_directories = get_path_buf_from_vector_of_strings(&get_string_from_list_store(&tree_view_excluded_directories, ColumnsExcludedDirectory::Path as i32, None));
let reference_directories = get_path_buf_from_vector_of_strings(get_string_from_list_store( let reference_directories = get_path_buf_from_vector_of_strings(&get_string_from_list_store(
&tree_view_included_directories, &tree_view_included_directories,
ColumnsIncludedDirectory::Path as i32, ColumnsIncludedDirectory::Path as i32,
Some(ColumnsIncludedDirectory::ReferenceButton as i32), Some(ColumnsIncludedDirectory::ReferenceButton as i32),
)); ));
let recursive_search = check_button_recursive.is_active(); let recursive_search = check_button_recursive.is_active();
let excluded_items = entry_excluded_items.text().as_str().to_string().split(',').map(|e| e.to_string()).collect::<Vec<String>>(); let excluded_items = entry_excluded_items
.text()
.as_str()
.to_string()
.split(',')
.map(std::string::ToString::to_string)
.collect::<Vec<String>>();
let allowed_extensions = entry_allowed_extensions.text().as_str().to_string(); let allowed_extensions = entry_allowed_extensions.text().as_str().to_string();
let hide_hard_links = check_button_settings_hide_hard_links.is_active(); let hide_hard_links = check_button_settings_hide_hard_links.is_active();
let use_cache = check_button_settings_use_cache.is_active(); let use_cache = check_button_settings_use_cache.is_active();
@ -225,7 +231,7 @@ pub fn connect_button_search(
df.set_case_sensitive_name_comparison(case_sensitive_name_comparison); df.set_case_sensitive_name_comparison(case_sensitive_name_comparison);
df.set_exclude_other_filesystems(ignore_other_filesystems); df.set_exclude_other_filesystems(ignore_other_filesystems);
df.find_duplicates(Some(&stop_receiver), Some(&futures_sender_duplicate_files)); df.find_duplicates(Some(&stop_receiver), Some(&futures_sender_duplicate_files));
let _ = glib_stop_sender.send(Message::Duplicates(df)); glib_stop_sender.send(Message::Duplicates(df)).unwrap();
}); });
} }
NotebookMainEnum::EmptyFiles => { NotebookMainEnum::EmptyFiles => {
@ -247,7 +253,7 @@ pub fn connect_button_search(
vf.set_allowed_extensions(allowed_extensions); vf.set_allowed_extensions(allowed_extensions);
vf.set_exclude_other_filesystems(ignore_other_filesystems); vf.set_exclude_other_filesystems(ignore_other_filesystems);
vf.find_empty_files(Some(&stop_receiver), Some(&futures_sender_empty_files)); vf.find_empty_files(Some(&stop_receiver), Some(&futures_sender_empty_files));
let _ = glib_stop_sender.send(Message::EmptyFiles(vf)); glib_stop_sender.send(Message::EmptyFiles(vf)).unwrap();
}); });
} }
NotebookMainEnum::EmptyDirectories => { NotebookMainEnum::EmptyDirectories => {
@ -266,7 +272,7 @@ pub fn connect_button_search(
ef.set_excluded_items(excluded_items); ef.set_excluded_items(excluded_items);
ef.set_exclude_other_filesystems(ignore_other_filesystems); ef.set_exclude_other_filesystems(ignore_other_filesystems);
ef.find_empty_folders(Some(&stop_receiver), Some(&futures_sender_empty_folder)); ef.find_empty_folders(Some(&stop_receiver), Some(&futures_sender_empty_folder));
let _ = glib_stop_sender.send(Message::EmptyFolders(ef)); glib_stop_sender.send(Message::EmptyFolders(ef)).unwrap();
}); });
} }
NotebookMainEnum::BigFiles => { NotebookMainEnum::BigFiles => {
@ -295,7 +301,7 @@ pub fn connect_button_search(
bf.set_search_mode(big_files_mode); bf.set_search_mode(big_files_mode);
bf.set_exclude_other_filesystems(ignore_other_filesystems); bf.set_exclude_other_filesystems(ignore_other_filesystems);
bf.find_big_files(Some(&stop_receiver), Some(&futures_sender_big_file)); bf.find_big_files(Some(&stop_receiver), Some(&futures_sender_big_file));
let _ = glib_stop_sender.send(Message::BigFiles(bf)); glib_stop_sender.send(Message::BigFiles(bf)).unwrap();
}); });
} }
NotebookMainEnum::Temporary => { NotebookMainEnum::Temporary => {
@ -316,7 +322,7 @@ pub fn connect_button_search(
tf.set_excluded_items(excluded_items); tf.set_excluded_items(excluded_items);
tf.set_exclude_other_filesystems(ignore_other_filesystems); tf.set_exclude_other_filesystems(ignore_other_filesystems);
tf.find_temporary_files(Some(&stop_receiver), Some(&futures_sender_temporary)); tf.find_temporary_files(Some(&stop_receiver), Some(&futures_sender_temporary));
let _ = glib_stop_sender.send(Message::Temporary(tf)); glib_stop_sender.send(Message::Temporary(tf)).unwrap();
}); });
} }
NotebookMainEnum::SimilarImages => { NotebookMainEnum::SimilarImages => {
@ -366,7 +372,7 @@ pub fn connect_button_search(
sf.set_save_also_as_json(save_also_as_json); sf.set_save_also_as_json(save_also_as_json);
sf.set_exclude_other_filesystems(ignore_other_filesystems); sf.set_exclude_other_filesystems(ignore_other_filesystems);
sf.find_similar_images(Some(&stop_receiver), Some(&futures_sender_similar_images)); sf.find_similar_images(Some(&stop_receiver), Some(&futures_sender_similar_images));
let _ = glib_stop_sender.send(Message::SimilarImages(sf)); glib_stop_sender.send(Message::SimilarImages(sf)).unwrap();
}); });
} }
NotebookMainEnum::SimilarVideos => { NotebookMainEnum::SimilarVideos => {
@ -402,7 +408,7 @@ pub fn connect_button_search(
sf.set_save_also_as_json(save_also_as_json); sf.set_save_also_as_json(save_also_as_json);
sf.set_exclude_other_filesystems(ignore_other_filesystems); sf.set_exclude_other_filesystems(ignore_other_filesystems);
sf.find_similar_videos(Some(&stop_receiver), Some(&futures_sender_similar_videos)); sf.find_similar_videos(Some(&stop_receiver), Some(&futures_sender_similar_videos));
let _ = glib_stop_sender.send(Message::SimilarVideos(sf)); glib_stop_sender.send(Message::SimilarVideos(sf)).unwrap();
}); });
} }
NotebookMainEnum::SameMusic => { NotebookMainEnum::SameMusic => {
@ -454,7 +460,7 @@ pub fn connect_button_search(
mf.set_save_also_as_json(save_also_as_json); mf.set_save_also_as_json(save_also_as_json);
mf.set_exclude_other_filesystems(ignore_other_filesystems); mf.set_exclude_other_filesystems(ignore_other_filesystems);
mf.find_same_music(Some(&stop_receiver), Some(&futures_sender_same_music)); mf.find_same_music(Some(&stop_receiver), Some(&futures_sender_same_music));
let _ = glib_stop_sender.send(Message::SameMusic(mf)); glib_stop_sender.send(Message::SameMusic(mf)).unwrap();
}); });
} else { } else {
set_buttons( set_buttons(
@ -490,7 +496,7 @@ pub fn connect_button_search(
isf.set_allowed_extensions(allowed_extensions); isf.set_allowed_extensions(allowed_extensions);
isf.set_exclude_other_filesystems(ignore_other_filesystems); isf.set_exclude_other_filesystems(ignore_other_filesystems);
isf.find_invalid_links(Some(&stop_receiver), Some(&futures_sender_invalid_symlinks)); isf.find_invalid_links(Some(&stop_receiver), Some(&futures_sender_invalid_symlinks));
let _ = glib_stop_sender.send(Message::InvalidSymlinks(isf)); glib_stop_sender.send(Message::InvalidSymlinks(isf)).unwrap();
}); });
} }
NotebookMainEnum::BrokenFiles => { NotebookMainEnum::BrokenFiles => {
@ -531,7 +537,7 @@ pub fn connect_button_search(
br.set_checked_types(checked_types); br.set_checked_types(checked_types);
br.set_exclude_other_filesystems(ignore_other_filesystems); br.set_exclude_other_filesystems(ignore_other_filesystems);
br.find_broken_files(Some(&stop_receiver), Some(&futures_sender_broken_files)); br.find_broken_files(Some(&stop_receiver), Some(&futures_sender_broken_files));
let _ = glib_stop_sender.send(Message::BrokenFiles(br)); glib_stop_sender.send(Message::BrokenFiles(br)).unwrap();
}); });
} else { } else {
set_buttons( set_buttons(
@ -569,7 +575,7 @@ pub fn connect_button_search(
be.set_recursive_search(recursive_search); be.set_recursive_search(recursive_search);
be.set_exclude_other_filesystems(ignore_other_filesystems); be.set_exclude_other_filesystems(ignore_other_filesystems);
be.find_bad_extensions_files(Some(&stop_receiver), Some(&futures_sender_bad_extensions)); be.find_bad_extensions_files(Some(&stop_receiver), Some(&futures_sender_bad_extensions));
let _ = glib_stop_sender.send(Message::BadExtensions(be)); glib_stop_sender.send(Message::BadExtensions(be)).unwrap();
}); });
} }
} }

6
czkawka_gui/src/connect_things/connect_change_language.rs
Unescape Escape View File

@ -23,7 +23,7 @@ fn change_language(gui_data: &GuiData) {
("czkawka_gui", localizer_gui::localizer_gui()), ("czkawka_gui", localizer_gui::localizer_gui()),
]; ];
let lang_short = get_language_from_combo_box_text(gui_data.settings.combo_box_settings_language.active_text().unwrap().to_string()).short_text; let lang_short = get_language_from_combo_box_text(&gui_data.settings.combo_box_settings_language.active_text().unwrap()).short_text;
let lang_identifier = vec![LanguageIdentifier::from_bytes(lang_short.as_bytes()).unwrap()]; let lang_identifier = vec![LanguageIdentifier::from_bytes(lang_short.as_bytes()).unwrap()];
for (lib, localizer) in localizers { for (lib, localizer) in localizers {
@ -39,11 +39,11 @@ pub fn load_system_language(gui_data: &GuiData) {
if let Some(language) = requested_languages.get(0) { if let Some(language) = requested_languages.get(0) {
let old_short_lang = language.to_string(); let old_short_lang = language.to_string();
let mut short_lang = "".to_string(); let mut short_lang = String::new();
// removes from e.g. en_zb, ending _zd since Czkawka don't support this(maybe could add this in future, but only when) // removes from e.g. en_zb, ending _zd since Czkawka don't support this(maybe could add this in future, but only when)
for i in old_short_lang.chars() { for i in old_short_lang.chars() {
if i.is_ascii_alphabetic() { if i.is_ascii_alphabetic() {
short_lang.push(i) short_lang.push(i);
} else { } else {
break; break;
} }

63
czkawka_gui/src/connect_things/connect_popovers.rs
Unescape Escape View File

@ -98,10 +98,8 @@ fn popover_all_except_oldest_newest(
let mut tree_iter_array: Vec<TreeIter> = Vec::new(); let mut tree_iter_array: Vec<TreeIter> = Vec::new();
let mut used_index: Option<usize> = None; let mut used_index: Option<usize> = None;
let mut current_index: usize = 0; let mut current_index: usize = 0;
let mut modification_time_min_max: u64 = match except_oldest {
true => u64::MAX, let mut modification_time_min_max: u64 = if except_oldest { u64::MAX } else { 0 };
false => 0,
};
let mut file_length: usize = 0; let mut file_length: usize = 0;
@ -172,10 +170,7 @@ fn popover_one_oldest_newest(
let mut tree_iter_array: Vec<TreeIter> = Vec::new(); let mut tree_iter_array: Vec<TreeIter> = Vec::new();
let mut used_index: Option<usize> = None; let mut used_index: Option<usize> = None;
let mut current_index: usize = 0; let mut current_index: usize = 0;
let mut modification_time_min_max: u64 = match check_oldest { let mut modification_time_min_max: u64 = if check_oldest { u64::MAX } else { 0 };
true => u64::MAX,
false => 0,
};
let mut file_length: usize = 0; let mut file_length: usize = 0;
@ -242,9 +237,10 @@ fn popover_custom_select_unselect(
) { ) {
popover.popdown(); popover.popdown();
let window_title = match select_things { let window_title = if select_things {
false => flg!("popover_custom_mode_unselect"), flg!("popover_custom_mode_select")
true => flg!("popover_custom_mode_select"), } else {
flg!("popover_custom_mode_unselect")
}; };
// Dialog for select/unselect items // Dialog for select/unselect items
@ -290,7 +286,7 @@ fn popover_custom_select_unselect(
let message; let message;
let text_to_check = entry_rust_regex.text().to_string(); let text_to_check = entry_rust_regex.text().to_string();
if text_to_check.is_empty() { if text_to_check.is_empty() {
message = "".to_string(); message = String::new();
} else { } else {
match Regex::new(&text_to_check) { match Regex::new(&text_to_check) {
Ok(_) => message = flg!("popover_valid_regex"), Ok(_) => message = flg!("popover_valid_regex"),
@ -382,26 +378,25 @@ fn popover_custom_select_unselect(
let check_all_selected = check_button_select_not_all_results.is_active(); let check_all_selected = check_button_select_not_all_results.is_active();
if check_button_path.is_active() || check_button_name.is_active() || check_button_rust_regex.is_active() { if check_button_path.is_active() || check_button_name.is_active() || check_button_rust_regex.is_active() {
let compiled_regex = match check_regex { let compiled_regex = if check_regex {
true => match Regex::new(&regex_wildcard) { if let Ok(t) = Regex::new(&regex_wildcard) {
Ok(t) => t, t
Err(_) => { } else {
eprintln!("What? Regex should compile properly."); eprintln!("What? Regex should compile properly.");
confirmation_dialog_select_unselect.close(); confirmation_dialog_select_unselect.close();
return; return;
} }
}, } else {
false => Regex::new("").unwrap(), Regex::new("").unwrap()
}; };
let model = get_list_store(&tree_view); let model = get_list_store(&tree_view);
let iter = match model.iter_first() { let iter = if let Some(t) = model.iter_first() {
Some(t) => t, t
None => { } else {
confirmation_dialog_select_unselect.close(); confirmation_dialog_select_unselect.close();
return; return;
}
}; };
let mut number_of_all_things = 0; let mut number_of_all_things = 0;
@ -524,14 +519,8 @@ fn popover_all_except_biggest_smallest(
let mut tree_iter_array: Vec<TreeIter> = Vec::new(); let mut tree_iter_array: Vec<TreeIter> = Vec::new();
let mut used_index: Option<usize> = None; let mut used_index: Option<usize> = None;
let mut current_index: usize = 0; let mut current_index: usize = 0;
let mut size_as_bytes_min_max: u64 = match except_biggest { let mut size_as_bytes_min_max: u64 = if except_biggest { 0 } else { u64::MAX };
true => 0, let mut number_of_pixels_min_max: u64 = if except_biggest { 0 } else { u64::MAX };
false => u64::MAX,
};
let mut number_of_pixels_min_max: u64 = match except_biggest {
true => 0,
false => u64::MAX,
};
loop { loop {
if model.get::<bool>(&iter, column_header) { if model.get::<bool>(&iter, column_header) {
@ -547,7 +536,7 @@ fn popover_all_except_biggest_smallest(
if let Some(column_dimensions) = column_dimensions { if let Some(column_dimensions) = column_dimensions {
let dimensions_string = model.get::<String>(&iter, column_dimensions); let dimensions_string = model.get::<String>(&iter, column_dimensions);
let dimensions = change_dimension_to_krotka(dimensions_string); let dimensions = change_dimension_to_krotka(&dimensions_string);
let number_of_pixels = dimensions.0 * dimensions.1; let number_of_pixels = dimensions.0 * dimensions.1;
if except_biggest { if except_biggest {

26
czkawka_gui/src/connect_things/connect_settings.rs
Unescape Escape View File

@ -62,7 +62,7 @@ pub fn connect_settings(gui_data: &GuiData) {
let button_settings_load_configuration = gui_data.settings.button_settings_load_configuration.clone(); let button_settings_load_configuration = gui_data.settings.button_settings_load_configuration.clone();
let scrolled_window_errors = gui_data.scrolled_window_errors.clone(); let scrolled_window_errors = gui_data.scrolled_window_errors.clone();
button_settings_load_configuration.connect_clicked(move |_| { button_settings_load_configuration.connect_clicked(move |_| {
load_configuration(true, &upper_notebook, &main_notebook, &settings, &text_view_errors, &scrolled_window_errors, Vec::new()); load_configuration(true, &upper_notebook, &main_notebook, &settings, &text_view_errors, &scrolled_window_errors, &Vec::new());
}); });
} }
// Connect reset configuration button // Connect reset configuration button
@ -111,7 +111,7 @@ pub fn connect_settings(gui_data: &GuiData) {
let entry_settings_cache_file_minimal_size = gui_data.settings.entry_settings_cache_file_minimal_size.clone(); let entry_settings_cache_file_minimal_size = gui_data.settings.entry_settings_cache_file_minimal_size.clone();
button_settings_duplicates_clear_cache.connect_clicked(move |_| { button_settings_duplicates_clear_cache.connect_clicked(move |_| {
let dialog = create_clear_cache_dialog(flg!("cache_clear_duplicates_title"), &settings_window); let dialog = create_clear_cache_dialog(&flg!("cache_clear_duplicates_title"), &settings_window);
dialog.show(); dialog.show();
let text_view_errors = text_view_errors.clone(); let text_view_errors = text_view_errors.clone();
@ -121,7 +121,7 @@ pub fn connect_settings(gui_data: &GuiData) {
if response_type == ResponseType::Ok { if response_type == ResponseType::Ok {
let mut messages: Messages = Messages::new(); let mut messages: Messages = Messages::new();
for use_prehash in [true, false] { for use_prehash in [true, false] {
for type_of_hash in [HashType::Xxh3, HashType::Blake3, HashType::Crc32].iter() { for type_of_hash in &[HashType::Xxh3, HashType::Blake3, HashType::Crc32] {
if let Some(cache_entries) = czkawka_core::duplicate::load_hashes_from_file(&mut messages, true, type_of_hash, use_prehash) { if let Some(cache_entries) = czkawka_core::duplicate::load_hashes_from_file(&mut messages, true, type_of_hash, use_prehash) {
let mut hashmap_to_save: BTreeMap<String, czkawka_core::common_dir_traversal::FileEntry> = Default::default(); let mut hashmap_to_save: BTreeMap<String, czkawka_core::common_dir_traversal::FileEntry> = Default::default();
for (_, vec_file_entry) in cache_entries { for (_, vec_file_entry) in cache_entries {
@ -135,7 +135,7 @@ pub fn connect_settings(gui_data: &GuiData) {
type_of_hash, type_of_hash,
use_prehash, use_prehash,
entry_settings_cache_file_minimal_size.text().as_str().parse::<u64>().unwrap_or(2 * 1024 * 1024), entry_settings_cache_file_minimal_size.text().as_str().parse::<u64>().unwrap_or(2 * 1024 * 1024),
) );
} }
} }
@ -153,7 +153,7 @@ pub fn connect_settings(gui_data: &GuiData) {
let text_view_errors = gui_data.text_view_errors.clone(); let text_view_errors = gui_data.text_view_errors.clone();
button_settings_similar_images_clear_cache.connect_clicked(move |_| { button_settings_similar_images_clear_cache.connect_clicked(move |_| {
let dialog = create_clear_cache_dialog(flg!("cache_clear_similar_images_title"), &settings_window); let dialog = create_clear_cache_dialog(&flg!("cache_clear_similar_images_title"), &settings_window);
dialog.show(); dialog.show();
let text_view_errors = text_view_errors.clone(); let text_view_errors = text_view_errors.clone();
@ -161,17 +161,15 @@ pub fn connect_settings(gui_data: &GuiData) {
dialog.connect_response(move |dialog, response_type| { dialog.connect_response(move |dialog, response_type| {
if response_type == ResponseType::Ok { if response_type == ResponseType::Ok {
let mut messages: Messages = Messages::new(); let mut messages: Messages = Messages::new();
for hash_size in [8, 16, 32, 64].iter() { for hash_size in &[8, 16, 32, 64] {
for image_filter in [ for image_filter in &[
FilterType::Lanczos3, FilterType::Lanczos3,
FilterType::CatmullRom, FilterType::CatmullRom,
FilterType::Gaussian, FilterType::Gaussian,
FilterType::Nearest, FilterType::Nearest,
FilterType::Triangle, FilterType::Triangle,
] ] {
.iter() for hash_alg in &[HashAlg::Blockhash, HashAlg::Gradient, HashAlg::DoubleGradient, HashAlg::VertGradient, HashAlg::Mean] {
{
for hash_alg in [HashAlg::Blockhash, HashAlg::Gradient, HashAlg::DoubleGradient, HashAlg::VertGradient, HashAlg::Mean].iter() {
if let Some(cache_entries) = czkawka_core::similar_images::load_hashes_from_file(&mut messages, true, *hash_size, *hash_alg, *image_filter) { if let Some(cache_entries) = czkawka_core::similar_images::load_hashes_from_file(&mut messages, true, *hash_size, *hash_alg, *image_filter) {
czkawka_core::similar_images::save_hashes_to_file(&cache_entries, &mut messages, false, *hash_size, *hash_alg, *image_filter); czkawka_core::similar_images::save_hashes_to_file(&cache_entries, &mut messages, false, *hash_size, *hash_alg, *image_filter);
} }
@ -192,7 +190,7 @@ pub fn connect_settings(gui_data: &GuiData) {
let text_view_errors = gui_data.text_view_errors.clone(); let text_view_errors = gui_data.text_view_errors.clone();
button_settings_similar_videos_clear_cache.connect_clicked(move |_| { button_settings_similar_videos_clear_cache.connect_clicked(move |_| {
let dialog = create_clear_cache_dialog(flg!("cache_clear_similar_videos_title"), &settings_window); let dialog = create_clear_cache_dialog(&flg!("cache_clear_similar_videos_title"), &settings_window);
dialog.show(); dialog.show();
let text_view_errors = text_view_errors.clone(); let text_view_errors = text_view_errors.clone();
@ -214,8 +212,8 @@ pub fn connect_settings(gui_data: &GuiData) {
} }
} }
fn create_clear_cache_dialog(title_str: String, window_settings: &Window) -> gtk4::Dialog { fn create_clear_cache_dialog(title_str: &str, window_settings: &Window) -> gtk4::Dialog {
let dialog = gtk4::Dialog::builder().title(&title_str).modal(true).transient_for(window_settings).build(); let dialog = gtk4::Dialog::builder().title(title_str).modal(true).transient_for(window_settings).build();
dialog.add_button(&flg!("general_ok_button"), ResponseType::Ok); dialog.add_button(&flg!("general_ok_button"), ResponseType::Ok);
dialog.add_button(&flg!("general_close_button"), ResponseType::Cancel); dialog.add_button(&flg!("general_close_button"), ResponseType::Cancel);

6
czkawka_gui/src/gui_structs/gui_data.rs
Unescape Escape View File

@ -139,9 +139,9 @@ impl GuiData {
let shared_buttons: Rc<RefCell<_>> = Rc::new(RefCell::new(HashMap::<NotebookMainEnum, HashMap<BottomButtonsEnum, bool>>::new())); let shared_buttons: Rc<RefCell<_>> = Rc::new(RefCell::new(HashMap::<NotebookMainEnum, HashMap<BottomButtonsEnum, bool>>::new()));
// Show by default only search button // Show by default only search button
for i in get_all_main_tabs().iter() { for i in &get_all_main_tabs() {
let mut temp_hashmap: HashMap<BottomButtonsEnum, bool> = Default::default(); let mut temp_hashmap: HashMap<BottomButtonsEnum, bool> = Default::default();
for button_name in bottom_buttons.buttons_names.iter() { for button_name in &bottom_buttons.buttons_names {
if *button_name == BottomButtonsEnum::Search { if *button_name == BottomButtonsEnum::Search {
temp_hashmap.insert(*button_name, true); temp_hashmap.insert(*button_name, true);
} else { } else {
@ -165,7 +165,7 @@ impl GuiData {
let shared_broken_files_state: Rc<RefCell<_>> = Rc::new(RefCell::new(BrokenFiles::new())); let shared_broken_files_state: Rc<RefCell<_>> = Rc::new(RefCell::new(BrokenFiles::new()));
let shared_bad_extensions_state: Rc<RefCell<_>> = Rc::new(RefCell::new(BadExtensions::new())); let shared_bad_extensions_state: Rc<RefCell<_>> = Rc::new(RefCell::new(BadExtensions::new()));
let preview_path: Rc<RefCell<_>> = Rc::new(RefCell::new("".to_string())); let preview_path: Rc<RefCell<_>> = Rc::new(RefCell::new(String::new()));
//// Entry //// Entry
let entry_info: gtk4::Entry = builder.object("entry_info").unwrap(); let entry_info: gtk4::Entry = builder.object("entry_info").unwrap();

37
czkawka_gui/src/help_functions.rs
Unescape Escape View File

@ -253,12 +253,12 @@ pub fn get_string_from_list_store(tree_view: &TreeView, column_full_path: i32, c
} }
} }
pub fn get_path_buf_from_vector_of_strings(vec_string: Vec<String>) -> Vec<PathBuf> { pub fn get_path_buf_from_vector_of_strings(vec_string: &[String]) -> Vec<PathBuf> {
vec_string.iter().map(PathBuf::from).collect() vec_string.iter().map(PathBuf::from).collect()
} }
pub fn print_text_messages_to_text_view(text_messages: &Messages, text_view: &TextView) { pub fn print_text_messages_to_text_view(text_messages: &Messages, text_view: &TextView) {
let mut messages: String = String::from(""); let mut messages: String = String::new();
if !text_messages.messages.is_empty() { if !text_messages.messages.is_empty() {
messages += format!("############### {}({}) ###############\n", flg!("text_view_messages"), text_messages.messages.len()).as_str(); messages += format!("############### {}({}) ###############\n", flg!("text_view_messages"), text_messages.messages.len()).as_str();
} }
@ -338,7 +338,7 @@ pub fn get_dialog_box_child(dialog: &gtk4::Dialog) -> gtk4::Box {
dialog.child().unwrap().downcast::<gtk4::Box>().unwrap() dialog.child().unwrap().downcast::<gtk4::Box>().unwrap()
} }
pub fn change_dimension_to_krotka(dimensions: String) -> (u64, u64) { pub fn change_dimension_to_krotka(dimensions: &str) -> (u64, u64) {
#[allow(clippy::single_char_pattern)] #[allow(clippy::single_char_pattern)]
let vec = dimensions.split::<&str>("x").collect::<Vec<_>>(); let vec = dimensions.split::<&str>("x").collect::<Vec<_>>();
assert_eq!(vec.len(), 2); // 400x400 - should only have two elements, if have more, then something is not good assert_eq!(vec.len(), 2); // 400x400 - should only have two elements, if have more, then something is not good
@ -395,9 +395,8 @@ pub fn clean_invalid_headers(model: &ListStore, column_header: i32, column_path:
if let Some(first_iter) = model.iter_first() { if let Some(first_iter) = model.iter_first() {
let mut vec_tree_path_to_delete: Vec<gtk4::TreePath> = Vec::new(); let mut vec_tree_path_to_delete: Vec<gtk4::TreePath> = Vec::new();
let mut current_iter = first_iter; let mut current_iter = first_iter;
if !model.get::<bool>(&current_iter, column_header) { // First element should be header
panic!("First deleted element, should be a header"); // First element should be header assert!(model.get::<bool>(&current_iter, column_header), "First deleted element, should be a header");
};
let mut next_iter; let mut next_iter;
let mut next_next_iter; let mut next_next_iter;
@ -405,9 +404,8 @@ pub fn clean_invalid_headers(model: &ListStore, column_header: i32, column_path:
// Empty means default check type // Empty means default check type
if model.get::<String>(&current_iter, column_path).is_empty() { if model.get::<String>(&current_iter, column_path).is_empty() {
'main: loop { 'main: loop {
if !model.get::<bool>(&current_iter, column_header) { // First element should be header
panic!("First deleted element, should be a header"); // First element should be header assert!(model.get::<bool>(&current_iter, column_header), "First deleted element, should be a header");
};
next_iter = current_iter; next_iter = current_iter;
if !model.iter_next(&next_iter) { if !model.iter_next(&next_iter) {
@ -458,9 +456,8 @@ pub fn clean_invalid_headers(model: &ListStore, column_header: i32, column_path:
// Non empty means that header points at reference folder // Non empty means that header points at reference folder
else { else {
'reference: loop { 'reference: loop {
if !model.get::<bool>(&current_iter, column_header) { // First element should be header
panic!("First deleted element, should be a header"); // First element should be header assert!(model.get::<bool>(&current_iter, column_header), "First deleted element, should be a header");
};
next_iter = current_iter; next_iter = current_iter;
if !model.iter_next(&next_iter) { if !model.iter_next(&next_iter) {
@ -587,7 +584,7 @@ pub fn count_number_of_groups(tree_view: &TreeView, column_header: i32) -> u32 {
number_of_selected_groups number_of_selected_groups
} }
pub fn resize_pixbuf_dimension(pixbuf: Pixbuf, requested_size: (i32, i32), interp_type: InterpType) -> Option<Pixbuf> { pub fn resize_pixbuf_dimension(pixbuf: &Pixbuf, requested_size: (i32, i32), interp_type: InterpType) -> Option<Pixbuf> {
let current_ratio = pixbuf.width() as f32 / pixbuf.height() as f32; let current_ratio = pixbuf.width() as f32 / pixbuf.height() as f32;
let mut new_size; let mut new_size;
match current_ratio.partial_cmp(&(requested_size.0 as f32 / requested_size.1 as f32)).unwrap() { match current_ratio.partial_cmp(&(requested_size.0 as f32 / requested_size.1 as f32)).unwrap() {
@ -614,8 +611,8 @@ pub fn get_max_file_name(file_name: &str, max_length: usize) -> String {
let start_characters = 10; let start_characters = 10;
let difference = characters_in_filename - max_length; let difference = characters_in_filename - max_length;
let second_part_start = start_characters + difference; let second_part_start = start_characters + difference;
let mut string_pre = "".to_string(); let mut string_pre = String::new();
let mut string_after = "".to_string(); let mut string_after = String::new();
for (index, character) in file_name.chars().enumerate() { for (index, character) in file_name.chars().enumerate() {
if index < start_characters { if index < start_characters {
@ -637,9 +634,8 @@ pub fn get_custom_label_from_widget<P: IsA<Widget>>(item: &P) -> gtk4::Label {
while let Some(widget) = widgets_to_check.pop() { while let Some(widget) = widgets_to_check.pop() {
if let Ok(label) = widget.clone().downcast::<gtk4::Label>() { if let Ok(label) = widget.clone().downcast::<gtk4::Label>() {
return label; return label;
} else {
widgets_to_check.extend(get_all_direct_children(&widget));
} }
widgets_to_check.extend(get_all_direct_children(&widget));
} }
panic!("Button doesn't have proper custom label child"); panic!("Button doesn't have proper custom label child");
} }
@ -650,9 +646,8 @@ pub fn get_custom_image_from_widget<P: IsA<Widget>>(item: &P) -> gtk4::Image {
while let Some(widget) = widgets_to_check.pop() { while let Some(widget) = widgets_to_check.pop() {
if let Ok(image) = widget.clone().downcast::<gtk4::Image>() { if let Ok(image) = widget.clone().downcast::<gtk4::Image>() {
return image; return image;
} else {
widgets_to_check.extend(get_all_direct_children(&widget));
} }
widgets_to_check.extend(get_all_direct_children(&widget));
} }
panic!("Button doesn't have proper custom label child"); panic!("Button doesn't have proper custom label child");
} }
@ -872,8 +867,8 @@ mod test {
#[test] #[test]
fn test_change_dimension_to_krotka() { fn test_change_dimension_to_krotka() {
assert_eq!(change_dimension_to_krotka("50x50".to_string()), (50, 50)); assert_eq!(change_dimension_to_krotka("50x50"), (50, 50));
assert_eq!(change_dimension_to_krotka("6000x6000".to_string()), (6000, 6000)); assert_eq!(change_dimension_to_krotka("6000x6000"), (6000, 6000));
} }
#[gtk4::test] #[gtk4::test]

18
czkawka_gui/src/initialize_gui.rs
Unescape Escape View File

@ -1,5 +1,5 @@
use std::cell::RefCell; use std::cell::RefCell;
use std::ops::Deref;
use std::path::Path; use std::path::Path;
use std::rc::Rc; use std::rc::Rc;
@ -440,7 +440,7 @@ fn connect_event_mouse(gui_data: &GuiData) {
&text_view_errors, &text_view_errors,
&check_button_settings_show_preview, &check_button_settings_show_preview,
&image_preview, &image_preview,
preview_path, &preview_path,
nb_object.column_path, nb_object.column_path,
nb_object.column_name, nb_object.column_name,
); );
@ -465,7 +465,7 @@ fn connect_event_mouse(gui_data: &GuiData) {
&text_view_errors, &text_view_errors,
&check_button_settings_show_preview, &check_button_settings_show_preview,
&image_preview, &image_preview,
preview_path, &preview_path,
nb_object.column_path, nb_object.column_path,
nb_object.column_name, nb_object.column_name,
); );
@ -518,7 +518,7 @@ fn connect_event_buttons(gui_data: &GuiData) {
&text_view_errors, &text_view_errors,
&check_button_settings_show_preview, &check_button_settings_show_preview,
&image_preview, &image_preview,
preview_path, &preview_path,
nb_object.column_path, nb_object.column_path,
nb_object.column_name, nb_object.column_name,
); );
@ -546,7 +546,7 @@ fn connect_event_buttons(gui_data: &GuiData) {
&text_view_errors, &text_view_errors,
&check_button_settings_show_preview_similar_images, &check_button_settings_show_preview_similar_images,
&image_preview, &image_preview,
preview_path, &preview_path,
nb_object.column_path, nb_object.column_path,
nb_object.column_name, nb_object.column_name,
); );
@ -559,7 +559,7 @@ fn show_preview(
text_view_errors: &TextView, text_view_errors: &TextView,
check_button_settings_show_preview: &CheckButton, check_button_settings_show_preview: &CheckButton,
image_preview: &Image, image_preview: &Image,
preview_path: Rc<RefCell<String>>, preview_path: &Rc<RefCell<String>>,
column_path: i32, column_path: i32,
column_name: i32, column_name: i32,
) { ) {
@ -581,7 +581,7 @@ fn show_preview(
{ {
let preview_path = preview_path.borrow(); let preview_path = preview_path.borrow();
let preview_path = preview_path.deref(); let preview_path = &*preview_path;
if file_name == preview_path { if file_name == preview_path {
return; // Preview is already created, no need to recreate it return; // Preview is already created, no need to recreate it
} }
@ -669,7 +669,7 @@ fn show_preview(
} }
}; };
pixbuf = match resize_pixbuf_dimension(pixbuf, (800, 800), InterpType::Bilinear) { pixbuf = match resize_pixbuf_dimension(&pixbuf, (800, 800), InterpType::Bilinear) {
None => { None => {
add_text_to_text_view( add_text_to_text_view(
text_view_errors, text_view_errors,
@ -697,7 +697,7 @@ fn show_preview(
image_preview.hide(); image_preview.hide();
{ {
let mut preview_path = preview_path.borrow_mut(); let mut preview_path = preview_path.borrow_mut();
*preview_path = "".to_string(); *preview_path = String::new();
} }
} }
} }

2
czkawka_gui/src/language_functions.rs
Unescape Escape View File

@ -68,7 +68,7 @@ pub const LANGUAGES_ALL: [Language; 15] = [
}, },
]; ];
pub fn get_language_from_combo_box_text(combo_box_text: String) -> Language { pub fn get_language_from_combo_box_text(combo_box_text: &str) -> Language {
for lang in LANGUAGES_ALL { for lang in LANGUAGES_ALL {
if lang.combo_box_text == combo_box_text { if lang.combo_box_text == combo_box_text {
return lang; return lang;

6
czkawka_gui/src/main.rs
Unescape Escape View File

@ -65,13 +65,13 @@ mod tests;
fn main() { fn main() {
let application = Application::new(None, ApplicationFlags::HANDLES_OPEN | ApplicationFlags::HANDLES_COMMAND_LINE); let application = Application::new(None, ApplicationFlags::HANDLES_OPEN | ApplicationFlags::HANDLES_COMMAND_LINE);
application.connect_command_line(move |app, cmdline| { application.connect_command_line(move |app, cmdline| {
build_ui(app, cmdline.arguments()); build_ui(app, &cmdline.arguments());
0 0
}); });
application.run_with_args(&env::args().collect::<Vec<_>>()); application.run_with_args(&env::args().collect::<Vec<_>>());
} }
fn build_ui(application: &Application, arguments: Vec<OsString>) { fn build_ui(application: &Application, arguments: &[OsString]) {
let mut gui_data: GuiData = GuiData::new_with_application(application); let mut gui_data: GuiData = GuiData::new_with_application(application);
// Used for getting data from thread // Used for getting data from thread
@ -134,7 +134,7 @@ fn build_ui(application: &Application, arguments: Vec<OsString>) {
&gui_data.settings, &gui_data.settings,
&gui_data.text_view_errors, &gui_data.text_view_errors,
&gui_data.scrolled_window_errors, &gui_data.scrolled_window_errors,
arguments.clone(), arguments,
); );
set_number_of_threads(gui_data.settings.scale_settings_number_of_threads.value().round() as usize); set_number_of_threads(gui_data.settings.scale_settings_number_of_threads.value().round() as usize);
println!("Set thread number to {}", get_number_of_threads()); println!("Set thread number to {}", get_number_of_threads());

8
czkawka_gui/src/opening_selecting_records.rs
Unescape Escape View File

@ -89,9 +89,9 @@ pub fn opening_double_click_function(gesture_click: &GestureClick, number_of_cli
let nt_object = get_notebook_object_from_tree_view(&tree_view); let nt_object = get_notebook_object_from_tree_view(&tree_view);
if number_of_clicks == 2 { if number_of_clicks == 2 {
if gesture_click.current_button() == 1 { if gesture_click.current_button() == 1 {
common_open_function(&tree_view, nt_object.column_name, nt_object.column_path, OpenMode::PathAndName); common_open_function(&tree_view, nt_object.column_name, nt_object.column_path, &OpenMode::PathAndName);
} else if gesture_click.current_button() == 3 { } else if gesture_click.current_button() == 3 {
common_open_function(&tree_view, nt_object.column_name, nt_object.column_path, OpenMode::OnlyPath); common_open_function(&tree_view, nt_object.column_name, nt_object.column_path, &OpenMode::OnlyPath);
} }
} }
} }
@ -118,7 +118,7 @@ fn common_mark_function(tree_view: &gtk4::TreeView, column_selection: i32, colum
} }
} }
fn common_open_function(tree_view: &gtk4::TreeView, column_name: i32, column_path: i32, opening_mode: OpenMode) { fn common_open_function(tree_view: &gtk4::TreeView, column_name: i32, column_path: i32, opening_mode: &OpenMode) {
let selection = tree_view.selection(); let selection = tree_view.selection();
let (selected_rows, tree_model) = selection.selected_rows(); let (selected_rows, tree_model) = selection.selected_rows();
@ -212,7 +212,7 @@ fn handle_tree_keypress_upper_directories(tree_view: &gtk4::TreeView, key_code:
fn handle_tree_keypress(tree_view: &gtk4::TreeView, key_code: u32, name_column: i32, path_column: i32, mark_column: i32, column_header: Option<i32>) { fn handle_tree_keypress(tree_view: &gtk4::TreeView, key_code: u32, name_column: i32, path_column: i32, mark_column: i32, column_header: Option<i32>) {
match key_code { match key_code {
KEY_ENTER => { KEY_ENTER => {
common_open_function(tree_view, name_column, path_column, OpenMode::PathAndName); common_open_function(tree_view, name_column, path_column, &OpenMode::PathAndName);
} }
KEY_SPACE => { KEY_SPACE => {
common_mark_function(tree_view, mark_column, column_header); common_mark_function(tree_view, mark_column, column_header);

176
czkawka_gui/src/saving_loading.rs
Unescape Escape View File

@ -83,10 +83,10 @@ impl LoadSaveStruct {
} }
} }
pub fn get_vector_string(&self, key: String, default_value: Vec<String>) -> Vec<String> { pub fn get_vector_string(&self, key: &str, default_value: Vec<String>) -> Vec<String> {
if self.loaded_items.contains_key(&key) { if self.loaded_items.contains_key(key) {
let mut new_vector = Vec::new(); let mut new_vector = Vec::new();
for i in self.loaded_items.get(&key).unwrap() { for i in self.loaded_items.get(key).unwrap() {
if !i.trim().is_empty() { if !i.trim().is_empty() {
new_vector.push(i.trim().to_string()); new_vector.push(i.trim().to_string());
} }
@ -113,7 +113,7 @@ impl LoadSaveStruct {
return if item.len() == 1 { return if item.len() == 1 {
item[0].clone() item[0].clone()
} else if item.is_empty() { } else if item.is_empty() {
"".to_string() String::new()
} else { } else {
add_text_to_text_view( add_text_to_text_view(
&self.text_view, &self.text_view,
@ -133,12 +133,11 @@ impl LoadSaveStruct {
let item = self.loaded_items.get(&key).unwrap().clone().into_iter().filter(|e| !e.is_empty()).collect::<Vec<String>>(); let item = self.loaded_items.get(&key).unwrap().clone().into_iter().filter(|e| !e.is_empty()).collect::<Vec<String>>();
return if item.len() == 1 { return if item.len() == 1 {
match item[0].parse::<T>() { if let Ok(t) = item[0].parse::<T>() {
Ok(t) => t, t
Err(_) => { } else {
println!("Failed to decode integer from \"{}\", found {:?}", key, item[0]); println!("Failed to decode integer from \"{}\", found {:?}", key, item[0]);
default_value default_value
}
} }
} else { } else {
add_text_to_text_view( add_text_to_text_view(
@ -189,7 +188,7 @@ impl LoadSaveStruct {
} }
// Bool, int, string // Bool, int, string
pub fn save_var<T: ToString>(&mut self, key: String, value: T) { pub fn save_var<T: ToString>(&mut self, key: String, value: &T) {
if self.loaded_items.contains_key(&key) { if self.loaded_items.contains_key(&key) {
add_text_to_text_view( add_text_to_text_view(
&self.text_view, &self.text_view,
@ -262,39 +261,38 @@ impl LoadSaveStruct {
} }
}; };
return Some((config_file_handler, config_file)); return Some((config_file_handler, config_file));
} else { }
if !config_file.exists() || !config_file.is_file() { if !config_file.exists() || !config_file.is_file() {
if manual_execution { if manual_execution {
// Don't show errors when there is no configuration file when starting app // Don't show errors when there is no configuration file when starting app
add_text_to_text_view( add_text_to_text_view(
text_view_errors, text_view_errors,
&flg!( &flg!(
"saving_loading_failed_to_read_config_file", "saving_loading_failed_to_read_config_file",
generate_translation_hashmap(vec![("path", config_file.display().to_string())]) generate_translation_hashmap(vec![("path", config_file.display().to_string())])
), ),
); );
}
return None;
} }
return None;
let config_file_handler = match File::open(&config_file) {
Ok(t) => t,
Err(e) => {
add_text_to_text_view(
text_view_errors,
&flg!(
"saving_loading_failed_to_create_config_file",
generate_translation_hashmap(vec![("path", config_file.display().to_string()), ("reason", e.to_string())])
),
);
return None;
}
};
return Some((config_file_handler, config_file));
} }
} else {
add_text_to_text_view(text_view_errors, flg!("saving_loading_failed_to_get_home_directory").as_str()); let config_file_handler = match File::open(&config_file) {
Ok(t) => t,
Err(e) => {
add_text_to_text_view(
text_view_errors,
&flg!(
"saving_loading_failed_to_create_config_file",
generate_translation_hashmap(vec![("path", config_file.display().to_string()), ("reason", e.to_string())])
),
);
return None;
}
};
return Some((config_file_handler, config_file));
} }
add_text_to_text_view(text_view_errors, flg!("saving_loading_failed_to_get_home_directory").as_str());
None None
} }
@ -312,7 +310,7 @@ impl LoadSaveStruct {
return; return;
} }
let mut header: String = "".to_string(); let mut header: String = String::new();
let lines: Vec<String> = loaded_data.replace('\r', "").split('\n').map(String::from).collect::<Vec<String>>(); let lines: Vec<String> = loaded_data.replace('\r', "").split('\n').map(String::from).collect::<Vec<String>>();
for (index, line) in lines.iter().enumerate() { for (index, line) in lines.iter().enumerate() {
let line = line.trim(); let line = line.trim();
@ -525,175 +523,175 @@ pub fn save_configuration(manual_execution: bool, upper_notebook: &GuiUpperNoteb
&upper_notebook.tree_view_excluded_directories.clone(), &upper_notebook.tree_view_excluded_directories.clone(),
ColumnsExcludedDirectory::Path as i32, ColumnsExcludedDirectory::Path as i32,
); );
saving_struct.save_var(hashmap_ls.get(&LoadText::ExcludedItems).unwrap().to_string(), upper_notebook.entry_excluded_items.text()); saving_struct.save_var(hashmap_ls.get(&LoadText::ExcludedItems).unwrap().to_string(), &upper_notebook.entry_excluded_items.text());
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::AllowedExtensions).unwrap().to_string(), hashmap_ls.get(&LoadText::AllowedExtensions).unwrap().to_string(),
upper_notebook.entry_allowed_extensions.text(), &upper_notebook.entry_allowed_extensions.text(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::MinimalFileSize).unwrap().to_string(), hashmap_ls.get(&LoadText::MinimalFileSize).unwrap().to_string(),
upper_notebook.entry_general_minimal_size.text(), &upper_notebook.entry_general_minimal_size.text(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::MaximalFileSize).unwrap().to_string(), hashmap_ls.get(&LoadText::MaximalFileSize).unwrap().to_string(),
upper_notebook.entry_general_maximal_size.text(), &upper_notebook.entry_general_maximal_size.text(),
); );
// Check buttons // Check buttons
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::SaveAtExit).unwrap().to_string(), hashmap_ls.get(&LoadText::SaveAtExit).unwrap().to_string(),
settings.check_button_settings_save_at_exit.is_active(), &settings.check_button_settings_save_at_exit.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::LoadAtStart).unwrap().to_string(), hashmap_ls.get(&LoadText::LoadAtStart).unwrap().to_string(),
settings.check_button_settings_load_at_start.is_active(), &settings.check_button_settings_load_at_start.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ConfirmDeletionFiles).unwrap().to_string(), hashmap_ls.get(&LoadText::ConfirmDeletionFiles).unwrap().to_string(),
settings.check_button_settings_confirm_deletion.is_active(), &settings.check_button_settings_confirm_deletion.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ConfirmDeletionAllFilesInGroup).unwrap().to_string(), hashmap_ls.get(&LoadText::ConfirmDeletionAllFilesInGroup).unwrap().to_string(),
settings.check_button_settings_confirm_group_deletion.is_active(), &settings.check_button_settings_confirm_group_deletion.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ImagePreviewImage).unwrap().to_string(), hashmap_ls.get(&LoadText::ImagePreviewImage).unwrap().to_string(),
settings.check_button_settings_show_preview_similar_images.is_active(), &settings.check_button_settings_show_preview_similar_images.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::DuplicatePreviewImage).unwrap().to_string(), hashmap_ls.get(&LoadText::DuplicatePreviewImage).unwrap().to_string(),
settings.check_button_settings_show_preview_duplicates.is_active(), &settings.check_button_settings_show_preview_duplicates.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::HideHardLinks).unwrap().to_string(), hashmap_ls.get(&LoadText::HideHardLinks).unwrap().to_string(),
settings.check_button_settings_hide_hard_links.is_active(), &settings.check_button_settings_hide_hard_links.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::UseCache).unwrap().to_string(), hashmap_ls.get(&LoadText::UseCache).unwrap().to_string(),
settings.check_button_settings_use_cache.is_active(), &settings.check_button_settings_use_cache.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::UseJsonCacheFile).unwrap().to_string(), hashmap_ls.get(&LoadText::UseJsonCacheFile).unwrap().to_string(),
settings.check_button_settings_save_also_json.is_active(), &settings.check_button_settings_save_also_json.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::DeleteToTrash).unwrap().to_string(), hashmap_ls.get(&LoadText::DeleteToTrash).unwrap().to_string(),
settings.check_button_settings_use_trash.is_active(), &settings.check_button_settings_use_trash.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ImageDeleteOutdatedCacheEntries).unwrap().to_string(), hashmap_ls.get(&LoadText::ImageDeleteOutdatedCacheEntries).unwrap().to_string(),
settings.check_button_settings_similar_images_delete_outdated_cache.is_active(), &settings.check_button_settings_similar_images_delete_outdated_cache.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::DuplicateDeleteOutdatedCacheEntries).unwrap().to_string(), hashmap_ls.get(&LoadText::DuplicateDeleteOutdatedCacheEntries).unwrap().to_string(),
settings.check_button_settings_duplicates_delete_outdated_cache.is_active(), &settings.check_button_settings_duplicates_delete_outdated_cache.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::VideoDeleteOutdatedCacheEntries).unwrap().to_string(), hashmap_ls.get(&LoadText::VideoDeleteOutdatedCacheEntries).unwrap().to_string(),
settings.check_button_settings_similar_videos_delete_outdated_cache.is_active(), &settings.check_button_settings_similar_videos_delete_outdated_cache.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::UsePrehashCache).unwrap().to_string(), hashmap_ls.get(&LoadText::UsePrehashCache).unwrap().to_string(),
settings.check_button_duplicates_use_prehash_cache.is_active(), &settings.check_button_duplicates_use_prehash_cache.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ShowBottomTextPanel).unwrap().to_string(), hashmap_ls.get(&LoadText::ShowBottomTextPanel).unwrap().to_string(),
settings.check_button_settings_show_text_view.is_active(), &settings.check_button_settings_show_text_view.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::GeneralIgnoreOtherFilesystems).unwrap().to_string(), hashmap_ls.get(&LoadText::GeneralIgnoreOtherFilesystems).unwrap().to_string(),
settings.check_button_settings_one_filesystem.is_active(), &settings.check_button_settings_one_filesystem.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::BrokenFilesArchive).unwrap().to_string(), hashmap_ls.get(&LoadText::BrokenFilesArchive).unwrap().to_string(),
main_notebook.check_button_broken_files_archive.is_active(), &main_notebook.check_button_broken_files_archive.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::BrokenFilesImage).unwrap().to_string(), hashmap_ls.get(&LoadText::BrokenFilesImage).unwrap().to_string(),
main_notebook.check_button_broken_files_image.is_active(), &main_notebook.check_button_broken_files_image.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::BrokenFilesAudio).unwrap().to_string(), hashmap_ls.get(&LoadText::BrokenFilesAudio).unwrap().to_string(),
main_notebook.check_button_broken_files_audio.is_active(), &main_notebook.check_button_broken_files_audio.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::BrokenFilesPdf).unwrap().to_string(), hashmap_ls.get(&LoadText::BrokenFilesPdf).unwrap().to_string(),
main_notebook.check_button_broken_files_pdf.is_active(), &main_notebook.check_button_broken_files_pdf.is_active(),
); );
// Others // Others
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ThreadNumber).unwrap().to_string(), hashmap_ls.get(&LoadText::ThreadNumber).unwrap().to_string(),
settings.scale_settings_number_of_threads.value().round(), &settings.scale_settings_number_of_threads.value().round(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::MinimalCacheSize).unwrap().to_string(), hashmap_ls.get(&LoadText::MinimalCacheSize).unwrap().to_string(),
settings.entry_settings_cache_file_minimal_size.text(), &settings.entry_settings_cache_file_minimal_size.text(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::MinimalPrehashCacheSize).unwrap().to_string(), hashmap_ls.get(&LoadText::MinimalPrehashCacheSize).unwrap().to_string(),
settings.entry_settings_prehash_cache_file_minimal_size.text(), &settings.entry_settings_prehash_cache_file_minimal_size.text(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::Language).unwrap().to_string(), hashmap_ls.get(&LoadText::Language).unwrap().to_string(),
get_language_from_combo_box_text(settings.combo_box_settings_language.active_text().unwrap().to_string()).short_text, &get_language_from_combo_box_text(&settings.combo_box_settings_language.active_text().unwrap()).short_text,
); );
// Comboboxes main notebook // Comboboxes main notebook
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ComboBoxDuplicateHashType).unwrap().to_string(), hashmap_ls.get(&LoadText::ComboBoxDuplicateHashType).unwrap().to_string(),
main_notebook.combo_box_duplicate_hash_type.active().unwrap_or(0), &main_notebook.combo_box_duplicate_hash_type.active().unwrap_or(0),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ComboBoxDuplicateCheckMethod).unwrap().to_string(), hashmap_ls.get(&LoadText::ComboBoxDuplicateCheckMethod).unwrap().to_string(),
main_notebook.combo_box_duplicate_check_method.active().unwrap_or(0), &main_notebook.combo_box_duplicate_check_method.active().unwrap_or(0),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ComboBoxImageResizeAlgorithm).unwrap().to_string(), hashmap_ls.get(&LoadText::ComboBoxImageResizeAlgorithm).unwrap().to_string(),
main_notebook.combo_box_image_resize_algorithm.active().unwrap_or(0), &main_notebook.combo_box_image_resize_algorithm.active().unwrap_or(0),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ComboBoxImageHashType).unwrap().to_string(), hashmap_ls.get(&LoadText::ComboBoxImageHashType).unwrap().to_string(),
main_notebook.combo_box_image_hash_algorithm.active().unwrap_or(0), &main_notebook.combo_box_image_hash_algorithm.active().unwrap_or(0),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ComboBoxImageHashSize).unwrap().to_string(), hashmap_ls.get(&LoadText::ComboBoxImageHashSize).unwrap().to_string(),
main_notebook.combo_box_image_hash_size.active().unwrap_or(0), &main_notebook.combo_box_image_hash_size.active().unwrap_or(0),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::ComboBoxBigFiles).unwrap().to_string(), hashmap_ls.get(&LoadText::ComboBoxBigFiles).unwrap().to_string(),
main_notebook.combo_box_big_files_mode.active().unwrap_or(0), &main_notebook.combo_box_big_files_mode.active().unwrap_or(0),
); );
// Other2 // Other2
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::DuplicateNameCaseSensitive).unwrap().to_string(), hashmap_ls.get(&LoadText::DuplicateNameCaseSensitive).unwrap().to_string(),
main_notebook.check_button_duplicate_case_sensitive_name.is_active(), &main_notebook.check_button_duplicate_case_sensitive_name.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::NumberOfBiggestFiles).unwrap().to_string(), hashmap_ls.get(&LoadText::NumberOfBiggestFiles).unwrap().to_string(),
main_notebook.entry_big_files_number.text(), &main_notebook.entry_big_files_number.text(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::SimilarImagesSimilarity).unwrap().to_string(), hashmap_ls.get(&LoadText::SimilarImagesSimilarity).unwrap().to_string(),
main_notebook.scale_similarity_similar_images.value(), &main_notebook.scale_similarity_similar_images.value(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::SimilarImagesIgnoreSameSize).unwrap().to_string(), hashmap_ls.get(&LoadText::SimilarImagesIgnoreSameSize).unwrap().to_string(),
main_notebook.check_button_image_ignore_same_size.is_active(), &main_notebook.check_button_image_ignore_same_size.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::SimilarVideosSimilarity).unwrap().to_string(), hashmap_ls.get(&LoadText::SimilarVideosSimilarity).unwrap().to_string(),
main_notebook.scale_similarity_similar_videos.value(), &main_notebook.scale_similarity_similar_videos.value(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::SimilarVideosIgnoreSameSize).unwrap().to_string(), hashmap_ls.get(&LoadText::SimilarVideosIgnoreSameSize).unwrap().to_string(),
main_notebook.check_button_video_ignore_same_size.is_active(), &main_notebook.check_button_video_ignore_same_size.is_active(),
); );
saving_struct.save_var( saving_struct.save_var(
hashmap_ls.get(&LoadText::MusicApproximateComparison).unwrap().to_string(), hashmap_ls.get(&LoadText::MusicApproximateComparison).unwrap().to_string(),
main_notebook.check_button_music_approximate_comparison.is_active(), &main_notebook.check_button_music_approximate_comparison.is_active(),
); );
saving_struct.save_to_file(&text_view_errors); saving_struct.save_to_file(&text_view_errors);
@ -706,7 +704,7 @@ pub fn load_configuration(
settings: &GuiSettings, settings: &GuiSettings,
text_view_errors: &TextView, text_view_errors: &TextView,
scrolled_window_errors: &ScrolledWindow, scrolled_window_errors: &ScrolledWindow,
arguments: Vec<OsString>, arguments: &[OsString],
) { ) {
let text_view_errors = text_view_errors.clone(); let text_view_errors = text_view_errors.clone();
@ -716,7 +714,7 @@ pub fn load_configuration(
loaded_entries.open_and_read_content(&text_view_errors, manual_execution); loaded_entries.open_and_read_content(&text_view_errors, manual_execution);
// Load here language, default system language could change value in settings so we don't want to lose this value // Load here language, default system language could change value in settings so we don't want to lose this value
let short_language = get_language_from_combo_box_text(settings.combo_box_settings_language.active_text().unwrap().to_string()) let short_language = get_language_from_combo_box_text(&settings.combo_box_settings_language.active_text().unwrap())
.short_text .short_text
.to_string(); .to_string();
@ -726,13 +724,13 @@ pub fn load_configuration(
// Loading data from hashmaps // Loading data from hashmaps
let (hashmap_ls, _hashmap_sl) = create_hash_map(); let (hashmap_ls, _hashmap_sl) = create_hash_map();
let mut included_directories: Vec<String> = loaded_entries.get_vector_string(hashmap_ls.get(&LoadText::IncludedDirectories).unwrap().clone(), included_directories); let mut included_directories: Vec<String> = loaded_entries.get_vector_string(hashmap_ls.get(&LoadText::IncludedDirectories).unwrap(), included_directories);
let mut excluded_directories: Vec<String> = loaded_entries.get_vector_string(hashmap_ls.get(&LoadText::ExcludedDirectories).unwrap().clone(), excluded_directories); let mut excluded_directories: Vec<String> = loaded_entries.get_vector_string(hashmap_ls.get(&LoadText::ExcludedDirectories).unwrap(), excluded_directories);
let excluded_items: String = loaded_entries.get_string( let excluded_items: String = loaded_entries.get_string(
hashmap_ls.get(&LoadText::ExcludedItems).unwrap().clone(), hashmap_ls.get(&LoadText::ExcludedItems).unwrap().clone(),
upper_notebook.entry_excluded_items.text().to_string(), upper_notebook.entry_excluded_items.text().to_string(),
); );
let allowed_extensions: String = loaded_entries.get_string(hashmap_ls.get(&LoadText::AllowedExtensions).unwrap().clone(), "".to_string()); let allowed_extensions: String = loaded_entries.get_string(hashmap_ls.get(&LoadText::AllowedExtensions).unwrap().clone(), String::new());
let minimal_file_size: String = loaded_entries.get_integer_string(hashmap_ls.get(&LoadText::MinimalFileSize).unwrap().clone(), DEFAULT_MINIMAL_FILE_SIZE.to_string()); let minimal_file_size: String = loaded_entries.get_integer_string(hashmap_ls.get(&LoadText::MinimalFileSize).unwrap().clone(), DEFAULT_MINIMAL_FILE_SIZE.to_string());
let maximal_file_size: String = loaded_entries.get_integer_string(hashmap_ls.get(&LoadText::MaximalFileSize).unwrap().clone(), DEFAULT_MAXIMAL_FILE_SIZE.to_string()); let maximal_file_size: String = loaded_entries.get_integer_string(hashmap_ls.get(&LoadText::MaximalFileSize).unwrap().clone(), DEFAULT_MAXIMAL_FILE_SIZE.to_string());
@ -999,7 +997,7 @@ pub fn reset_configuration(manual_clearing: bool, upper_notebook: &GuiUpperNoteb
add_text_to_text_view(&text_view_errors, "Failed to read current directory, setting C:\\ instead"); add_text_to_text_view(&text_view_errors, "Failed to read current directory, setting C:\\ instead");
"C:\\".to_string() "C:\\".to_string()
} else { } else {
"".to_string() String::new()
} }
} }
}; };

1
czkawka_gui/src/taskbar_progress_dummy.rs
Unescape Escape View File

@ -1,4 +1,5 @@
#![allow(clippy::upper_case_acronyms)] #![allow(clippy::upper_case_acronyms)]
#![allow(clippy::needless_pass_by_value)]
#![cfg(not(target_os = "windows"))] #![cfg(not(target_os = "windows"))]
use std::convert::From; use std::convert::From;

Write Preview
Loading…
Cancel
Save