Compare commits

...

3 Commits

Author SHA1 Message Date
Anna d00105eba9
chore: remove unnecessary cast 2023-02-20 16:22:49 -05:00
Anna 7916a6e01b
chore: reorder dependencies and fix typo 2023-02-20 16:22:38 -05:00
Anna b631e07335
refactor: use data-encoding in examples 2023-02-20 16:16:56 -05:00
4 changed files with 5 additions and 5 deletions

View File

@ -11,14 +11,14 @@ flate2 = "1"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
sha3 = "0.10" sha3 = "0.10"
sqpack = { git = "https://git.anna.lgbt/ascclemens/sqpack-rs", features = ["read", "write"] }
tempfile = "3" tempfile = "3"
thiserror = "1" thiserror = "1"
zip = { version = "0.6", default-features = false, features = ["deflate"] } zip = { version = "0.6", default-features = false, features = ["deflate"] }
sqpack = { git = "https://git.anna.lgbt/ascclemens/sqpack-rs", features = ["read", "write"] }
[dev-dependencies] [dev-dependencies]
criterion = "0.4" criterion = "0.4"
base64 = "0.13" data-encoding = "2"
sha3 = "0.10" sha3 = "0.10"
tempfile = "3" tempfile = "3"

View File

@ -78,7 +78,7 @@ pub fn main() {
// //
// all_files.sort_unstable_by_key(|&file| file.mod_offset); // all_files.sort_unstable_by_key(|&file| file.mod_offset);
// //
// let mut buf = [0; 4092]; // let mut buf = [0; 4096];
// for file in all_files { // for file in all_files {
// data_file.read = 0; // data_file.read = 0;
// let path = &file.full_path; // let path = &file.full_path;

View File

@ -55,7 +55,7 @@ pub fn main() {
std::io::copy(&mut temp, &mut sha).unwrap(); std::io::copy(&mut temp, &mut sha).unwrap();
temp.seek(SeekFrom::Start(0)).unwrap(); temp.seek(SeekFrom::Start(0)).unwrap();
let hash = sha.finalize_reset(); let hash = sha.finalize_reset();
let hash = base64::encode_config(&*hash, base64::URL_SAFE_NO_PAD); let hash = data_encoding::BASE64URL_NOPAD.encode(&*hash);
let new = !hashes.contains_key(&hash); let new = !hashes.contains_key(&hash);
let saved = SavedFile { let saved = SavedFile {
game_path: file.file.full_path.clone(), game_path: file.file.full_path.clone(),

View File

@ -369,7 +369,7 @@ impl<R: Read> TtmpExtractor<R> {
(header.compressed_size as u64, read) (header.compressed_size as u64, read)
}; };
if (header.size as usize + read as usize) < size as usize { if (header.size as usize + read as usize) < size {
let to_skip = size let to_skip = size
- header.size as usize - header.size as usize
- read as usize; - read as usize;