From 341a56868386fcaf992d98a9d11b292b9d657d79 Mon Sep 17 00:00:00 2001 From: Lkhsss Date: Sat, 15 Mar 2025 16:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E9=87=8D=E6=9E=84=E3=80=82?= =?UTF-8?q?=E9=87=8D=E5=86=99=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 364 +++++++++++++++++------------------------------ Cargo.toml | 18 +-- src/clap.rs | 4 +- src/logger.rs | 94 ++++++------ src/main.rs | 95 ++++--------- src/messager.rs | 30 +++- src/ncmdump.rs | 16 +-- src/pathparse.rs | 40 ++++++ 8 files changed, 292 insertions(+), 369 deletions(-) create mode 100644 src/pathparse.rs diff --git a/Cargo.lock b/Cargo.lock index 68f6cf3..60ea9fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,15 +19,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - [[package]] name = "aligned-vec" version = "0.5.0" @@ -49,60 +40,17 @@ dependencies = [ "libc", ] -[[package]] -name = "anstream" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - [[package]] name = "anstyle" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" -[[package]] -name = "anstyle-parse" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" -dependencies = [ - "anstyle", - "windows-sys", -] - [[package]] name = "anyhow" -version = "1.0.95" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" [[package]] name = "arbitrary" @@ -169,9 +117,9 @@ dependencies = [ [[package]] name = "avif-serialize" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e335041290c43101ca215eed6f43ec437eb5a42125573f600fc3fa42b9bddd62" +checksum = "98922d6a4cfbcb08820c69d8eeccc05bb1f29bfa06b4f5b1dbfe9a868bd7608e" dependencies = [ "arrayvec", ] @@ -196,9 +144,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" [[package]] name = "bitstream-io" @@ -208,21 +156,21 @@ checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2" [[package]] name = "built" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b" +checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b" [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "bytemuck" -version = "1.21.0" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" +checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" [[package]] name = "byteorder" @@ -238,9 +186,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "cc" -version = "1.2.7" +version = "1.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" dependencies = [ "jobserver", "libc", @@ -265,16 +213,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" +checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", - "wasm-bindgen", - "windows-targets", + "windows-link", ] [[package]] @@ -289,9 +235,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.23" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83" dependencies = [ "clap_builder", "clap_derive", @@ -299,21 +245,19 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8" dependencies = [ - "anstream", "anstyle", "clap_lex", - "strsim", ] [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ "heck", "proc-macro2", @@ -333,12 +277,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" -[[package]] -name = "colorchoice" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" - [[package]] name = "colored" version = "2.2.0" @@ -351,9 +289,9 @@ dependencies = [ [[package]] name = "console" -version = "0.15.10" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b" +checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" dependencies = [ "encode_unicode", "libc", @@ -370,9 +308,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -413,9 +351,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" [[package]] name = "crypto-common" @@ -429,9 +367,9 @@ dependencies = [ [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "encode_unicode" @@ -446,27 +384,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ "log", - "regex", ] [[package]] name = "env_logger" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" +checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697" dependencies = [ - "anstream", - "anstyle", "env_filter", - "humantime", "log", ] [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "exr" @@ -494,9 +428,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc" dependencies = [ "crc32fast", "miniz_oxide", @@ -535,9 +469,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1" dependencies = [ "cfg-if", "crunchy", @@ -561,12 +495,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "iana-time-zone" version = "0.1.61" @@ -592,11 +520,11 @@ dependencies = [ [[package]] name = "id3" -version = "1.16.0" +version = "1.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1df50e6c625115513974d5efc34c4bc55524145e14cb2297e909ab5ece0d49" +checksum = "472295f55960dd48e38c89442fa5d5423f5cf0ed2c665485be78e129231a39e9" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "byteorder", "flate2", ] @@ -626,9 +554,9 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f" +checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f" dependencies = [ "byteorder-lite", "quick-error", @@ -642,9 +570,9 @@ checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" [[package]] name = "indexmap" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" dependencies = [ "equivalent", "hashbrown", @@ -652,9 +580,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.9" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" +checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" dependencies = [ "console", "number_prefix", @@ -665,9 +593,9 @@ dependencies = [ [[package]] name = "inout" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ "generic-array", ] @@ -683,12 +611,6 @@ dependencies = [ "syn", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - [[package]] name = "itertools" version = "0.12.1" @@ -700,9 +622,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jobserver" @@ -721,9 +643,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -743,15 +665,15 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.169" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libfuzzer-sys" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9569d2f74e257076d8c6bfa73fb505b46b851e51ddaecc825944aa3bed17fa" +checksum = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75" dependencies = [ "arbitrary", "cc", @@ -759,9 +681,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" [[package]] name = "loop9" @@ -790,9 +712,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "metaflac" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f083edae4a21f5acb1fda8220d1c14fa31f725bfd4e21005a14c2d8944db9b" +checksum = "fdf25a3451319c52a4a56d956475fbbb763bfb8420e2187d802485cb0fd8d965" dependencies = [ "byteorder", "hex", @@ -806,9 +728,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" dependencies = [ "adler2", "simd-adler32", @@ -832,7 +754,7 @@ checksum = "07dcca13d1740c0a665f77104803360da0bdb3323ecce2e93fa2c959a6d52806" [[package]] name = "ncmmiao" -version = "2.5.8" +version = "2.5.10" dependencies = [ "aes", "audiotags", @@ -932,9 +854,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" [[package]] name = "paste" @@ -944,9 +866,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "png" @@ -963,24 +885,24 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" +checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ "zerocopy", ] [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ "unicode-ident", ] @@ -1021,9 +943,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -1134,35 +1056,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08ad765b21a08b1a8e5cdce052719188a23772bcbefb3c439f0baaf62c56ceac" -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - [[package]] name = "rgb" version = "0.8.50" @@ -1170,10 +1063,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" [[package]] -name = "ryu" -version = "1.0.18" +name = "rustversion" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "same-file" @@ -1186,18 +1085,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.217" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -1206,9 +1105,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -1248,21 +1147,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" [[package]] name = "syn" -version = "2.0.95" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -1321,9 +1214,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" dependencies = [ "serde", "serde_spanned", @@ -1342,9 +1235,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ "indexmap", "serde", @@ -1355,15 +1248,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-width" @@ -1371,12 +1264,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - [[package]] name = "v_frame" version = "0.3.8" @@ -1418,20 +1305,21 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", @@ -1443,9 +1331,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1453,9 +1341,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -1466,9 +1354,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-time" @@ -1504,6 +1395,12 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-link" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" + [[package]] name = "windows-sys" version = "0.59.0" @@ -1579,28 +1476,27 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.22" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980" +checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" dependencies = [ "memchr", ] [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6" dependencies = [ - "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index d06877f..b6d6ce3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,24 +1,24 @@ [package] name = "ncmmiao" -version = "2.5.8" +version = "2.5.10" edition = "2021" authors = ["Lkhsss "] description = "A magic tool convert ncm to flac" repository = "https://github.com/lkhsss/ncmmiao" license = "GPL-3.0-or-later" -keys = ["ncm","flac","neteasemusic"] +keywords = ["ncm","flac","neteasemusic"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -aes = "0.8.3" -audiotags = "0.5.0" -base64 = "0.22.*" -chrono = "0.4.38" -clap = { version = "4.5.9", features = ["derive"] } -colored = "2.1.0" -env_logger = "0.11.1" +aes = { version = "0.8.4", default-features = false } +audiotags = {version = "0.5.0",default-features = false} +base64 = {version = "0.22.*"} +chrono = {version = "0.4.*",features = ["clock"],default-features = false} +clap = { version = "4.5.*", features = ["derive","std"],default-features = false} +colored = {version = "*",default-features = false} +env_logger = {version = "*",default-features = false} hex = "0.4.3" image = "0.25.*" indicatif = "0.17.9" diff --git a/src/clap.rs b/src/clap.rs index 1e2acf2..900ff08 100644 --- a/src/clap.rs +++ b/src/clap.rs @@ -17,6 +17,6 @@ pub struct Cli { pub output: Option, /// 强制覆盖保存开关 - #[arg(short,long,name="强制覆盖开关")] - pub forcesave:bool + #[arg(short, long, name = "强制覆盖开关")] + pub forcesave: bool, } diff --git a/src/logger.rs b/src/logger.rs index f49d34f..00d3e1e 100644 --- a/src/logger.rs +++ b/src/logger.rs @@ -1,47 +1,51 @@ -use chrono; -use env_logger::Builder; -use std::io::Write; +use colored::Color::{Blue, Cyan, Green, Red, Yellow}; +use colored::Colorize; +use indicatif::MultiProgress; +use log::{LevelFilter, Log, Metadata, Record, SetLoggerError}; +use std::sync::Arc; -pub struct Logger {} - -impl Logger { - pub fn new() { - let mut builder = Builder::new(); - if cfg!(debug_assertions) { - builder.filter(None, log::LevelFilter::Debug); - } else { - builder.filter(None, log::LevelFilter::Info); - } - builder.format(move |buf, record| { - writeln!( - buf, - "[{} {}] {}", - format!("{}", chrono::Local::now().format("%H:%M:%S")), - match record.level() { - log::Level::Error => { - let style = buf.default_level_style(log::Level::Error); - format!("{style}Error{style:#}") - } - log::Level::Warn => { - let style = buf.default_level_style(log::Level::Warn); - format!("{style}Warn{style:#}") - } - log::Level::Info => { - let style = buf.default_level_style(log::Level::Info); - format!("{style}Info{style:#}") - } - log::Level::Debug => { - let style = buf.default_level_style(log::Level::Debug); - format!("{style}Debug{style:#}") - } - log::Level::Trace => { - let style = buf.default_level_style(log::Level::Trace); - format!("{style}Trace{style:#}") - } - }, - record.args(), - ) - }); - builder.init(); //初始化logger - } +// 自定义Logger,将日志发送到MultiProgress +pub struct MultiProgressLogger { + mp: Arc, +} + +impl Log for MultiProgressLogger { + fn enabled(&self, _metadata: &Metadata) -> bool { + true + } + + fn log(&self, record: &Record) { + if self.enabled(record.metadata()) { + let level = match record.level() { + log::Level::Error => ("Error").color(Red), + log::Level::Warn => ("Warn").color(Yellow), + log::Level::Info => ("Info").color(Green), + log::Level::Debug => ("Debug").color(Blue), + log::Level::Trace => ("Debug").color(Cyan), + }; + let message = format!( + "[{}][{}] {}", + chrono::Local::now().format("%H:%M:%S"), + level, + record.args() + ); + self.mp.println(message).expect("Failed to print log"); + } + } + + fn flush(&self) {} +} + +// 初始化日志系统 +pub fn init_logger() -> Result<(), SetLoggerError> { + let logger = MultiProgressLogger { + mp: crate::MP.clone(), + }; + log::set_boxed_logger(Box::new(logger))?; + if cfg!(debug_assertions) { + log::set_max_level(LevelFilter::Debug); + } else { + log::set_max_level(LevelFilter::Info); + } + Ok(()) } diff --git a/src/main.rs b/src/main.rs index 58a651d..153c30d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,8 @@ use ::clap::Parser; -#[allow(unused_imports)] +use colored::{Color, Colorize}; +use indicatif::{MultiProgress, ProgressBar, ProgressStyle}; +use lazy_static::lazy_static; use log::{error, info, warn}; -use messager::Signals; use std::time::Duration; use std::{ path::Path, @@ -11,22 +12,19 @@ use std::{ }, }; -use colored::Colorize; - -use walkdir::WalkDir; //遍历目录 - mod clap; mod logger; mod messager; mod ncmdump; +mod pathparse; +mod test; mod threadpool; use ncmdump::Ncmfile; -mod test; fn main() { let timer = ncmdump::TimeCompare::new(); // 初始化日志系统 - logger::Logger::new(); + logger::init_logger().unwrap(); let cli = clap::Cli::parse(); @@ -46,44 +44,12 @@ fn main() { let outputdir = cli.output.unwrap(); let forcesave = cli.forcesave; - if forcesave{ - warn!("文件强制覆盖已开启!") + if forcesave { + warn!("文件{}已开启!", "强制覆盖".bright_red()) } - let mut undumpfile = Vec::new(); // 该列表将存入文件的路径 + let undumpfile = pathparse::pathparse(input); // 该列表将存入文件的路径 - for arg in input { - //解析传入的每一个路径:文件or文件夹 - let path = Path::new(&arg); - - if path.is_file() { - // 当后缀符合为ncm时才加入列表 - match path.extension() { - Some(extension) => { - if extension == "ncm" { - let _ = &mut undumpfile.push(arg.to_owned()); - } - } - None => {} - } - } else if path.is_dir() { - for entry in WalkDir::new(path) { - let new_entry = entry.unwrap().clone(); - let filepath = new_entry.into_path(); - // 当后缀符合为ncm时才加入列表 - match filepath.extension() { - Some(extension) => { - if extension == "ncm" { - let _ = &mut undumpfile.push(String::from(filepath.to_str().unwrap())); - } - } - None => { - continue; - } - } - } - } - } let taskcount = undumpfile.len(); let successful = Arc::new(Mutex::new(0)); if taskcount == 0 { @@ -91,7 +57,10 @@ fn main() { } else { // 初始化线程池 let pool = threadpool::Pool::new(max_workers); - info!("启用{}线程", max_workers); + info!( + "将启用{}线程", + max_workers.to_string().color(Color::BrightGreen) + ); // 初始化通讯 let (tx, rx) = mpsc::channel(); @@ -101,7 +70,7 @@ fn main() { let successful = Arc::clone(&successful); let sender: Sender = tx.clone(); pool.execute(move || match Ncmfile::new(filepath.as_str()) { - Ok(mut n) => match n.dump(Path::new(&output), sender,forcesave) { + Ok(mut n) => match n.dump(Path::new(&output), sender, forcesave) { Ok(_) => { let mut num = successful.lock().unwrap(); *num += 1; @@ -114,31 +83,21 @@ fn main() { //循环到此结束 //进度条 - use indicatif::ProgressBar; - let progressbar = ProgressBar::new((taskcount) as u64) + let pb = ProgressBar::new((taskcount * 6) as u64) //长度乘积取决于Signal的数量 .with_elapsed(Duration::from_millis(50)) - .with_message("破解中"); + .with_style( + ProgressStyle::default_bar() + .progress_chars("#>-") + .template("{spinner:.green} [{wide_bar:.cyan/blue}] {percent_precise}% ({eta})") + .unwrap(), + ) + .with_message("解密中"); + let progressbar = MP.add(pb); //接受消息 for messages in rx { - match messages.signal { - Signals::Start => { - // progressbar.inc(1); - info!("[{}] 开始读取文件", messages.name) - } - Signals::Decrypt => { - // progressbar.inc(1); - info!("[{}] 开始解密", messages.name) - } - Signals::Save => { - // progressbar.inc(1); - info!("[{}] 保存文件", messages.name) - } - Signals::End => { - progressbar.inc(1); - info!("[{}] 成功!", messages.name) - } - } + progressbar.inc(1); + messages.log(); //发送log } progressbar.finish_and_clear(); @@ -159,3 +118,7 @@ fn main() { showtime() ) } + +lazy_static! { + static ref MP: Arc = Arc::new(MultiProgress::new()); +} diff --git a/src/messager.rs b/src/messager.rs index f4a420b..d5b355f 100644 --- a/src/messager.rs +++ b/src/messager.rs @@ -1,3 +1,6 @@ +use colored::Colorize; +use log::info; + use crate::messager; use std::fmt::Debug; use std::sync::mpsc; @@ -10,9 +13,24 @@ pub struct Message { pub name: String, pub signal: Signals, } - +impl Message { + // 定义一个公共方法 log,用于记录不同信号状态下的日志信息 + pub fn log(&self) { + let loginfo = match &self.signal { + Signals::Start => "读取文件", + Signals::GetMetaInfo => "解密歌曲元信息", + Signals::GetCover => "解密封面图片数据", + Signals::Decrypt => "解密歌曲信息", + Signals::Save => "保存文件", + Signals::End => "成功!", + }; + info!("[{}] {}", self.name.cyan(), loginfo) + } +} pub enum Signals { Start, + GetMetaInfo, + GetCover, Decrypt, Save, End, @@ -32,10 +50,12 @@ impl Messager { impl Debug for Message { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { let message = match &self.signal { - Signals::Start => "开始破解".to_string(), - Signals::Decrypt => "开始解密".to_string(), - Signals::Save => "保存文件".to_string(), - Signals::End => "破解完成".to_string(), + Signals::Start => "开始破解", + Signals::Decrypt => "开始解密", + Signals::Save => "保存文件", + Signals::End => "破解完成", + Signals::GetMetaInfo => "获取元数据", + Signals::GetCover => "获取封面", }; write!(f, "[{}] {}", self.name, message) } diff --git a/src/ncmdump.rs b/src/ncmdump.rs index 7df3ed0..0fefe8c 100644 --- a/src/ncmdump.rs +++ b/src/ncmdump.rs @@ -152,11 +152,8 @@ impl Ncmfile { &mut self, outputdir: &Path, tx: mpsc::Sender, - force_save:bool + force_save: bool, ) -> Result<(), NcmError> { - - - let messager = messager::Messager::new(self.fullfilename.clone(), tx); let _ = messager.send(Signals::Start); //TODO 通讯合法化 @@ -201,6 +198,7 @@ impl Ncmfile { //读取meta信息的数据大小 trace!("获取meta信息数据大小"); let meta_length = u32::from_le_bytes(self.seekread(4)?.try_into().unwrap()) as u64; + let _ = messager.send(Signals::GetMetaInfo); // 读取meta信息 trace!("读取meta信息"); @@ -255,7 +253,7 @@ impl Ncmfile { debug!("文件路径: {:?}", path); // 先检查是否存在 - if !force_save && Path::new(&path).exists(){ + if !force_save && Path::new(&path).exists() { return Err(NcmError::ProtectFile); } @@ -268,6 +266,7 @@ impl Ncmfile { trace!("跳过5个字节"); self.skip(5)?; + let _ = messager.send(Signals::GetCover); // 获取图片数据的大小 trace!("获取图片数据的大小"); let image_data_length = u32::from_le_bytes(self.seekread(4)?.try_into().unwrap()) as u64; @@ -367,7 +366,6 @@ impl Ncmfile { //退出循环,写入文件 - let _ = messager.send(Signals::Save); self.save(&path, music_data)?; @@ -399,7 +397,6 @@ impl Ncmfile { Ok(()) } fn save(&mut self, path: &PathBuf, data: Vec) -> Result<(), NcmError> { - let music_file = match File::create(path) { Ok(o) => o, Err(_) => return Err(NcmError::FileWriteError), @@ -590,7 +587,10 @@ impl std::fmt::Display for NcmError { Self::FileReadError => write!(f, "读取文件时发生错误"), Self::FileWriteError => write!(f, "写入文件时错误"), Self::FullFilenameError => write!(f, "文件名不符合规范"), - Self::ProtectFile=>write!(f, "已关闭文件强制覆盖且文件已存在。使用-f或-forcesave开启强制覆盖。"), + Self::ProtectFile => write!( + f, + "已关闭文件强制覆盖且文件已存在。使用-f或-forcesave开启强制覆盖。" + ), _ => write!(f, "未知错误"), } } diff --git a/src/pathparse.rs b/src/pathparse.rs new file mode 100644 index 0000000..2d7e197 --- /dev/null +++ b/src/pathparse.rs @@ -0,0 +1,40 @@ +use std::path::Path; +use walkdir::WalkDir; + +pub fn pathparse(input: Vec) -> Vec { + let mut undumpfile = Vec::new(); // 该列表将存入文件的路径 + // 遍历输入的每一个路径参数 + for arg in input { + //解析传入的每一个路径:文件or文件夹 + let path = Path::new(&arg); + + if path.is_file() { + // 当后缀符合为ncm时才加入列表 + match path.extension() { + Some(extension) => { + if extension == "ncm" { + let _ = &mut undumpfile.push(arg.to_owned()); + } + } + None => {} + } + } else if path.is_dir() { + for entry in WalkDir::new(path) { + let new_entry = entry.unwrap().clone(); + let filepath = new_entry.into_path(); + // 当后缀符合为ncm时才加入列表 + match filepath.extension() { + Some(extension) => { + if extension == "ncm" { + let _ = &mut undumpfile.push(String::from(filepath.to_str().unwrap())); + } + } + None => { + continue; + } + } + } + } + } + undumpfile +}