diff --git a/Cargo.lock b/Cargo.lock index 41e00a5..971eb1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,9 +59,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -170,16 +170,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "895adc16c8b3273fbbc32685a7d55227705eda08c01e77704020f3491924b44b" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", - "constant_time_eq", - "digest 0.10.5", + "constant_time_eq 0.2.4", + "digest 0.10.6", ] [[package]] @@ -230,9 +230,9 @@ checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "bytemuck" -version = "1.12.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" +checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" [[package]] name = "byteorder" @@ -263,9 +263,9 @@ dependencies = [ [[package]] name = "cairo-rs" -version = "0.16.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9ee4a4ca9239c9a839453dce04b7ddee2f859ec4cd7acd1f5703b68db549c" +checksum = "247e1183fa769ac22121f92276dae52f89acaf297f24b1320019f439b6e3b46f" dependencies = [ "bitflags", "cairo-sys-rs", @@ -277,9 +277,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5119ea655ec777b523f0b57279e70f8a4542f61b0e98a48f892b4ef043fd4c5d" +checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" dependencies = [ "glib-sys", "libc", @@ -288,9 +288,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cfb" @@ -320,9 +320,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ "iana-time-zone", "js-sys", @@ -353,9 +353,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.22" +version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ "atty", "bitflags", @@ -412,6 +412,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "constant_time_eq" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" + [[package]] name = "core-foundation-sys" version = "0.8.3" @@ -459,22 +465,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.7.1", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", ] @@ -497,9 +503,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.80" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" +checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" dependencies = [ "cc", "cxxbridge-flags", @@ -509,9 +515,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.80" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" +checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" dependencies = [ "cc", "codespan-reporting", @@ -524,15 +530,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.80" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" +checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" [[package]] name = "cxxbridge-macro" -version = "1.0.80" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" +checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" dependencies = [ "proc-macro2", "quote", @@ -647,9 +653,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", "crypto-common", @@ -784,7 +790,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" dependencies = [ - "memoffset", + "memoffset 0.6.5", "rustc_version 0.3.3", ] @@ -976,9 +982,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fb526c8c3a075eda15f961820edf3e15fe18576ac4fbabbb324e4cc6c421e6" +checksum = "0ba3e42776d1466938add08211734738d5c76e863a25b7a8064c4433a74a1a26" dependencies = [ "bitflags", "gdk-pixbuf-sys", @@ -989,9 +995,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df12d15c10c3c5a84d9fb4ba0e27659f6a2bdee4f27f8b17126da15d5ddd3f2" +checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" dependencies = [ "gio-sys", "glib-sys", @@ -1002,9 +1008,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fe07f362c977c4684d1136a29f097208b3ccb2013ab6f441a3c60a046fd358" +checksum = "dc7fc4b05be1159056c57a08102ea494892f75ff8517f5518b0401e466f77c69" dependencies = [ "bitflags", "cairo-rs", @@ -1018,9 +1024,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcf9e3ab5f237bb641e7f2fccc4b26d5b86f111f0d62e27d452dc24964541c2" +checksum = "c057b794185a52862037526fb95aafabce9427fb98a7e9f5fe39a6f832c92822" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1068,9 +1074,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3025f17aab38ebbb40d785806cf36c292c4dd6755b05584fc52d34fb87533263" +checksum = "1d4a17d999e6e4e05d87c2bb05b7140d47769bc53211711a33e2f91536458714" dependencies = [ "bitflags", "futures-channel", @@ -1088,9 +1094,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da1bba9d3f2ab13a6e9932c40f240dc99ebc9f0bdc35cfb130d1a3df36f374c" +checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" dependencies = [ "glib-sys", "gobject-sys", @@ -1101,9 +1107,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.16.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079d580b26ee5eb504942bd4340a1218323a4cf19a31d776d62cd3a2a8416622" +checksum = "50feee2f1e73be50e6634c901bfced69a0937c5e4e4673067ade85e093fa9bd7" dependencies = [ "bitflags", "futures-channel", @@ -1123,9 +1129,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e195c1311fa6b04d7b896ea39385f6bd60ef5d25bf74a7c11c8c3f94f6c1a572" +checksum = "e084807350b01348b6d9dbabb724d1a0bb987f47a2c85de200e98e12e30733bf" dependencies = [ "anyhow", "heck", @@ -1138,9 +1144,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b33357bb421a77bd849f6a0bfcaf3b4b256a2577802971bb5dd522d530f27021" +checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" dependencies = [ "libc", "system-deps", @@ -1154,9 +1160,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "gobject-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ca11a57400f3d4fda594e002844be47900c9fb8b29e2155c6e37a1f24e51b3" +checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" dependencies = [ "glib-sys", "libc", @@ -1165,9 +1171,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a8de4506a64776d90fedf9c28fdca5a7127f8cc9c78976e8184ac6f42685d8" +checksum = "95ecb4d347e6d09820df3bdfd89a74a8eec07753a06bb92a3aac3ad31d04447b" dependencies = [ "glib", "graphene-sys", @@ -1176,9 +1182,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c952f764f02f8546fcc5d014bc78aa704c6d453c828c8b429121f704349163" +checksum = "b9aa82337d3972b4eafdea71e607c23f47be6f27f749aab613f1ad8ddbe6dcd6" dependencies = [ "glib-sys", "libc", @@ -1188,9 +1194,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc2b86c751a7fe9aad0fdba85937a6aace3a8453e0e2a08d2a31ce4bb8ae55" +checksum = "5dcd01e485189515263f6d3ac8a624b1c0cd13c1097991e72d0cc0c145a303c0" dependencies = [ "bitflags", "cairo-rs", @@ -1204,9 +1210,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb53e25cbbe3fa8e3e9db7c06d65085086fadbec4cd0aa567b2e2a4917db83d" +checksum = "f47c49111e33020615a6c6b78d755c8b54b8504143cae1bf972bccc03eaa3f59" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1220,9 +1226,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954e5a318221d69301c80f71cc2d2c15d0d4e259b1b253cad762e93f251bf6d6" +checksum = "b4c61a704ecdedd1c0ca66ff0184bd19e9c488835bb391655bfe6b60f6e2e43e" dependencies = [ "bitflags", "cairo-rs", @@ -1243,9 +1249,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5eb86364b216ee8c497b1121831168fb25130d3378495a135f8e5c1972db7b" +checksum = "42f57e7025a8bae8429e07aeeae9c4c3fef5d7cd14834afdd6d6d23f76984246" dependencies = [ "anyhow", "proc-macro-crate", @@ -1257,9 +1263,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f04bd0b63d999a36ae53a916ee4b20ea64a3ef4732ca8a98b1fde4a22c1476c" +checksum = "42e1bb57be47aac6ce77b5281ad64389a19db5aba6db75b07f0049571ad6fe0f" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1316,14 +1322,14 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] name = "humansize" -version = "2.1.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a866837516f34ad34fb221f3ee01fd0db75f2c2f6abeda2047dc6963fb04ad9a" +checksum = "4e682e2bd70ecbcce5209f11a992a4ba001fea8e60acf7860ce007629e6d2756" dependencies = [ "libm", ] @@ -1399,9 +1405,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.51" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1433,16 +1439,16 @@ dependencies = [ [[package]] name = "image" -version = "0.24.4" +version = "0.24.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c" +checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" dependencies = [ "bytemuck", "byteorder", "color_quant", "exr", "gif", - "jpeg-decoder 0.2.6", + "jpeg-decoder 0.3.0", "num-rational", "num-traits", "png", @@ -1452,13 +1458,13 @@ dependencies = [ [[package]] name = "image_hasher" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1aad94da0114c78349f67aba9654aa9fab457336bd045010701c228614ca9a2" +checksum = "ea0369096d76c8fe2d3d2a59d1720743a5caf44787e9a6348ef380484fe1ea46" dependencies = [ "base64 0.20.0-alpha.1", "image", - "rustdct 0.7.0", + "rustdct 0.7.1", "serde", "transpose", ] @@ -1485,9 +1491,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", @@ -1495,9 +1501,9 @@ dependencies = [ [[package]] name = "infer" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a" +checksum = "0a6c16b11a665b26aeeb9b1d7f954cdeb034be38dd00adab4f2ae921a8fee804" dependencies = [ "cfb", ] @@ -1562,9 +1568,9 @@ checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" [[package]] name = "jpeg-decoder" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" dependencies = [ "rayon", ] @@ -1592,9 +1598,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.135" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libheif-rs" @@ -1617,9 +1623,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "link-cplusplus" @@ -1661,15 +1667,16 @@ dependencies = [ [[package]] name = "lofty" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "863330a778316906983c07e225026b643b170502a96709dbfe6e6168bce53084" +checksum = "8242df2d720c7f2e23bb7829da4447e5a762ccf0a361a01efe1433f554a48400" dependencies = [ "base64 0.13.1", "byteorder", "cfg-if", "flate2", "lofty_attr", + "log", "ogg_pager", "once_cell", "paste", @@ -1677,9 +1684,9 @@ dependencies = [ [[package]] name = "lofty_attr" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d906642cda9ed88dfb98ece66d113c5dd73c490da5d11ba4554bf75d78383f8" +checksum = "3d0d19de3efdb768ecdccb6e904eb4c089ee9c1b59684d09218802e16cae8cc7" dependencies = [ "proc-macro2", "quote", @@ -1725,6 +1732,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.16" @@ -1827,23 +1843,14 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ "hermit-abi", "libc", ] -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - [[package]] name = "objc" version = "0.2.7" @@ -1884,9 +1891,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "opaque-debug" @@ -1896,12 +1903,12 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open" -version = "3.0.3" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a3100141f1733ea40b53381b0ae3117330735ef22309a190ac57b9576ea716" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" dependencies = [ "pathdiff", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] @@ -1912,15 +1919,15 @@ checksum = "91409674c628d07a6b4b79cc877c6b63ba5ccbfbadddd77ca822f55069ed1bd4" [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "pango" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7208c60f224cf6e44c551df5ee2ef38f9da0fd29d7c5a0402000b8ab0520e798" +checksum = "f6a83cd4015382dbb0f4fcf3ab7b277d4885711a62b2f2c1e6582a120094edad" dependencies = [ "bitflags", "gio", @@ -1932,9 +1939,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922441c228366ed98d3534b87bc7c987c50564094c3abbc3513717786419252d" +checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" dependencies = [ "glib-sys", "gobject-sys", @@ -1962,7 +1969,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -1994,7 +2001,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "hmac", "password-hash", "sha2 0.10.6", @@ -2047,9 +2054,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" +checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8" dependencies = [ "thiserror", "ucd-trie", @@ -2089,27 +2096,27 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "png" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c" +checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" dependencies = [ "bitflags", "crc32fast", "flate2", - "miniz_oxide 0.5.4", + "miniz_oxide 0.6.2", ] [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "primal-check" @@ -2220,11 +2227,10 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" dependencies = [ - "autocfg", "crossbeam-deque", "either", "rayon-core", @@ -2232,9 +2238,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -2264,9 +2270,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -2275,9 +2281,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "remove_dir_all" @@ -2357,11 +2363,11 @@ dependencies = [ [[package]] name = "rustdct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620247053ace0eddd3e607c66423537e45c3ae36008e6d6fac1552f51ea1a63a" +checksum = "8b61555105d6a9bf98797c063c362a1d24ed8ab0431655e38f1cf51e52089551" dependencies = [ - "rustfft 6.0.1", + "rustfft 6.1.0", ] [[package]] @@ -2380,9 +2386,9 @@ dependencies = [ [[package]] name = "rustfft" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d089e5c57521629a59f5f39bca7434849ff89bd6873b521afe389c1c602543" +checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" dependencies = [ "num-complex 0.4.2", "num-integer", @@ -2390,6 +2396,7 @@ dependencies = [ "primal-check", "strength_reduce", "transpose", + "version_check", ] [[package]] @@ -2477,9 +2484,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ "itoa", "ryu", @@ -2506,7 +2513,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -2530,7 +2537,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -2580,9 +2587,9 @@ dependencies = [ [[package]] name = "strength_reduce" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ff2f71c82567c565ba4b3009a9350a96a7269eaa4001ebedae926230bc2254" +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" [[package]] name = "stringprep" @@ -2827,9 +2834,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" @@ -2862,12 +2869,12 @@ dependencies = [ [[package]] name = "tiff" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259662e32d1e219321eb309d5f9d898b779769d81b76e762c07c8e5d38fcb65" +checksum = "f17def29300a156c19ae30814710d9c63cd50288a49c6fd3a10ccfbe4cf886fd" dependencies = [ "flate2", - "jpeg-decoder 0.2.6", + "jpeg-decoder 0.3.0", "weezl", ] @@ -2884,21 +2891,30 @@ dependencies = [ [[package]] name = "time" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ "itoa", - "libc", - "num_threads", + "serde", + "time-core", "time-macros", ] [[package]] -name = "time-macros" -version = "0.2.4" +name = "time-core" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] [[package]] name = "tinystr" @@ -2935,9 +2951,9 @@ dependencies = [ [[package]] name = "transpose" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f9c900aa98b6ea43aee227fd680550cdec726526aab8ac801549eadb25e39f" +checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" dependencies = [ "num-integer", "strength_reduce", @@ -3054,15 +3070,15 @@ dependencies = [ [[package]] name = "uuid" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" [[package]] name = "version-compare" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] name = "version_check" @@ -3214,19 +3230,6 @@ dependencies = [ "windows_x86_64_msvc 0.37.0", ] -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.42.0" @@ -3248,12 +3251,6 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.37.0" @@ -3266,12 +3263,6 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.37.0" @@ -3284,12 +3275,6 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.37.0" @@ -3302,12 +3287,6 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.37.0" @@ -3326,12 +3305,6 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.37.0" @@ -3368,12 +3341,12 @@ dependencies = [ "aes 0.7.5", "byteorder", "bzip2", - "constant_time_eq", + "constant_time_eq 0.1.5", "crc32fast", "crossbeam-utils", "flate2", "hmac", "pbkdf2", "sha1", - "time 0.3.15", + "time 0.3.17", ] diff --git a/czkawka_cli/Cargo.toml b/czkawka_cli/Cargo.toml index 7f62cde..9e3f90c 100644 --- a/czkawka_cli/Cargo.toml +++ b/czkawka_cli/Cargo.toml @@ -10,10 +10,10 @@ homepage = "https://github.com/qarmin/czkawka" repository = "https://github.com/qarmin/czkawka" [dependencies] -clap = { version = "3.2.22", features = ["derive"] } +clap = { version = "3.2.23", features = ["derive"] } # For enum types -image_hasher = "1.1.0" +image_hasher = "1.1.1" [dependencies.czkawka_core] path = "../czkawka_core" diff --git a/czkawka_core/Cargo.toml b/czkawka_core/Cargo.toml index f1a6c0c..72d0f83 100644 --- a/czkawka_core/Cargo.toml +++ b/czkawka_core/Cargo.toml @@ -11,22 +11,22 @@ repository = "https://github.com/qarmin/czkawka" [dependencies] -humansize = "2.1.0" -rayon = "1.5.3" +humansize = "2.1.2" +rayon = "1.6.0" crossbeam-channel = "0.5.6" # For saving/loading config files to specific directories directories-next = "2.0.0" # Needed by similar images -image_hasher = "1.1.0" +image_hasher = "1.1.1" bk-tree = "0.4.0" -image = "0.24.4" +image = "0.24.5" hamming = "0.1.3" # Needed by same music bitflags = "1.3.2" -lofty = "0.8.1" +lofty = "0.9.0" # Futures - needed by async progress sender futures = "0.3.25" @@ -37,7 +37,7 @@ audio_checker = "0.1.0" pdf = "0.7.2" # Hashes for duplicate files -blake3 = "1.3.1" +blake3 = "1.3.2" crc32fast = "1.3.2" xxhash-rust = { version = "0.8.6", features = ["xxh3"] } @@ -50,13 +50,13 @@ ffmpeg_cmdline_utils = "0.1.2" # Saving/Loading Cache serde = "1.0.147" bincode = "1.3.3" -serde_json = "1.0.87" +serde_json = "1.0.89" # Language i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] } i18n-embed-fl = "0.6.4" rust-embed = "6.4.2" -once_cell = "1.15.0" +once_cell = "1.16.0" # Raw image files rawloader = "0.37.1" @@ -64,9 +64,9 @@ imagepipe = "0.5.0" # Checking for invalid extensions mime_guess = "2.0.4" -infer = "0.9.0" +infer = "0.11.0" -num_cpus = "1.13.1" +num_cpus = "1.14.0" # Heif/Heic libheif-rs = { version = "0.15.1", optional = true } diff --git a/czkawka_core/src/bad_extensions.rs b/czkawka_core/src/bad_extensions.rs index 41e44c9..6f833c0 100644 --- a/czkawka_core/src/bad_extensions.rs +++ b/czkawka_core/src/bad_extensions.rs @@ -333,7 +333,7 @@ impl BadExtensions { checking_method: CheckingMethod::None, current_stage: 1, max_stage: 1, - entries_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + entries_checked: atomic_file_counter.load(Ordering::Relaxed), entries_to_check, }) .unwrap(); diff --git a/czkawka_core/src/big_file.rs b/czkawka_core/src/big_file.rs index a5aa252..e6fd3d5 100644 --- a/czkawka_core/src/big_file.rs +++ b/czkawka_core/src/big_file.rs @@ -192,7 +192,7 @@ impl BigFile { let mut warnings = vec![]; let mut fe_result = vec![]; // Read current dir children - let read_dir = match fs::read_dir(¤t_folder) { + let read_dir = match fs::read_dir(current_folder) { Ok(t) => t, Err(e) => { warnings.push(flc!( diff --git a/czkawka_core/src/broken_files.rs b/czkawka_core/src/broken_files.rs index 033360d..7e556f9 100644 --- a/czkawka_core/src/broken_files.rs +++ b/czkawka_core/src/broken_files.rs @@ -212,7 +212,7 @@ impl BrokenFiles { .unbounded_send(ProgressData { current_stage: 0, max_stage: 1, - files_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + files_checked: atomic_file_counter.load(Ordering::Relaxed), files_to_check: 0, }) .unwrap(); @@ -241,7 +241,7 @@ impl BrokenFiles { let mut warnings = vec![]; let mut fe_result = vec![]; // Read current dir children - let read_dir = match fs::read_dir(¤t_folder) { + let read_dir = match fs::read_dir(current_folder) { Ok(t) => t, Err(e) => { warnings.push(flc!( @@ -436,7 +436,7 @@ impl BrokenFiles { .unbounded_send(ProgressData { current_stage: 1, max_stage: 1, - files_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + files_checked: atomic_file_counter.load(Ordering::Relaxed), files_to_check, }) .unwrap(); diff --git a/czkawka_core/src/common.rs b/czkawka_core/src/common.rs index dd755f9..5593d0c 100644 --- a/czkawka_core/src/common.rs +++ b/czkawka_core/src/common.rs @@ -189,10 +189,10 @@ impl Common { for entry in entries { path = Path::new(entry); if path.is_dir() { - if let Err(e) = fs::remove_dir_all(&entry) { + if let Err(e) = fs::remove_dir_all(entry) { warnings.push(format!("Failed to remove folder {}, reason {}", entry, e)); } - } else if let Err(e) = fs::remove_file(&entry) { + } else if let Err(e) = fs::remove_file(entry) { warnings.push(format!("Failed to remove file {}, reason {}", entry, e)); } } @@ -202,10 +202,10 @@ impl Common { let path: &Path = Path::new(entry); let mut warning: String = String::from(""); 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 {}, reason {}", entry, 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 {}, reason {}", entry, e) } warning @@ -241,7 +241,7 @@ impl Common { let mut position_of_splits: Vec = Vec::new(); // `git*` shouldn't be true for `/gitsfafasfs` - if !expression.starts_with('*') && directory.find(&splits[0]).unwrap() > 0 { + if !expression.starts_with('*') && directory.find(splits[0]).unwrap() > 0 { return false; } // `*home` shouldn't be true for `/homeowner` @@ -250,7 +250,7 @@ impl Common { } // At the end we check if parts between * are correctly positioned - position_of_splits.push(directory.find(&splits[0]).unwrap()); + position_of_splits.push(directory.find(splits[0]).unwrap()); let mut current_index: usize; let mut found_index: usize; for i in splits[1..].iter().enumerate() { diff --git a/czkawka_core/src/common_dir_traversal.rs b/czkawka_core/src/common_dir_traversal.rs index 01f341d..a284e2a 100644 --- a/czkawka_core/src/common_dir_traversal.rs +++ b/czkawka_core/src/common_dir_traversal.rs @@ -335,7 +335,7 @@ where checking_method, current_stage: 0, max_stage, - entries_checked: atomic_entry_counter.load(Ordering::Relaxed) as usize, + entries_checked: atomic_entry_counter.load(Ordering::Relaxed), entries_to_check: 0, }) .unwrap(); @@ -379,7 +379,7 @@ where let mut set_as_not_empty_folder_list = vec![]; let mut folder_entries_list = vec![]; // Read current dir children - let read_dir = match fs::read_dir(¤t_folder) { + let read_dir = match fs::read_dir(current_folder) { Ok(t) => t, Err(e) => { warnings.push(flc!( @@ -550,7 +550,7 @@ where (EntryType::File, Collect::EmptyFolders) | (EntryType::Symlink, Collect::EmptyFolders) => { #[cfg(target_family = "unix")] if directories.exclude_other_filesystems() { - match directories.is_on_other_filesystems(¤t_folder) { + match directories.is_on_other_filesystems(current_folder) { Ok(true) => continue 'dir, Err(e) => warnings.push(e.to_string()), _ => (), @@ -588,7 +588,7 @@ where #[cfg(target_family = "unix")] if directories.exclude_other_filesystems() { - match directories.is_on_other_filesystems(¤t_folder) { + match directories.is_on_other_filesystems(current_folder) { Ok(true) => continue 'dir, Err(e) => warnings.push(e.to_string()), _ => (), @@ -715,7 +715,7 @@ fn set_as_not_empty_folder(folder_entries: &mut BTreeMap, // Loop to recursively set as non empty this and all his parent folders loop { d.is_empty = FolderEmptiness::No; - if d.parent_path != None { + if d.parent_path.is_some() { let cf = d.parent_path.clone().unwrap(); d = folder_entries.get_mut(&cf).unwrap(); } else { diff --git a/czkawka_core/src/common_directory.rs b/czkawka_core/src/common_directory.rs index ac496f4..6784f27 100644 --- a/czkawka_core/src/common_directory.rs +++ b/czkawka_core/src/common_directory.rs @@ -279,7 +279,7 @@ impl Directories { { let mut ref_folders = Vec::new(); for folder in &self.reference_directories { - if self.included_directories.iter().any(|e| folder.starts_with(&e)) { + if self.included_directories.iter().any(|e| folder.starts_with(e)) { ref_folders.push(folder.clone()); } } diff --git a/czkawka_core/src/common_extensions.rs b/czkawka_core/src/common_extensions.rs index a9655bb..62cf03e 100644 --- a/czkawka_core/src/common_extensions.rs +++ b/czkawka_core/src/common_extensions.rs @@ -26,7 +26,7 @@ impl Extensions { let extensions: Vec = allowed_extensions.split(',').map(|e| e.trim()).map(String::from).collect(); for mut extension in extensions { - if extension.is_empty() || extension.replace('.', "").replace(' ', "").trim().is_empty() { + if extension.is_empty() || extension.replace(['.', ' '], "").trim().is_empty() { continue; } diff --git a/czkawka_core/src/duplicate.rs b/czkawka_core/src/duplicate.rs index 7d81f15..2ad78fe 100644 --- a/czkawka_core/src/duplicate.rs +++ b/czkawka_core/src/duplicate.rs @@ -358,7 +358,7 @@ impl DuplicateFinder { let mut files_from_referenced_folders = Vec::new(); let mut normal_files = Vec::new(); for file_entry in vec_file_entry { - if reference_directories.iter().any(|e| file_entry.path.starts_with(&e)) { + if reference_directories.iter().any(|e| file_entry.path.starts_with(e)) { files_from_referenced_folders.push(file_entry); } else { normal_files.push(file_entry); @@ -458,7 +458,7 @@ impl DuplicateFinder { let mut files_from_referenced_folders = Vec::new(); let mut normal_files = Vec::new(); for file_entry in vec_file_entry { - if reference_directories.iter().any(|e| file_entry.path.starts_with(&e)) { + if reference_directories.iter().any(|e| file_entry.path.starts_with(e)) { files_from_referenced_folders.push(file_entry); } else { normal_files.push(file_entry); @@ -528,7 +528,7 @@ impl DuplicateFinder { checking_method, current_stage: 1, max_stage: 2, - entries_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + entries_checked: atomic_file_counter.load(Ordering::Relaxed), entries_to_check: files_to_check, }) .unwrap(); @@ -679,7 +679,7 @@ impl DuplicateFinder { let progress_send = progress_sender.clone(); let progress_thread_run = progress_thread_run.clone(); let atomic_file_counter = atomic_file_counter.clone(); - let files_to_check = pre_checked_map.iter().map(|(_size, vec_file_entry)| vec_file_entry.len()).sum(); + let files_to_check = pre_checked_map.values().map(|vec_file_entry| vec_file_entry.len()).sum(); let checking_method = self.check_method; thread::spawn(move || loop { progress_send @@ -687,7 +687,7 @@ impl DuplicateFinder { checking_method, current_stage: 2, max_stage: 2, - entries_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + entries_checked: atomic_file_counter.load(Ordering::Relaxed), entries_to_check: files_to_check, }) .unwrap(); @@ -844,7 +844,7 @@ impl DuplicateFinder { let mut files_from_referenced_folders = Vec::new(); let mut normal_files = Vec::new(); for file_entry in vec_file_entry { - if reference_directories.iter().any(|e| file_entry.path.starts_with(&e)) { + if reference_directories.iter().any(|e| file_entry.path.starts_with(e)) { files_from_referenced_folders.push(file_entry); } else { normal_files.push(file_entry); diff --git a/czkawka_core/src/same_music.rs b/czkawka_core/src/same_music.rs index e4cfcd7..cd0dcd6 100644 --- a/czkawka_core/src/same_music.rs +++ b/czkawka_core/src/same_music.rs @@ -346,7 +346,7 @@ impl SameMusic { checking_method: CheckingMethod::None, current_stage: 1, max_stage: 2, - entries_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + entries_checked: atomic_file_counter.load(Ordering::Relaxed), entries_to_check: music_to_check, }) .unwrap(); @@ -376,7 +376,7 @@ impl SameMusic { }; let result = panic::catch_unwind(move || { - match read_from(&mut file, true) { + match read_from(&mut file) { Ok(t) => Some(t), Err(_inspected) => { // println!("Failed to open {}", path); @@ -522,7 +522,7 @@ impl SameMusic { checking_method: CheckingMethod::None, current_stage: 2, max_stage: 2, - entries_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + entries_checked: atomic_file_counter.load(Ordering::Relaxed), entries_to_check: music_to_check, }) .unwrap(); @@ -714,7 +714,7 @@ impl SameMusic { let mut files_from_referenced_folders = Vec::new(); let mut normal_files = Vec::new(); for file_entry in vec_file_entry { - if reference_directories.iter().any(|e| file_entry.path.starts_with(&e)) { + if reference_directories.iter().any(|e| file_entry.path.starts_with(e)) { files_from_referenced_folders.push(file_entry); } else { normal_files.push(file_entry); diff --git a/czkawka_core/src/similar_images.rs b/czkawka_core/src/similar_images.rs index ee440d6..c6fec94 100644 --- a/czkawka_core/src/similar_images.rs +++ b/czkawka_core/src/similar_images.rs @@ -306,7 +306,7 @@ impl SimilarImages { .unbounded_send(ProgressData { current_stage: 0, max_stage: 3, - images_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + images_checked: atomic_file_counter.load(Ordering::Relaxed), images_to_check: 0, }) .unwrap(); @@ -335,7 +335,7 @@ impl SimilarImages { let mut warnings = vec![]; let mut fe_result = vec![]; // Read current dir children - let read_dir = match fs::read_dir(¤t_folder) { + let read_dir = match fs::read_dir(current_folder) { Ok(t) => t, Err(e) => { warnings.push(flc!( @@ -536,7 +536,7 @@ impl SimilarImages { .unbounded_send(ProgressData { current_stage: 1, max_stage: 3, - images_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + images_checked: atomic_file_counter.load(Ordering::Relaxed), images_to_check, }) .unwrap(); @@ -716,7 +716,7 @@ impl SimilarImages { .unbounded_send(ProgressData { current_stage: 2, max_stage: 2, - images_checked: atomic_mode_counter.load(Ordering::Relaxed) as usize, + images_checked: atomic_mode_counter.load(Ordering::Relaxed), images_to_check: all_combinations_to_check, }) .unwrap(); @@ -747,7 +747,7 @@ impl SimilarImages { let reference_directories = self.directories.reference_directories.clone(); all_hashed_images.clone().into_iter().for_each(|(hash, vec_file_entry)| { for file_entry in vec_file_entry { - if reference_directories.iter().any(|e| file_entry.path.starts_with(&e)) { + if reference_directories.iter().any(|e| file_entry.path.starts_with(e)) { files_from_referenced_folders.entry(hash.clone()).or_insert_with(Vec::new).push(file_entry); } else { normal_files.entry(hash.clone()).or_insert_with(Vec::new).push(file_entry); @@ -1013,7 +1013,7 @@ impl SimilarImages { let mut files_from_referenced_folders = Vec::new(); let mut normal_files = Vec::new(); for file_entry in vec_file_entry { - if reference_directories.iter().any(|e| file_entry.path.starts_with(&e)) { + if reference_directories.iter().any(|e| file_entry.path.starts_with(e)) { files_from_referenced_folders.push(file_entry); } else { normal_files.push(file_entry); @@ -1125,7 +1125,7 @@ fn image_to_check<'a>( } fn is_in_reference_folder(reference_directories: &[PathBuf], path: &Path) -> bool { - reference_directories.iter().any(|e| path.starts_with(&e)) + reference_directories.iter().any(|e| path.starts_with(e)) } impl Default for SimilarImages { diff --git a/czkawka_core/src/similar_videos.rs b/czkawka_core/src/similar_videos.rs index c92f713..5878f95 100644 --- a/czkawka_core/src/similar_videos.rs +++ b/czkawka_core/src/similar_videos.rs @@ -271,7 +271,7 @@ impl SimilarVideos { .unbounded_send(ProgressData { current_stage: 0, max_stage: 1, - videos_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + videos_checked: atomic_file_counter.load(Ordering::Relaxed), videos_to_check: 0, }) .unwrap(); @@ -300,7 +300,7 @@ impl SimilarVideos { let mut warnings = vec![]; let mut fe_result = vec![]; // Read current dir children - let read_dir = match fs::read_dir(¤t_folder) { + let read_dir = match fs::read_dir(current_folder) { Ok(t) => t, Err(e) => { warnings.push(flc!( @@ -492,7 +492,7 @@ impl SimilarVideos { .unbounded_send(ProgressData { current_stage: 1, max_stage: 1, - videos_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + videos_checked: atomic_file_counter.load(Ordering::Relaxed), videos_to_check, }) .unwrap(); @@ -607,7 +607,7 @@ impl SimilarVideos { let mut files_from_referenced_folders = Vec::new(); let mut normal_files = Vec::new(); for file_entry in vec_file_entry { - if reference_directories.iter().any(|e| file_entry.path.starts_with(&e)) { + if reference_directories.iter().any(|e| file_entry.path.starts_with(e)) { files_from_referenced_folders.push(file_entry); } else { normal_files.push(file_entry); @@ -818,7 +818,7 @@ pub fn check_if_ffmpeg_is_installed() -> bool { if let Err(DetermineVideo { src_path: _a, error: FfmpegNotFound, - }) = VideoHash::from_path(&vid) + }) = VideoHash::from_path(vid) { return false; } diff --git a/czkawka_core/src/temporary.rs b/czkawka_core/src/temporary.rs index 7f763a3..b981a30 100644 --- a/czkawka_core/src/temporary.rs +++ b/czkawka_core/src/temporary.rs @@ -151,7 +151,7 @@ impl Temporary { .unbounded_send(ProgressData { current_stage: 0, max_stage: 0, - files_checked: atomic_file_counter.load(Ordering::Relaxed) as usize, + files_checked: atomic_file_counter.load(Ordering::Relaxed), }) .unwrap(); if !progress_thread_run.load(Ordering::Relaxed) { @@ -179,7 +179,7 @@ impl Temporary { let mut warnings = vec![]; let mut fe_result = vec![]; // Read current dir children - let read_dir = match fs::read_dir(¤t_folder) { + let read_dir = match fs::read_dir(current_folder) { Ok(t) => t, Err(e) => { warnings.push(flc!( diff --git a/czkawka_gui/Cargo.toml b/czkawka_gui/Cargo.toml index 63d4b4c..ce15468 100644 --- a/czkawka_gui/Cargo.toml +++ b/czkawka_gui/Cargo.toml @@ -10,11 +10,11 @@ homepage = "https://github.com/qarmin/czkawka" repository = "https://github.com/qarmin/czkawka" [dependencies] -gdk4 = "0.5.0" -glib = "0.16.1" +gdk4 = "0.5.2" +glib = "0.16.3" -humansize = "2.1.0" -chrono = "0.4.22" +humansize = "2.1.2" +chrono = "0.4.23" # Used for sending stop signal across threads crossbeam-channel = "0.5.6" @@ -26,16 +26,16 @@ futures = "0.3.25" directories-next = "2.0.0" # For opening files -open = "3.0.3" +open = "3.2.0" # To get image preview -image = "0.24.4" +image = "0.24.5" # To be able to use custom select -regex = "1.6.0" +regex = "1.7.0" # To get image_hasher types -image_hasher = "1.1.0" +image_hasher = "1.1.1" # Move files to trash trash = "2.1.5" @@ -47,13 +47,13 @@ fs_extra = "1.2.0" i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] } i18n-embed-fl = "0.6.4" rust-embed = "6.4.2" -once_cell = "1.15.0" +once_cell = "1.16.0" [target.'cfg(windows)'.dependencies] winapi = { version = "0.3.9", features = ["combaseapi", "objbase", "shobjidl_core", "windef", "winerror", "wtypesbase", "winuser"] } [dependencies.gtk4] -version = "0.5.0" +version = "0.5.2" default-features = false features = ["v4_6"] diff --git a/czkawka_gui/src/compute_results.rs b/czkawka_gui/src/compute_results.rs index ffa0822..a4e2d53 100644 --- a/czkawka_gui/src/compute_results.rs +++ b/czkawka_gui/src/compute_results.rs @@ -177,7 +177,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsDuplicates::Path as u32, &directory), ( ColumnsDuplicates::Modification as u32, - &(NaiveDateTime::from_timestamp(base_file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(base_file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsDuplicates::ModificationAsSecs as u32, &(base_file_entry.modified_date)), (ColumnsDuplicates::Color as u32, &(HEADER_ROW_COLOR.to_string())), @@ -198,7 +198,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsDuplicates::Path as u32, &directory), ( ColumnsDuplicates::Modification as u32, - &(NaiveDateTime::from_timestamp(entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsDuplicates::ModificationAsSecs as u32, &(entry.modified_date)), (ColumnsDuplicates::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -236,7 +236,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsDuplicates::Path as u32, &directory), ( ColumnsDuplicates::Modification as u32, - &(NaiveDateTime::from_timestamp(base_file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(base_file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsDuplicates::ModificationAsSecs as u32, &(base_file_entry.modified_date)), (ColumnsDuplicates::Color as u32, &(HEADER_ROW_COLOR.to_string())), @@ -257,7 +257,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsDuplicates::Path as u32, &directory), ( ColumnsDuplicates::Modification as u32, - &(NaiveDateTime::from_timestamp(entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsDuplicates::ModificationAsSecs as u32, &(entry.modified_date)), (ColumnsDuplicates::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -296,7 +296,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsDuplicates::Path as u32, &directory), ( ColumnsDuplicates::Modification as u32, - &(NaiveDateTime::from_timestamp(base_file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(base_file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsDuplicates::ModificationAsSecs as u32, &(base_file_entry.modified_date)), (ColumnsDuplicates::Color as u32, &(HEADER_ROW_COLOR.to_string())), @@ -316,7 +316,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsDuplicates::Path as u32, &directory), ( ColumnsDuplicates::Modification as u32, - &(NaiveDateTime::from_timestamp(entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsDuplicates::ModificationAsSecs as u32, &(entry.modified_date)), (ColumnsDuplicates::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -373,7 +373,11 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsDuplicates::Path as u32, &directory), ( ColumnsDuplicates::Modification as u32, - &(format!("{} - ({})", NaiveDateTime::from_timestamp(entry.modified_date as i64, 0), format_size(entry.size, BINARY))), + &(format!( + "{} - ({})", + NaiveDateTime::from_timestamp_opt(entry.modified_date as i64, 0).unwrap(), + format_size(entry.size, BINARY) + )), ), (ColumnsDuplicates::ModificationAsSecs as u32, &(entry.modified_date)), (ColumnsDuplicates::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -426,7 +430,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsDuplicates::Path as u32, &directory), ( ColumnsDuplicates::Modification as u32, - &(NaiveDateTime::from_timestamp(entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsDuplicates::ModificationAsSecs as u32, &(entry.modified_date)), (ColumnsDuplicates::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -478,7 +482,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsDuplicates::Path as u32, &directory), ( ColumnsDuplicates::Modification as u32, - &(NaiveDateTime::from_timestamp(entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsDuplicates::ModificationAsSecs as u32, &(entry.modified_date)), (ColumnsDuplicates::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -560,9 +564,9 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsEmptyFolders::Path as u32, &directory), ( ColumnsEmptyFolders::Modification as u32, - &(NaiveDateTime::from_timestamp(hashmap.get(&path).unwrap().modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(hashmap.get(&path).unwrap().modified_date as i64, 0).unwrap().to_string()), ), - (ColumnsEmptyFolders::ModificationAsSecs as u32, &(hashmap.get(&path).unwrap().modified_date as u64)), + (ColumnsEmptyFolders::ModificationAsSecs as u32, &(hashmap.get(&path).unwrap().modified_date)), ]; list_store.set(&list_store.append(), &values); } @@ -626,7 +630,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsEmptyFiles::Path as u32, &directory), ( ColumnsEmptyFiles::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsEmptyFiles::ModificationAsSecs as u32, &(file_entry.modified_date as i64)), ]; @@ -686,7 +690,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsBigFiles::Path as u32, &directory), ( ColumnsBigFiles::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsBigFiles::ModificationAsSecs as u32, &(file_entry.modified_date as i64)), (ColumnsBigFiles::SizeAsBytes as u32, &(size)), @@ -752,7 +756,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsTemporaryFiles::Path as u32, &directory), ( ColumnsTemporaryFiles::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsTemporaryFiles::ModificationAsSecs as u32, &(file_entry.modified_date as i64)), ]; @@ -835,7 +839,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsSimilarImages::Path as u32, &directory), ( ColumnsSimilarImages::Modification as u32, - &(NaiveDateTime::from_timestamp(base_file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(base_file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsSimilarImages::ModificationAsSecs as u32, &(base_file_entry.modified_date)), (ColumnsSimilarImages::Color as u32, &(HEADER_ROW_COLOR.to_string())), @@ -861,7 +865,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsSimilarImages::Path as u32, &directory), ( ColumnsSimilarImages::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsSimilarImages::ModificationAsSecs as u32, &(file_entry.modified_date)), (ColumnsSimilarImages::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -919,7 +923,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsSimilarImages::Path as u32, &directory), ( ColumnsSimilarImages::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsSimilarImages::ModificationAsSecs as u32, &(file_entry.modified_date)), (ColumnsSimilarImages::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -1016,7 +1020,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsSimilarVideos::Path as u32, &directory), ( ColumnsSimilarVideos::Modification as u32, - &(NaiveDateTime::from_timestamp(base_file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(base_file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsSimilarVideos::ModificationAsSecs as u32, &(base_file_entry.modified_date)), (ColumnsSimilarVideos::Color as u32, &(HEADER_ROW_COLOR.to_string())), @@ -1037,7 +1041,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsSimilarVideos::Path as u32, &directory), ( ColumnsSimilarVideos::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsSimilarVideos::ModificationAsSecs as u32, &(file_entry.modified_date)), (ColumnsSimilarVideos::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -1091,7 +1095,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsSimilarVideos::Path as u32, &directory), ( ColumnsSimilarVideos::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsSimilarVideos::ModificationAsSecs as u32, &(file_entry.modified_date)), (ColumnsSimilarVideos::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -1204,7 +1208,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsSameMusic::Length as u32, &base_file_entry.length), ( ColumnsSameMusic::Modification as u32, - &(NaiveDateTime::from_timestamp(base_file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(base_file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsSameMusic::ModificationAsSecs as u32, &(base_file_entry.modified_date)), (ColumnsSameMusic::Color as u32, &(HEADER_ROW_COLOR.to_string())), @@ -1230,7 +1234,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsSameMusic::Length as u32, &base_file_entry.length), ( ColumnsSameMusic::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsSameMusic::ModificationAsSecs as u32, &(file_entry.modified_date)), (ColumnsSameMusic::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -1333,7 +1337,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsSameMusic::Length as u32, &file_entry.length), ( ColumnsSameMusic::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsSameMusic::ModificationAsSecs as u32, &(file_entry.modified_date)), (ColumnsSameMusic::Color as u32, &(MAIN_ROW_COLOR.to_string())), @@ -1418,7 +1422,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< ), ( ColumnsInvalidSymlinks::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsInvalidSymlinks::ModificationAsSecs as u32, &(file_entry.modified_date as i64)), ]; @@ -1485,7 +1489,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsBrokenFiles::ErrorType as u32, &file_entry.error_string), ( ColumnsBrokenFiles::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsBrokenFiles::ModificationAsSecs as u32, &(file_entry.modified_date as i64)), ]; @@ -1552,7 +1556,7 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver< (ColumnsBadExtensions::ValidExtensions as u32, &file_entry.proper_extensions), ( ColumnsBadExtensions::Modification as u32, - &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()), + &(NaiveDateTime::from_timestamp_opt(file_entry.modified_date as i64, 0).unwrap().to_string()), ), (ColumnsBadExtensions::ModificationAsSecs as u32, &(file_entry.modified_date as i64)), ]; diff --git a/czkawka_gui/src/connect_things/connect_popovers.rs b/czkawka_gui/src/connect_things/connect_popovers.rs index 2d49980..80bdd09 100644 --- a/czkawka_gui/src/connect_things/connect_popovers.rs +++ b/czkawka_gui/src/connect_things/connect_popovers.rs @@ -135,7 +135,7 @@ fn popover_all_except_oldest_newest( break; } } - if used_index == None { + if used_index.is_none() { continue; } for (index, tree_iter) in tree_iter_array.iter().enumerate() { @@ -210,7 +210,7 @@ fn popover_one_oldest_newest( break; } } - if used_index == None { + if used_index.is_none() { continue; } for (index, tree_iter) in tree_iter_array.iter().enumerate() { @@ -584,7 +584,7 @@ fn popover_all_except_biggest_smallest( break; } } - if used_index == None { + if used_index.is_none() { continue; } for (index, tree_iter) in tree_iter_array.iter().enumerate() { diff --git a/czkawka_gui/src/connect_things/connect_settings.rs b/czkawka_gui/src/connect_things/connect_settings.rs index 9d11e02..a9f4636 100644 --- a/czkawka_gui/src/connect_things/connect_settings.rs +++ b/czkawka_gui/src/connect_things/connect_settings.rs @@ -74,7 +74,7 @@ pub fn connect_settings(gui_data: &GuiData) { if let Some(proj_dirs) = ProjectDirs::from("pl", "Qarmin", "Czkawka") { let cache_dir = proj_dirs.cache_dir(); - if let Err(e) = open::that(&cache_dir) { + if let Err(e) = open::that(cache_dir) { println!("Failed to open config folder {:?}, reason {}", cache_dir, e); }; } @@ -87,7 +87,7 @@ pub fn connect_settings(gui_data: &GuiData) { if let Some(proj_dirs) = ProjectDirs::from("pl", "Qarmin", "Czkawka") { let config_dir = proj_dirs.config_dir(); - if let Err(e) = open::that(&config_dir) { + if let Err(e) = open::that(config_dir) { println!("Failed to open config folder {:?}, reason {}", config_dir, e); }; } diff --git a/czkawka_gui/src/help_functions.rs b/czkawka_gui/src/help_functions.rs index bdcef14..6ea7ab9 100644 --- a/czkawka_gui/src/help_functions.rs +++ b/czkawka_gui/src/help_functions.rs @@ -728,7 +728,7 @@ pub fn get_pixbuf_from_dynamic_image(dynamic_image: &DynamicImage) -> Result bool { if let Some(iter) = list_store.iter_first() { loop { - let list_store_value: String = list_store.get::(&iter, column as i32); + let list_store_value: String = list_store.get::(&iter, column); if value == list_store_value { return true; @@ -746,7 +746,7 @@ pub fn check_if_value_is_in_list_store(list_store: &ListStore, column: i32, valu pub fn check_if_list_store_column_have_all_same_values(list_store: &ListStore, column: i32, value: bool) -> bool { if let Some(iter) = list_store.iter_first() { loop { - let list_store_value: bool = list_store.get::(&iter, column as i32); + let list_store_value: bool = list_store.get::(&iter, column); if value != list_store_value { return false;