Fixed patching not preserving encryption flag of target mix

This commit is contained in:
2026-01-31 18:24:47 -06:00
parent 70d4e0c40f
commit ddbec8d72c

View File

@@ -746,6 +746,8 @@ class W3DHub
end end
patch_entry = patch_mix.entries.find { |e| e.name.casecmp?(".w3dhub.patch") || e.name.casecmp?(".bhppatch") } patch_entry = patch_mix.entries.find { |e| e.name.casecmp?(".w3dhub.patch") || e.name.casecmp?(".bhppatch") }
patch_entry.read patch_entry.read
# "remove" patch meta file from patch before copying patch data
patch_mix.entries.delete(patch_entry)
patch_info = JSON.parse(patch_entry.blob, symbolize_names: true) patch_info = JSON.parse(patch_entry.blob, symbolize_names: true)
@@ -765,20 +767,15 @@ class W3DHub
patch_info[:updatedFiles].each do |file| patch_info[:updatedFiles].each do |file|
logger.debug(LOG_TAG) { " #{file}" } logger.debug(LOG_TAG) { " #{file}" }
patch = patch_mix.entries.find { |e| e.name.casecmp?(file) } patch_mix.entries.each do |entry|
target = target_mix.entries.find { |e| e.name.casecmp?(file) } target_mix.add_entry(entry: entry, replace: true)
if target
target_mix.entries[target_mix.entries.index(target)] = patch
else
target_mix.entries << patch
end end
end end
logger.info(LOG_TAG) { " Writing updated #{file_path}..." } if patch_info[:updatedFiles].size.positive? logger.info(LOG_TAG) { " Writing updated #{file_path}..." } if patch_info[:updatedFiles].size.positive?
temp_mix_path = "#{temp_path}/#{File.basename(file_path)}" temp_mix_path = "#{temp_path}/#{File.basename(file_path)}"
temp_mix = W3DHub::WWMix.new(path: temp_mix_path) temp_mix = W3DHub::WWMix.new(path: temp_mix_path, encrypted: target_mix.encrypted?)
target_mix.entries.each { |e| temp_mix.add_entry(entry: e) } target_mix.entries.each { |e| temp_mix.add_entry(entry: e, replace: true) }
unless temp_mix.save unless temp_mix.save
raise temp_mix.error_reason raise temp_mix.error_reason
end end