Merge #4123 Allow string "Harmony" in DLL parent folder names

KSP-CKAN · Jul 11, 2024 · 1b5948f · 1b5948f
2 parents ab683b7 + da70286
commit 1b5948f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,6 +57,7 @@ All notable changes to this project will be documented in this file.
 - [Netkan] Omit duplicate inflation warnings in queue (#4071 by: HebaruSan)
 - [Build] Refactor + Modernise Actions (#4082, #4088, #4089, #4091, #4093, #4094, #4095, #4117 by: techman83, HebaruSan; reviewed: HebaruSan)
 - [Multiple] Translation updates from Crowdin (#4105 by: vinix38, frankieorabona, ambition, Francesco Ricina, S.O.2; reviewed: HebaruSan)
+- [Netkan] Allow string "Harmony" in DLL parent folder names (#4123 by: HebaruSan)
 
 ## v1.34.4 (Niven)
 

diff --git a/Netkan/Validators/HarmonyValidator.cs b/Netkan/Validators/HarmonyValidator.cs
@@ -37,7 +37,8 @@ public void Validate(Metadata metadata)
 
                     var harmonyDLLs = _moduleService.GetPlugins(mod, zip, inst)
                         .Select(instF => instF.source.Name)
-                        .Where(f => f.IndexOf("Harmony", StringComparison.InvariantCultureIgnoreCase) != -1)
+                        .Where(f => f.IndexOf("Harmony", Math.Max(0, f.LastIndexOf('/')),
+                                              StringComparison.InvariantCultureIgnoreCase) != -1)
                         .OrderBy(f => f)
                         .ToList();
                     bool bundlesHarmony   = harmonyDLLs.Any();