From 68f90e1cd70b7d7fffdec0e5a5dfbc63786641f1 Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Sat, 5 Apr 2025 09:30:12 +0200 Subject: [PATCH] update 7z package (#370) --- Cargo.lock | 105 ++++++++++++++++++++++++-------------------------- Cargo.toml | 2 +- src/device.rs | 4 +- 3 files changed, 53 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 00f1e7f..15e4392 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -328,30 +328,15 @@ dependencies = [ "syn", ] -[[package]] -name = "bit-set" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" -dependencies = [ - "bit-vec 0.7.0", -] - [[package]] name = "bit-set" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" dependencies = [ - "bit-vec 0.8.0", + "bit-vec", ] -[[package]] -name = "bit-vec" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" - [[package]] name = "bit-vec" version = "0.8.0" @@ -1198,29 +1183,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "filetime" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" -dependencies = [ - "cfg-if", - "libc", - "libredox", - "windows-sys 0.59.0", -] - -[[package]] -name = "filetime_creation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c25b5d475550e559de5b0c0084761c65325444e3b6c9e298af9cefe7a9ef3a5f" -dependencies = [ - "cfg-if", - "filetime", - "windows-sys 0.52.0", -] - [[package]] name = "flate2" version = "1.1.1" @@ -1530,7 +1492,7 @@ dependencies = [ "serde", "serde-big-array", "serde_json", - "sevenz-rust", + "sevenz-rust2", "sha2", "socket2", "spin_sleep", @@ -2023,6 +1985,30 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +[[package]] +name = "jiff" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "jni" version = "0.21.1" @@ -2182,10 +2168,10 @@ dependencies = [ ] [[package]] -name = "lzma-rust" -version = "0.1.7" +name = "lzma-rust2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baab2bbbd7d75a144d671e9ff79270e903957d92fb7386fd39034c709bd2661" +checksum = "561d131e2d9b07641ac55bc35de5ae4ac3e783fdeebd3c4c1dd3b6a7b920051a" dependencies = [ "byteorder", ] @@ -2298,7 +2284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e" dependencies = [ "arrayvec", - "bit-set 0.8.0", + "bit-set", "bitflags 2.9.0", "cfg_aliases", "codespan-reporting", @@ -2389,11 +2375,13 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" [[package]] name = "nt-time" -version = "0.8.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2de419e64947cd8830e66beb584acc3fb42ed411d103e3c794dda355d1b374b5" +checksum = "f5e71108c089b161344bacb1227dd2124fee63ed1792fdd8308e6689197c2754" dependencies = [ "chrono", + "jiff", + "rand", "time", ] @@ -2898,6 +2886,15 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + [[package]] name = "postcard" version = "1.1.1" @@ -3477,19 +3474,17 @@ dependencies = [ ] [[package]] -name = "sevenz-rust" -version = "0.6.1" +name = "sevenz-rust2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26482cf1ecce4540dc782fc70019eba89ffc4d87b3717eb5ec524b5db6fdefef" +checksum = "6e6a4a454159c1a2735c27656a057d5502191e66bb3f71156b98ca595b460fd7" dependencies = [ - "bit-set 0.6.0", + "bit-set", "byteorder", - "crc", - "filetime_creation", + "crc32fast", "js-sys", - "lzma-rust", + "lzma-rust2", "nt-time", - "sha2", "wasm-bindgen", ] @@ -4431,7 +4426,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "671c25545d479b47d3f0a8e373aceb2060b67c6eb841b24ac8c32348151c7a0c" dependencies = [ "arrayvec", - "bit-vec 0.8.0", + "bit-vec", "bitflags 2.9.0", "cfg_aliases", "document-features", diff --git a/Cargo.toml b/Cargo.toml index 99407c9..1a359de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ rust-version = "1.85" dirs = "6.0" zip = "2.6" governor = "0.10" -sevenz-rust = "0.6" +sevenz-rust2 = { version = "0.13.0", default-features = false } chrono = "0.4" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/device.rs b/src/device.rs index 2ae554b..06d67cb 100644 --- a/src/device.rs +++ b/src/device.rs @@ -146,12 +146,12 @@ pub fn get_rom_contents(file_path: &std::path::Path) -> Option> { } } else if file_path.extension().unwrap().eq_ignore_ascii_case("7z") { let mut archive = - sevenz_rust::SevenZReader::open(file_path, sevenz_rust::Password::empty()).unwrap(); + sevenz_rust2::SevenZReader::open(file_path, sevenz_rust2::Password::empty()).unwrap(); let mut found = false; archive .for_each_entries( - &mut |entry: &sevenz_rust::SevenZArchiveEntry, reader: &mut dyn std::io::Read| { + &mut |entry: &sevenz_rust2::SevenZArchiveEntry, reader: &mut dyn std::io::Read| { let name = entry.name().to_ascii_lowercase(); if !found && (name.ends_with("z64") || name.ends_with("n64") || name.ends_with("v64"))