Fixed a bug with plugins marked as ESMs but labeled as ESPs and the inverse

Author: CGarrison89

ESPSharp/DataTypes/LoadOrderFormID.cs

@@ -18,7 +18,7 @@ public LoadOrderFormID(FormID fileFormID, ElderScrollsPlugin file)
                 fileIndex = (uint)(file.Masters.Count - 1);
 
             string masterName = file.Masters[(int)fileIndex];
-            ElderScrollsPlugin master = ElderScrollsPlugin.LoadedPlugins.FirstOrDefault(esp => esp.Name == masterName);
+            ElderScrollsPlugin master = ElderScrollsPlugin.LoadedPlugins.FirstOrDefault(esp => esp.FileName == masterName);
 
             if (master == null)
                 throw new Exception();

ESPSharp/ElderScrollsPlugin.cs

@@ -23,7 +23,6 @@ public class ElderScrollsPlugin : IDisposable
         public static Dictionary<uint, List<RecordView>> LoadedRecordViews = new Dictionary<uint, List<RecordView>>();        
         public static List<KeyValuePair<string, bool>> pluginLocations = new List<KeyValuePair<string, bool>>();
 
-        protected string name = "";
         public List<string> Masters = new List<string>();
         public RecordView Header;
         public List<Group> TopGroups = new List<Group>();
@@ -32,21 +31,21 @@ public class ElderScrollsPlugin : IDisposable
 
         protected MemoryMappedFile mmf;
 
-        public string Name
+        public string ProperName
         {
             get
             {
                 if (Header.Flags.HasFlag(RecordFlag.IsMasterFile))
-                    return name + ".esm";
+                    return Name + ".esm";
                 else
-                    return name + ".esp";
-            }
-            protected set
-            {
-                name = Path.GetFileNameWithoutExtension(value);
+                    return Name + ".esp";
             }
         }
 
+        public string Name { get; protected set; }
+
+        public string FileName { get; protected set; }
+
         public ElderScrollsPlugin()
         {
         }
@@ -69,8 +68,12 @@ public void Read(string source)
 
         public void WriteXML(string destinationFolder)
         {
-            Header.Record.WriteXML(Path.Combine(destinationFolder, "Header.xml"), this);
+            var headerLocation = Path.Combine(destinationFolder, "Header.xml");
+            Header.Record.WriteXML(headerLocation, this);
 //.Where(g => g.ToString() != "Interior Cells" && g.ToString() != "Worldspaces" && g.ToString() != "Dialog Topics")
+            var xml = XDocument.Load(headerLocation);
+            xml.Element("Record").Add(new XElement("FileName", FileName));
+            xml.Save(headerLocation);
 #if PARALLEL
             Parallel.ForEach(TopGroups, group =>
             {
@@ -91,12 +94,15 @@ public void WriteXML(string destinationFolder)
         public static ElderScrollsPlugin ReadXML(string sourceFolder)
         {
             ElderScrollsPlugin outPlug = new ElderScrollsPlugin();
-            outPlug.name = Path.GetDirectoryName(sourceFolder);
-            outPlug.Header = new RecordView(Path.Combine(sourceFolder, "Header.xml"));
+            var headerLocation = Path.Combine(sourceFolder, "Header.xml");
+            var xml = XDocument.Load(headerLocation);
+            outPlug.FileName = xml.Element("Record").Element("FileName").Value;
+            outPlug.Name = Path.GetDirectoryName(sourceFolder);
+            outPlug.Header = new RecordView(headerLocation);
 
             outPlug.ReadMasters();
 
-            outPlug.Masters.Add(outPlug.Name);
+            outPlug.Masters.Add(outPlug.FileName);
 
             foreach (var folder in Directory.EnumerateDirectories(sourceFolder, "*.*", SearchOption.TopDirectoryOnly))
             {
@@ -129,7 +135,8 @@ public void WriteBinary(ESPWriter writer)
 
         public void ReadBinary(string file)
         {
-            name = Path.GetFileNameWithoutExtension(file);
+            FileName = Path.GetFileName(file);
+            Name = Path.GetFileNameWithoutExtension(file);
             FileInfo fi = new FileInfo(file);
             mmf = MemoryMappedFile.CreateFromFile(file, FileMode.Open, Path.GetFileNameWithoutExtension(file), fi.Length, MemoryMappedFileAccess.Read);
 
@@ -142,7 +149,7 @@ public void ReadBinary(string file)
 
                 ReadMasters();
 
-                Masters.Add(Name);
+                Masters.Add(FileName);
 
                 while (reader.BaseStream.Position < reader.BaseStream.Length)
                 {
@@ -200,7 +207,7 @@ protected void ReadMasters()
             {
                 foreach (var masterData in headRec.MasterFiles)
                 {
-                    ElderScrollsPlugin master = ElderScrollsPlugin.LoadedPlugins.FirstOrDefault(esp => esp.Name == masterData.FileName.Value);
+                    ElderScrollsPlugin master = ElderScrollsPlugin.LoadedPlugins.FirstOrDefault(esp => esp.FileName == masterData.FileName.Value);
 
                     if (master == null)
                     {

PluginDecompiler/Program.cs

@@ -61,9 +61,13 @@ static void Main(string[] args)
         {
             string outDir = Path.GetFileNameWithoutExtension(file);
             ElderScrollsPlugin plugin = new ElderScrollsPlugin();
+
             if (outDir == Path.GetFileName(file))
             {
-                plugin = ElderScrollsPlugin.ReadXML(file);
+                if (ElderScrollsPlugin.LoadedPlugins.Any(esp => esp.FileName == file))
+                    plugin = ElderScrollsPlugin.LoadedPlugins.First(esp => esp.FileName == file);
+                else
+                    plugin = ElderScrollsPlugin.ReadXML(file);
 
                 string outFile;
                 if (plugin.Header.Record.Flags.HasFlag(ESPSharp.Enums.Flags.RecordFlag.IsMasterFile))
@@ -86,7 +90,10 @@ static void Main(string[] args)
             }
             else
             {
-                plugin.ReadBinary(file);
+                if (ElderScrollsPlugin.LoadedPlugins.Any(esp => esp.FileName == file))
+                    plugin = ElderScrollsPlugin.LoadedPlugins.First(esp => esp.FileName == file);
+                else
+                    plugin.ReadBinary(file);
 
                 if (Directory.Exists(outDir))
                     Directory.Delete(outDir, true);
@@ -95,5 +102,6 @@ static void Main(string[] args)
                 plugin.WriteXML(outDir);
             }
         }
+        ;
     }
 }