Added IsInModule

BUTR · Sep 14, 2023 · 5694b3a · 5694b3a
1 parent aee6995
commit 5694b3a
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Bannerlord.BUTR.Shared/Helpers/ModuleInfoHelper.cs b/src/Bannerlord.BUTR.Shared/Helpers/ModuleInfoHelper.cs
@@ -381,10 +381,18 @@ public static bool IsModuleAssembly(ModuleInfoExtendedWithMetadata loadedModule,
             if (assembly.IsDynamic || string.IsNullOrWhiteSpace(assembly.CodeBase))
                 return false;
 
+            return IsInModule(loadedModule, assembly.CodeBase);
+        }
+
+        public static bool IsInModule(ModuleInfoExtendedWithMetadata loadedModule, string filePath)
+        {
+            if (string.IsNullOrWhiteSpace(filePath))
+                return false;
+
             var modulePath = new Uri(Path.GetFullPath(loadedModule.Path));
             var moduleDirectory = Path.GetFileName(loadedModule.Path);
 
-            var assemblyPath = new Uri(assembly.CodeBase);
+            var assemblyPath = new Uri(filePath);
             var relativePath = modulePath.MakeRelativeUri(assemblyPath);
             return relativePath.OriginalString.StartsWith(moduleDirectory);
         }