fix: error setting new sub patch id
Some checks failed
Release Build / build (push) Has been cancelled

This commit is contained in:
2025-08-17 21:14:07 +08:00
parent 4ca65979c9
commit 1686114181
4 changed files with 18 additions and 8 deletions

View File

@@ -405,7 +405,7 @@ I'm sure I've checked the list, press Enter to continue"#,
let new_patch_id = max_patch_id + 1;
// Create a new chunk name
let output_chunk_name = chunk_name.with_sub_patch(new_patch_id);
let output_chunk_name = chunk_name.set_sub_patch(new_patch_id);
// Add the new patch to the chunk list so it can be found in subsequent processing
all_chunk_names.push(output_chunk_name.clone());

View File

@@ -123,10 +123,20 @@ impl ChunkName {
})
}
/// Add a sub patch component with the given ID
pub fn with_sub_patch(&self, patch_id: u32) -> Self {
/// Add or replace a sub patch component with the given ID
pub fn set_sub_patch(&self, patch_id: u32) -> Self {
let mut new_components = self.components.clone();
new_components.push(ChunkComponent::SubPatch(patch_id));
// Check if SubPatch already exists and replace it
if let Some(pos) = new_components
.iter()
.position(|c| matches!(c, ChunkComponent::SubPatch(_)))
{
new_components[pos] = ChunkComponent::SubPatch(patch_id);
} else {
new_components.push(ChunkComponent::SubPatch(patch_id));
}
Self {
components: new_components,
}
@@ -289,9 +299,9 @@ mod tests {
}
#[test]
fn test_with_sub_patch() {
fn test_set_sub_patch() {
let base = ChunkName::try_from_str("re_chunk_000.pak.sub_001.pak").unwrap();
let with_patch = base.with_sub_patch(99);
let with_patch = base.set_sub_patch(99);
assert_eq!(with_patch.major_id(), Some(0));
assert_eq!(with_patch.sub_id(), Some(1));