From 8890df2e0c05fd778a6eed6fedfe84ef6619d275 Mon Sep 17 00:00:00 2001 From: chaos Date: Fri, 3 May 2024 13:23:53 +0100 Subject: [PATCH] flake update, cargo update, cargo fmt&clippy --- Cargo.lock | 220 +++++++++++++------------- flake.lock | 6 +- modules/ffprobe/src/ffprobe_output.rs | 2 +- modules/ffprobe/src/lib.rs | 8 +- modules/relative_file/src/lib.rs | 2 +- modules/taglib/src/traits.rs | 1 - src/commands/copy.rs | 15 +- src/commands/genhtml.rs | 6 +- src/commands/process.rs | 15 +- src/main.rs | 12 +- src/utils/formats/handlers/id3.rs | 3 +- src/utils/formats/handlers/mod.rs | 9 +- src/utils/formats/mod.rs | 7 +- src/utils/mod.rs | 2 +- src/utils/transcoder/mod.rs | 2 +- src/utils/transcoder/presets/mod.rs | 2 +- update.sh | 6 + 17 files changed, 160 insertions(+), 158 deletions(-) create mode 100755 update.sh diff --git a/Cargo.lock b/Cargo.lock index 795d0d0..e7a12c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,47 +34,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -97,9 +98,9 @@ checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" @@ -138,9 +139,9 @@ checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -156,9 +157,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.90" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" [[package]] name = "cexpr" @@ -188,15 +189,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -229,7 +230,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim 0.11.1", ] [[package]] @@ -252,9 +253,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "core-foundation-sys" @@ -333,9 +334,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "equivalent" @@ -355,9 +356,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "ffprobe" @@ -381,9 +382,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -418,9 +419,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -510,7 +511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -543,6 +544,12 @@ dependencies = [ "libc", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.12.1" @@ -601,9 +608,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" @@ -612,7 +619,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -801,9 +808,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" dependencies = [ "proc-macro2", "syn", @@ -811,18 +818,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -900,9 +907,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -928,18 +935,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", @@ -948,9 +955,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -959,9 +966,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.7.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ "base64", "chrono", @@ -977,9 +984,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.7.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ "darling", "proc-macro2", @@ -1026,15 +1033,15 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.57" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -1065,18 +1072,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", @@ -1085,9 +1092,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -1106,9 +1113,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -1232,44 +1239,22 @@ dependencies = [ "rustix", ] -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -1287,7 +1272,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -1307,17 +1292,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -1328,9 +1314,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -1340,9 +1326,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -1352,9 +1338,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -1364,9 +1356,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -1376,9 +1368,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -1388,9 +1380,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -1400,6 +1392,6 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" diff --git a/flake.lock b/flake.lock index 40dcba6..30f857f 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { diff --git a/modules/ffprobe/src/ffprobe_output.rs b/modules/ffprobe/src/ffprobe_output.rs index f305442..805e5e0 100644 --- a/modules/ffprobe/src/ffprobe_output.rs +++ b/modules/ffprobe/src/ffprobe_output.rs @@ -40,4 +40,4 @@ pub struct FFProbeOutputTags { pub replaygain_track_peak: Option, #[serde(default, alias = "REPLAYGAIN_TRACK_GAIN")] pub replaygain_track_gain: Option, -} \ No newline at end of file +} diff --git a/modules/ffprobe/src/lib.rs b/modules/ffprobe/src/lib.rs index 7e7e38c..d7ddadb 100644 --- a/modules/ffprobe/src/lib.rs +++ b/modules/ffprobe/src/lib.rs @@ -37,22 +37,20 @@ fn extract( })); } - let output = String::from_utf8(output.stdout).unwrap(); let ffprobe_out: serde_json::Result = serde_json::from_str(output.as_str()); - Ok(ffprobe_out.unwrap()) } pub fn analyze( path: &Path, ffprobe_command: Option<&str>, - ignore_missing_tags: bool + ignore_missing_tags: bool, ) -> Result { let raw_data = extract(path, ffprobe_command)?; - + let tags = match raw_data.format.tags { Some(tags) => tags, None => { @@ -63,7 +61,7 @@ pub fn analyze( break; } } - + match found_tags { Some(tags) => tags, None => { diff --git a/modules/relative_file/src/lib.rs b/modules/relative_file/src/lib.rs index 7cef3f7..ef54069 100644 --- a/modules/relative_file/src/lib.rs +++ b/modules/relative_file/src/lib.rs @@ -116,7 +116,7 @@ mod tests { fn change_filename() { let mut file = crate::RelativeFile::from_path("source/".to_string(), PathBuf::from("path/file.txt")); - file.change_filename("new_file".to_string()); + file.change_filename("new_file".to_string()); assert_eq!(file.join_filename(), "new_file.txt") } diff --git a/modules/taglib/src/traits.rs b/modules/taglib/src/traits.rs index 58b5993..4271b33 100644 --- a/modules/taglib/src/traits.rs +++ b/modules/taglib/src/traits.rs @@ -12,5 +12,4 @@ pub trait Tag { fn set_title(&mut self, title: String); fn set_artist(&mut self, artist: String); fn set_album(&mut self, album: String); - } diff --git a/src/commands/copy.rs b/src/commands/copy.rs index a0d1fe3..c136d9c 100644 --- a/src/commands/copy.rs +++ b/src/commands/copy.rs @@ -109,12 +109,7 @@ pub fn copy_command( } } - if copy_args - .preset - .as_ref() - .unwrap_or(&"".to_string()) - == "copy" - { + if copy_args.preset.as_ref().unwrap_or(&"".to_string()) == "copy" { println!("Copying Files Into Dest"); copy_files(&files, copy_args)?; } else { @@ -183,9 +178,11 @@ fn transcode_file( } }; - if copy_args.skip_same_extension && config.file_extension.as_ref().unwrap() == &file.extension().unwrap() { - return copy_file(file.as_relative_file(), copy_args); - } + if copy_args.skip_same_extension + && config.file_extension.as_ref().unwrap() == &file.extension().unwrap() + { + return copy_file(file.as_relative_file(), copy_args); + } let to_path_dest = PathBuf::from_str(copy_args.dest.as_str()).expect("invalid destination"); let to_path = match copy_args.single_directory { diff --git a/src/commands/genhtml.rs b/src/commands/genhtml.rs index c38750b..db65f56 100644 --- a/src/commands/genhtml.rs +++ b/src/commands/genhtml.rs @@ -22,7 +22,11 @@ pub struct GenHTMLCommandArgs { pub link_base: Option, } -fn table_for_files(files: Vec, includes_path: bool, link_base: &Option) -> String { +fn table_for_files( + files: Vec, + includes_path: bool, + link_base: &Option, +) -> String { let mut html_content = String::new(); let mut path_head = String::new(); diff --git a/src/commands/process.rs b/src/commands/process.rs index 128e96d..d4e3648 100644 --- a/src/commands/process.rs +++ b/src/commands/process.rs @@ -3,14 +3,14 @@ use std::sync::Mutex; use std::thread::scope; use crate::args::CLIArgs; -use crate::types::AudioFileInfo; use crate::types::AudioFile; +use crate::types::AudioFileInfo; use crate::utils::formats::get_format_handler; use crate::utils::scan_for_music; use ascii_reduce::reduce; -use relative_file::RelativeFile; use relative_file::traits::RelativeFileTrait; +use relative_file::RelativeFile; #[cfg(feature = "replaygain")] use replaygain::analyze_replaygain_track; @@ -80,7 +80,8 @@ fn rename_file(process_args: &ProcessCommandArgs, file: &mut AudioFile) { // Step 6: Rename File println!( "Renaming File from {}.{extension} to {}.{extension}", - file.filename(), filename + file.filename(), + filename ); if !process_args.dry_run { if std::path::Path::new(&new_file.join_path_to()).exists() { @@ -109,7 +110,8 @@ fn rename_file(process_args: &ProcessCommandArgs, file: &mut AudioFile) { println!( "Renaming Extra File from {}.{extra_extension} to {}.{extra_extension}", - file.filename(), filename + file.filename(), + filename ); if !process_args.dry_run { @@ -133,7 +135,10 @@ fn rename_file(process_args: &ProcessCommandArgs, file: &mut AudioFile) { } #[cfg(feature = "replaygain")] -pub fn add_replaygain_tags(file: &AudioFile, force: bool) -> Result<(), Box> { +pub fn add_replaygain_tags( + file: &AudioFile, + force: bool, +) -> Result<(), Box> { if !file.info.supports_replaygain { println!( "Skipping replaygain for {:?}, not supported", diff --git a/src/main.rs b/src/main.rs index f91038f..9a168d0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,18 +17,12 @@ fn main() -> Result<(), Box> { commands::process::process_command(cli, &subcommand_args) } #[cfg(feature = "command_genhtml")] - Commands::Genhtml(subcommand_args) => { - commands::genhtml::genhtml_command(cli, &subcommand_args) - } + Commands::Genhtml(subcommand_args) => commands::genhtml::genhtml_command(cli, &subcommand_args), Commands::Transcode(subcommand_args) => { commands::transcode::transcode_command(cli, &subcommand_args) } - Commands::Copy(subcommand_args) => { - commands::copy::copy_command(cli, &subcommand_args) - } - Commands::Tags(subcommand_args) => { - commands::tags::tags_command(cli, &subcommand_args) - } + Commands::Copy(subcommand_args) => commands::copy::copy_command(cli, &subcommand_args), + Commands::Tags(subcommand_args) => commands::tags::tags_command(cli, &subcommand_args), Commands::Presets(subcommand_args) => { commands::presets::presets_command(cli, &subcommand_args) } diff --git a/src/utils/formats/handlers/id3.rs b/src/utils/formats/handlers/id3.rs index de19c81..45aabb9 100644 --- a/src/utils/formats/handlers/id3.rs +++ b/src/utils/formats/handlers/id3.rs @@ -37,7 +37,8 @@ impl FormatHandler for ID3AudioFormat { album: album.map(|f| f.to_string()), track_number: self .id3_tags - .track().map(|track_number| track_number as u64), + .track() + .map(|track_number| track_number as u64), }) } diff --git a/src/utils/formats/handlers/mod.rs b/src/utils/formats/handlers/mod.rs index f734cad..7fcfd61 100644 --- a/src/utils/formats/handlers/mod.rs +++ b/src/utils/formats/handlers/mod.rs @@ -25,7 +25,7 @@ compile_error!("at least one extractor feature must be enabled"); // For changed tags on implementations that call a command line utility to set tags #[derive(Default)] - struct Changes { +struct Changes { title: Option, artist: Option, album: Option, @@ -35,10 +35,13 @@ compile_error!("at least one extractor feature must be enabled"); impl Changes { #[inline] fn changed(&self) -> bool { - [self.title.is_some(), + [ + self.title.is_some(), self.artist.is_some(), self.album.is_some(), - self.track_number.is_some()].contains(&true) + self.track_number.is_some(), + ] + .contains(&true) } } diff --git a/src/utils/formats/mod.rs b/src/utils/formats/mod.rs index 806e52b..2339740 100644 --- a/src/utils/formats/mod.rs +++ b/src/utils/formats/mod.rs @@ -7,7 +7,7 @@ use relative_file::traits::RelativeFileTrait; use thiserror::Error; use super::format_detection::detect_format; -use crate::types::{AudioFileInfo, AudioFile, Tags}; +use crate::types::{AudioFile, AudioFileInfo, Tags}; #[cfg(feature = "replaygain")] use replaygain::ReplayGainRawData; @@ -48,7 +48,10 @@ pub fn get_format_handler(file: &AudioFile) -> Result, Bo let path = file.join_path_to(); for handler in handlers::HANDLERS.iter() { - if !handler.supported_extensions.contains(&file.extension().unwrap()) { + if !handler + .supported_extensions + .contains(&file.extension().unwrap()) + { continue; } diff --git a/src/utils/mod.rs b/src/utils/mod.rs index ab3cba4..ad5b98e 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -5,4 +5,4 @@ pub mod formats; mod music_scanner; pub use formats::is_supported_file; -pub use music_scanner::scan_for_music; \ No newline at end of file +pub use music_scanner::scan_for_music; diff --git a/src/utils/transcoder/mod.rs b/src/utils/transcoder/mod.rs index 5a30895..4875c30 100644 --- a/src/utils/transcoder/mod.rs +++ b/src/utils/transcoder/mod.rs @@ -1,8 +1,8 @@ pub mod presets; -pub mod types; mod progress_monitor; #[allow(clippy::module_inception)] mod transcoder; +pub mod types; pub use self::progress_monitor::progress_monitor; pub use self::transcoder::transcode; diff --git a/src/utils/transcoder/presets/mod.rs b/src/utils/transcoder/presets/mod.rs index ec5af9f..ecc2e42 100644 --- a/src/utils/transcoder/presets/mod.rs +++ b/src/utils/transcoder/presets/mod.rs @@ -62,7 +62,7 @@ impl std::fmt::Display for PresetError { match self { PresetError::PresetNonExistant => write!(f, "Preset does not exist"), PresetError::NoneSpecified => write!(f, "No preset or config specified"), - PresetError::LoadError(err) => write!(f, "Error loading config: {}", err) + PresetError::LoadError(err) => write!(f, "Error loading config: {}", err), } } } diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..f6fc123 --- /dev/null +++ b/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +nix flake update +nix develop --command cargo install --debug cargo-upgrades +nix develop --command cargo upgrades -h +nix develop --command cargo update \ No newline at end of file