lifegpc/msg-tool
1
0
Fork 0
mirror of https://github.com/lifegpc/msg-tool.git synced 2026-06-19 18:34:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reduce memory usage

Browse Source
This commit is contained in:
lifegpc
2026-03-26 08:32:16 +08:00
parent f103b313a1
commit 841dc7e79d
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ext/psb.rs
View File

@@ -1598,24 +1598,16 @@ impl PsbReaderExt for PsbReader {
if signature != PSB_SIGNATURE { if signature != PSB_SIGNATURE {
return Err(anyhow::anyhow!("Failed to open PSB: invalid signature")); return Err(anyhow::anyhow!("Failed to open PSB: invalid signature"));
} }
let normal_file = PsbReader::open_psb(&mut stream);
stream.seek(SeekFrom::Start(0))?;
let mut raw = Vec::new();
stream.read_to_end(&mut raw)?;
let normal_file = PsbReader::open_psb(MemReader::new(raw.clone()));
match normal_file { match normal_file {
Ok(mut file) => file Ok(mut file) => file
.load() .load()
.map_err(|e| anyhow::anyhow!("Failed to load PSB: {:?}", e)), .map_err(|e| anyhow::anyhow!("Failed to load PSB: {:?}", e)),
Err(err) => { Err(err) => {
let encryption = if raw.len() >= 8 { stream.seek(SeekFrom::Start(0))?;
u16::from_le_bytes([raw[6], raw[7]]) let encryption = stream.peek_u16_at(6).unwrap_or(0);
} else {
0
};
if encryption != 0 { if encryption != 0 {
load_psb_dullahan(MemReader::new(raw)).map_err(|fallback_err| { load_psb_dullahan(&mut stream).map_err(|fallback_err| {
anyhow::anyhow!( anyhow::anyhow!(
"Failed to open PSB: {:?}; fallback failed: {}", "Failed to open PSB: {:?}; fallback failed: {}",
err, err,