remove logs and modify logic that might cause problem

zzzz465 · Jan 17, 2020 · 458582e · 458582e
1 parent 4aecdd4
commit 458582e
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 24 deletions.
diff --git a/Refactored/MetaHeaderUtility.cs b/Refactored/MetaHeaderUtility.cs
@@ -43,23 +43,31 @@ public static void EndReading()
             CurrnetUsingFilePath = null;
         }
 
-        public static string GetVersion(int index)
+        public static string GetVersion(string modName)
         {
-            string version;
+            string version = "Unknown";
             if(xdoc == null)
                 throw new Exception("invoke BeginReading before using this method");
             try
             {
-                version = xdoc.Root.Element("meta")?.Element(MOD_META_DATAS)?.Elements().ElementAt(index)?.Element(VERSION_NODENAME)?.Value ?? "Unknown";
+                //version = xdoc.Root.Element("meta")?.Element(MOD_META_DATAS)?.Elements().ElementAt(index)?.Element(VERSION_NODENAME)?.Value ?? "Unknown";
+                var ModMetaHeaders = xdoc.Root.Element("meta")?.Element(MOD_META_DATAS);
+                if(ModMetaHeaders != null)
+                {
+                    version = (from node in ModMetaHeaders.Elements()
+                               let modNameInNode = node.Element("ModName")?.Value
+                               where string.Equals(modNameInNode, modName)
+                               select node.Element(VERSION_NODENAME)?.Value).FirstOrDefault() ?? "Unknown";
+                }
             }
-            catch
+            catch(Exception ex)
             {
-                version = "Unknown";
+                Log.Warning(ex.ToString());
             }
             return version;
         }
 
-        public static void SetVersions(List<Pair<string, string>> datas)
+        public static void SetVersions(List<ModMetaHeader> metaHeaders)
         {
             if(xdoc == null)
                 throw new Exception("Invoke BeginReading before using this method");
@@ -69,14 +77,14 @@ public static void SetVersions(List<Pair<string, string>> datas)
             modVersionsNode.RemoveAll();
             if(meta.Element(MOD_META_DATAS) == null)
                 throw new Exception("F");
-            for(int i = 0; i < datas.Count; i++)
+            for(int i = 0; i < metaHeaders.Count; i++)
             {
-                var data = datas[i];
+                var data = metaHeaders[i];
                 var liNode = new XElement("li");
-                liNode.Add(new XElement("ModName") { Value = data.First });
-                liNode.Add(new XElement(VERSION_NODENAME) { Value = data.Second });
+                liNode.Add(new XElement("ModName") { Value = data.ModName });
+                liNode.Add(new XElement(VERSION_NODENAME) { Value = data.Version });
                 modVersionsNode.Add(liNode);
-                Log.Message($"set mod {data.First} 's version to {data.Second}");
+                Log.Message($"set mod {data.ModName} 's version to {data.Version}");
             }
         }
 
@@ -114,14 +122,14 @@ public static void UpdateModVersionMetaHeader(string fileName)
         {
             string filePath = GenFilePaths.FilePathForSavedGame(fileName);
             MetaHeaderUtility.BeginReading(filePath);
-            List<Pair<string,string>> ModMetaDatas = new List<Pair<string, string>>();
+            List<ModMetaHeader> metaHeaders = new List<ModMetaHeader>();
             foreach(var modContentPack in LoadedModManager.RunningMods)
             {
                 var metadata = modContentPack.GetMetaData();
                 var version = MetaHeaderUtility.GetVersionFromManifestFile(modContentPack);
-                ModMetaDatas.Add(new Pair<string, string>(metadata.Name, version));
+                metaHeaders.Add(new ModMetaHeader() { ModName = metadata.Name, Version = version });
             }
-            MetaHeaderUtility.SetVersions(ModMetaDatas);
+            MetaHeaderUtility.SetVersions(metaHeaders);
             MetaHeaderUtility.EndReading();
         }
 
@@ -154,4 +162,10 @@ static void NoManifestFileInModWarning(string modName)
 
         }
     }
+
+    public struct ModMetaHeader
+    {
+        public string ModName;
+        public string Version;
+    }
 }
diff --git a/Refactored/ModContentPackExtension.cs b/Refactored/ModContentPackExtension.cs
@@ -51,7 +51,8 @@ public static List<Mod> GetModsFromSave()
                 for(int i = 0; i < modnameList; i++)
                 {
                     var mod = new Mod(ScribeMetaHeaderUtility.loadedModIdsList[i], ScribeMetaHeaderUtility.loadedModNamesList[i], i);
-                    mod.Version = MetaHeaderUtility.GetVersion(i);
+                    string modName = mod.ModName;
+                    mod.Version = MetaHeaderUtility.GetVersion(modName);
                     saveMods.Add(mod);
                 }
                 MetaHeaderUtility.EndReading();

diff --git a/Refactored/ModMismatchWindow.cs b/Refactored/ModMismatchWindow.cs
@@ -38,15 +38,12 @@ void SetDrawerFonts()
             //renderer.ModDescriptionStyle = Text.CurFontStyle;
             //renderer.ModStateStyle = Text.CurFontStyle;
             ////renderer.ModVersionStyle = new GUIStyle(Text.CurFontStyle) { fontSize = Text.CurFontStyle.fontSize - 3 };
-
-            Log.Message(string.Format("DescriptionStyle Font size : {0}", renderer.ModDescriptionStyle.fontSize));
         }
 
         void InitializePair()
         {
             List<Mod> activeMods = ModContentPackExtension.GetModsFromActive();
             List<Mod> saveMods = ModContentPackExtension.GetModsFromSave();
-            Log.Message($"activeMods count : {activeMods.Count} | saveMods count : {saveMods.Count}");
             var result = formatter.GetFormattedModPairs(saveMods, activeMods);
             pairs = result.ToList();
         }

diff --git a/Refactored/UITester.cs b/Refactored/UITester.cs
@@ -4,24 +4,24 @@
 
 namespace Madeline.ModMismatchFormatter
 {
-    public class UITester : MonoBehaviour
+    public class UITester// : MonoBehaviour
     {
         iOrderFormatter formatter;
-        iCompareRectRenderer renderer;
+        //iCompareRectRenderer renderer;
         bool initialized = false;
         List<ModPair> result;
         private void Awake() 
         {
-            renderer = new CompareRectRenderer();
-            formatter = new ModPresenter();
-            Test();
+            //renderer = new CompareRectRenderer();
+            //formatter = new ModPresenter();
+            //Test();
         }
 
         private void OnGUI() 
         {
             if(initialized)
             {
-                renderer.Render(new Rect(0, 0, 1200, 800), result);
+                //renderer.Render(new Rect(0, 0, 1200, 800), result);
             }    
         }