redstrate/physis
1
Fork 0
mirror of https://github.com/redstrate/Physis.git synced 2025-07-03 01:07:46 +00:00
Code Activity

Fix extracting expansion files

Browse source 
I broke this when changing a split to split_once I think, and it stayed
broken longer than it ever should have. To stop that from happening
again, more tests are added to catch this.
This commit is contained in:
Joshua Goins 2025-06-21 09:40:29 -04:00
parent 5002e4a590
commit 67a23e59bf
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/gamedata.rs
View file

@ -126,6 +126,8 @@ impl GameData {
fn get_dat_file(&self, path: &str, chunk: u8, data_file_id: u32) -> Option<SqPackData> { fn get_dat_file(&self, path: &str, chunk: u8, data_file_id: u32) -> Option<SqPackData> {
let (repository, category) = self.parse_repository_category(path).unwrap(); let (repository, category) = self.parse_repository_category(path).unwrap();
dbg!(repository);
let dat_path: PathBuf = [ let dat_path: PathBuf = [
self.game_directory.clone(), self.game_directory.clone(),
"sqpack".to_string(), "sqpack".to_string(),
@ -135,6 +137,8 @@ impl GameData {
.iter() .iter()
.collect(); .collect();
dbg!(&dat_path);
SqPackData::from_existing(dat_path.to_str()?) SqPackData::from_existing(dat_path.to_str()?)
} }
@ -199,17 +203,18 @@ impl GameData {
return None; return None;
} }
let tokens = path.split_once('/')?; let tokens: Vec<&str> = path.split('/').collect();
let repository_token = tokens.1;
// Search for expansions
let repository_token = tokens[1];
for repository in &self.repositories { for repository in &self.repositories {
if repository.name == repository_token { if repository.name == repository_token {
return Some((repository, string_to_category(tokens.0)?)); return Some((repository, string_to_category(tokens[0])?));
} }
} }
Some((&self.repositories[0], string_to_category(tokens.0)?)) // Fallback to ffxiv
Some((&self.repositories[0], string_to_category(tokens[0])?))
} }
fn get_index_filenames(&self, path: &str) -> Option<Vec<(String, u8)>> { fn get_index_filenames(&self, path: &str) -> Option<Vec<(String, u8)>> {
@ -424,7 +429,7 @@ impl GameData {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::repository::Category::EXD; use crate::repository::Category::*;
use super::*; use super::*;
@ -450,10 +455,24 @@ mod tests {
fn repository_and_category_parsing() { fn repository_and_category_parsing() {
let data = common_setup_data(); let data = common_setup_data();
// fallback to ffxiv
assert_eq!( assert_eq!(
data.parse_repository_category("exd/root.exl").unwrap(), data.parse_repository_category("exd/root.exl").unwrap(),
(&data.repositories[0], EXD) (&data.repositories[0], EXD)
); );
// ex1
assert_eq!(
data.parse_repository_category("bg/ex1/01_roc_r2/twn/r2t1/level/planevent.lgb")
.unwrap(),
(&data.repositories[1], Background)
);
// ex2
assert_eq!(
data.parse_repository_category("bg/ex2/01_gyr_g3/fld/g3fb/level/planner.lgb")
.unwrap(),
(&data.repositories[2], Background)
);
// invalid but should still parse I guess
assert!( assert!(
data.parse_repository_category("what/some_font.dat") data.parse_repository_category("what/some_font.dat")
.is_none() .is_none()