Merge pull request #202 from GingerAvalanche/partial-language-merge

Fix partial language merging
NiceneNerd · Aug 7, 2024 · f5ddbd6 · f5ddbd6
2 parents 40a977e + 193c2b4
commit f5ddbd6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/crates/uk-manager/src/mods.rs b/crates/uk-manager/src/mods.rs
@@ -318,10 +318,14 @@ impl Manager {
         self.mods().filter(|mod_| {
             match mod_.manifest() {
                 Ok(manifest) => {
-                    !ref_manifest
-                        .content_files
-                        .is_disjoint(&manifest.content_files)
+                    let languages = manifest.languages();
+                    !ref_manifest.content_files.is_disjoint(&manifest.content_files)
                         || !ref_manifest.aoc_files.is_disjoint(&manifest.aoc_files)
+                        || (
+                            ref_manifest.languages()
+                                .iter()
+                                .any(|l| languages.contains(l))
+                        )
                 }
                 Err(_) => false,
             }

diff --git a/crates/uk-mod/src/lib.rs b/crates/uk-mod/src/lib.rs
@@ -8,8 +8,7 @@ use anyhow_ext::Context;
 use serde::{Deserialize, Serialize};
 use smartstring::alias::String;
 use uk_content::{
-    prelude::Endian,
-    util::{HashSet, IndexMap},
+    constants::Language, prelude::Endian, util::{HashSet, IndexMap}
 };
 pub mod pack;
 pub mod unpack;
@@ -26,6 +25,19 @@ pub struct Manifest {
 }
 
 impl Manifest {
+    pub fn languages(&self) -> Vec<Language> {
+        self.content_files
+            .iter()
+            .filter_map(|file| {
+                if let Some(lang) = Language::from_path(Path::new(file.as_str())) {
+                    Some(lang)
+                } else {
+                    None
+                }
+            })
+            .collect::<Vec<_>>()
+    }
+
     pub fn resources(&self) -> impl Iterator<Item = String> + '_ {
         self.content_files
             .iter()

diff --git a/crates/uk-mod/src/unpack.rs b/crates/uk-mod/src/unpack.rs
@@ -537,10 +537,9 @@ impl ModUnpacker {
                 .collect();
         }
         let mut modded_langs: IndexSet<Language> = Default::default();
-        for lang in Language::iter() {
-            if content_files.remove(&lang.bootup_path()) {
-                modded_langs.insert(*lang);
-            }
+        for lang in self.mods.iter().flat_map(|m| m.manifest.languages()) {
+            modded_langs.insert(lang);
+            content_files.remove(&lang.bootup_path());
         }
         let (content, aoc) = platform_prefixes(self.endian);
         let total = content_files.len() + aoc_files.len();