[Minor] removing saving button in modsource page, improving logging

Author: remyCases

Controls/ModInfos.xaml.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -36,16 +38,19 @@ private async void Save_Click(object sender, EventArgs e)
 
             bool patchSucess = false;
 
+            Stopwatch watch = Stopwatch.StartNew();
             try
             {
                 ModLoader.PatchFile();
+                long elapsedMs = watch.ElapsedMilliseconds;
+                Main.Instance.LogModListStatus();
+                Log.Information("Patching lasts {{{0}}} ms", elapsedMs);
                 Log.Information("Successfully patch vanilla");
                 patchSucess = true;
-                Main.Instance.LogModList();
             }
             catch (Exception ex)
             {
-                Main.Instance.LogModList();
+                Main.Instance.LogModListStatus();
                 Log.Error(ex, "Something went wrong");
                 Log.Information("Failed patching vanilla");
                 MessageBox.Show(ex.ToString(), Application.Current.FindResource("SaveDataWarning").ToString());

Controls/ModSourceInfos.xaml

@@ -19,13 +19,6 @@
                         <ImageBrush x:Key="OverSource"  ImageSource="/Resources/Sprites/open_over.png"/>
                     </controls:MyToggleButton.Resources>
                 </controls:MyToggleButton>
-                <controls:MyToggleButton ImageSource="/Resources/Sprites/save.png" Click="Save_Click" ToolTip="Save Data File"
-                         Margin="64,0,0,0">
-                    <controls:MyToggleButton.Resources>
-                        <ImageBrush x:Key="DownSource"  ImageSource="/Resources/Sprites/save_down.png"/>
-                        <ImageBrush x:Key="OverSource"  ImageSource="/Resources/Sprites/save_over.png"/>
-                    </controls:MyToggleButton.Resources>
-                </controls:MyToggleButton>
                 <Border BorderBrush="#43424D" BorderThickness="2"/>
             </Grid>
             <controls:MyItemsControl MaxHeight="672" Height="672" x:Name="SourceList"

Controls/ModSourceInfos.xaml.cs

@@ -23,33 +23,5 @@ private async void Open_Click(object sender, EventArgs e)
             await DataLoader.DoOpenDialog();
             Main.Instance.Refresh();
         }
-        private async void Save_Click(object sender, EventArgs e)
-        {
-            if (DataLoader.data.FORM == null)
-            {
-                MessageBox.Show(Application.Current.FindResource("LoadDataWarning").ToString());
-                return;
-            }
-
-            bool patchSucess = false;
-
-            try 
-            {
-                ModLoader.PatchFile();
-                Log.Information("Successfully patch vanilla");
-                patchSucess = true;
-                Main.Instance.LogModList();
-            }
-            catch(Exception ex)
-            {
-                Main.Instance.LogModList();
-                Log.Error(ex, "Something went wrong");
-                Log.Information("Failed patching vanilla");
-                MessageBox.Show(ex.ToString(), Application.Current.FindResource("SaveDataWarning").ToString());
-            }
-
-            if (patchSucess) await DataLoader.DoSaveDialog();
-            Main.Instance.Refresh();
-        }
     }
 }

Main.xaml.cs

@@ -131,27 +131,31 @@ private void SetInitialSize()
             }
         }
 
-        public void LogModList()
+        public void LogModListStatus()
         {
             foreach (ModFile modFile in ModPage.Mods.Where(x => x.Enabled))
             {
-                string statusMessage = "";
-                switch (modFile.PatchStatus)
-                {
-                    case PatchStatus.Patching:
-                        statusMessage = "Patching failed";
-                        break;
+                LogModStatus(modFile);
+            }
+        }
+        public static void LogModStatus(ModFile modFile)
+        {
+            string statusMessage = "";
+            switch (modFile.PatchStatus)
+            {
+                case PatchStatus.Patching:
+                    statusMessage = "Patching failed";
+                    break;
 
-                    case PatchStatus.Success:
-                        statusMessage = "Patching succeeded";
-                        break;
+                case PatchStatus.Success:
+                    statusMessage = "Patching succeeded";
+                    break;
 
-                    case PatchStatus.None:
-                        statusMessage = "Waiting to be patched";
-                        break;
-                }
-                Log.Warning("Patching {{{2}}} for {{{0}}} {{{1}}}", modFile.Name, modFile.Version, statusMessage);
+                case PatchStatus.None:
+                    statusMessage = "Waiting to be patched";
+                    break;
             }
+            Log.Warning("Patching {{{2}}} for {{{0}}} {{{1}}}", modFile.Name, modFile.Version, statusMessage);
         }
         private void MyToggleButton_Checked(object sender, EventArgs e)
         {

ModLoader.cs

@@ -172,7 +172,6 @@ public static void PatchMods()
             List<ModFile> mods = ModInfos.Instance.Mods;
             Menus = new();
 
-            Stopwatch watch = Stopwatch.StartNew();
             foreach (ModFile mod in mods)
             {
                 if (!mod.Enabled) continue;
@@ -192,14 +191,11 @@ public static void PatchMods()
                 TextureLoader.LoadTextures(mod);
                 mod.instance.PatchMod();
                 mod.PatchStatus = PatchStatus.Success;
+                Main.LogModStatus(mod);
             }
             Msl.AddDisclaimerRoom(Credits.Select(x => x.Item1).ToArray(), Credits.SelectMany(x => x.Item2).Distinct().ToArray());
             Msl.ChainDisclaimerRooms(Disclaimers);
             Msl.CreateMenu(Menus);
-
-            watch.Stop();
-            long elapsedMs = watch.ElapsedMilliseconds;
-            Log.Information("Patching lasts {{{0}}} ms", elapsedMs);
         }
         public static void PatchFile()
         {