Update 3.5.16

vektor9999 · Mar 27, 2024 · 9405eca · 9405eca
1 parent bc63b2f
commit 9405eca
Show file tree

Hide file tree

Showing 12 changed files with 147 additions and 79 deletions.
diff --git a/Vcc.Nolvus.Core/Interfaces/IModOrganizer.cs b/Vcc.Nolvus.Core/Interfaces/IModOrganizer.cs
@@ -4,10 +4,13 @@
 using System.Text;
 using System.Diagnostics;
 using System.Threading.Tasks;
+using Vcc.Nolvus.Core.Misc;
 
 namespace Vcc.Nolvus.Core.Interfaces
 {
     public interface IModOrganizer : ISoftware, IModsContainer
-    {        
+    {
+        Task<List<ModObject>> GetModsMetaData(string Profile, Action<string, int> Progress = null);
+        List<string> GetProfiles();
     }
 }
diff --git a/Vcc.Nolvus.Core/Interfaces/IModsContainer.cs b/Vcc.Nolvus.Core/Interfaces/IModsContainer.cs
@@ -9,6 +9,6 @@ namespace Vcc.Nolvus.Core.Interfaces
 {
     public interface IModsContainer
     {
-        Task<List<ModObject>> GetModsMetaData(Action<string, int> Progress = null);
+        Task<List<ModObject>> GetModsMetaData(Action<string, int> Progress = null);        
     }
 }
diff --git a/Vcc.Nolvus.Core/Misc/ModObject.cs b/Vcc.Nolvus.Core/Misc/ModObject.cs
@@ -78,7 +78,7 @@ public override string ToString()
     public class ModObjectList
     {
         private List<ModObject> _List = new List<ModObject>();
-
+        public string Profile { get; set; }
         public int AddedModsCount
         {
             get { return _List.Where(x => x.Status == ModObjectStatus.CustomInstalled).ToList().Count; }

diff --git a/Vcc.Nolvus.Dashboard/Frames/Instance/InstanceDetailFrame.Designer.cs b/Vcc.Nolvus.Dashboard/Frames/Instance/InstanceDetailFrame.Designer.cs
diff --git a/Vcc.Nolvus.Dashboard/Frames/Instance/InstanceDetailFrame.cs b/Vcc.Nolvus.Dashboard/Frames/Instance/InstanceDetailFrame.cs
@@ -33,6 +33,7 @@ namespace Vcc.Nolvus.Dashboard.Frames.Instance
     public partial class InstanceDetailFrame : DashboardFrame
     {
         private ModObjectList ModListStatus = new ModObjectList();
+        private string _CurrentProfile;
 
         public InstanceDetailFrame()
         {
@@ -66,6 +67,14 @@ public InstanceDetailFrame(IDashboard Dashboard, FrameParameters Params)
 
         }
 
+        private string SelectedProfile
+        {
+            get
+            {
+                return DrpDwnLstProfiles.SelectedValue.ToString();
+            }
+        }
+
         protected override async Task OnLoadedAsync()
         {
             try
@@ -75,23 +84,9 @@ protected override async Task OnLoadedAsync()
                 LblHeader.Text = Instance.Name + " v" + Instance.Version;
                 ServiceSingleton.Dashboard.Info("Instance mods for " + Instance.Name + " v" + Instance.Version);
 
-                LoadGrids(await LoadModStatus());
-
-                if (ModListStatus.HasMods)
-                {
-                    if (ModListStatus.AddedModsCount > 0 || ModListStatus.RemovedModsCount > 0)
-                    {
-                        PnlHeader.BackColor = Color.FromArgb(255, 0, 0);
-                        LblHeader.Text += " - Errors Detected";
-                    }
-                    else if (ModListStatus.VersionMismatchCount > 0)
-                    {
-                        PnlHeader.BackColor = Color.FromArgb(255, 128, 0);
-                        LblHeader.Text += " - Warning Detected";
-                    }
-                }
-
-
+                DrpDwnLstProfiles.Visible = false;
+                DrpDwnLstProfiles.DataSource = ServiceSingleton.Packages.ModOrganizer2.GetProfiles();
+                DrpDwnLstProfiles.SelectedIndex = 0;                
             }
             catch(Exception ex)
             {
@@ -169,7 +164,7 @@ public async Task<ModObjectList> LoadModStatus()
                         ServiceSingleton.Dashboard.Status("Loading mods...");
 
                         ModListStatus = await ServiceSingleton.CheckerService.CheckModList(                            
-                            await ServiceSingleton.SoftwareProvider.ModOrganizer2.GetModsMetaData((s, p) =>
+                            await ServiceSingleton.SoftwareProvider.ModOrganizer2.GetModsMetaData(SelectedProfile, (s, p) =>
                             {
                                 ServiceSingleton.Dashboard.Status(string.Format("{0} ({1}%)", s, p));
                                 ServiceSingleton.Dashboard.Progress(p);
@@ -183,7 +178,9 @@ await ServiceSingleton.Packages.GetModsMetaData((s, p) =>
                             {
                                 ServiceSingleton.Dashboard.Status(s);
                             }
-                        );                                                                                             
+                        );
+
+                        ModListStatus.Profile = SelectedProfile;
 
                         return ModListStatus;
                     }
@@ -390,5 +387,31 @@ await ServiceSingleton.Report.GenerateReportToPdf(ModListStatus, Properties.Reso
             {                                
             }
         }
+
+        private async void DrpDwnLstProfiles_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (_CurrentProfile != SelectedProfile)
+            {
+                _CurrentProfile = SelectedProfile;
+
+                LoadGrids(await LoadModStatus());
+
+                if (ModListStatus.HasMods)
+                {
+                    if (ModListStatus.AddedModsCount > 0 || ModListStatus.RemovedModsCount > 0)
+                    {
+                        PnlHeader.BackColor = Color.FromArgb(255, 0, 0);
+                        LblHeader.Text += " - Errors Detected";
+                    }
+                    else if (ModListStatus.VersionMismatchCount > 0)
+                    {
+                        PnlHeader.BackColor = Color.FromArgb(255, 128, 0);
+                        LblHeader.Text += " - Warning Detected";
+                    }
+                }
+
+                DrpDwnLstProfiles.Visible = true;
+            }
+        }
     }
 }
diff --git a/Vcc.Nolvus.Dashboard/Properties/AssemblyInfo.cs b/Vcc.Nolvus.Dashboard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.5.15")]
-[assembly: AssemblyFileVersion("3.5.15.0")]
+[assembly: AssemblyVersion("3.5.16")]
+[assembly: AssemblyFileVersion("3.5.16.0")]
diff --git a/Vcc.Nolvus.Package/Files/ModFile.cs b/Vcc.Nolvus.Package/Files/ModFile.cs
@@ -162,7 +162,7 @@ protected virtual async Task DoDownload(string Link, DownloadProgressChangedHand
             try
             {
                 ServiceSingleton.Logger.Log(string.Format("Downloading file {0}", FileName));
-                await ServiceSingleton.Files.DownloadFile(Link, Path.Combine(ServiceSingleton.Folders.DownloadDirectory, this.FileName), OnProgress);
+                await ServiceSingleton.Files.DownloadFile(Link, Path.Combine(ServiceSingleton.Folders.DownloadDirectory, FileName), OnProgress);
             }
             catch (Exception ex)
             {                

diff --git a/Vcc.Nolvus.Package/Mods/InstallableElement.cs b/Vcc.Nolvus.Package/Mods/InstallableElement.cs
@@ -67,12 +67,12 @@ public ModProgress Progress
             {
                 if (_p == null)
                 {
-                    _p = new ModProgress();
-
-                    _p.Name = Name + " by " + Author + " (v " + Version + ")";
-                    _p.Status = "Initializing";
-                    _p.Mbs = 0;
-                    _p.Image = FormatImage();
+                    _p = new ModProgress() {
+                        Name = Name + " by " + Author + " (v " + Version + ")",
+                        Status = "Initializing",
+                        Mbs = 0,
+                        Image = FormatImage()
+                    };                   
                 }
 
                 return _p;

diff --git a/Vcc.Nolvus.Package/Mods/Mod.cs b/Vcc.Nolvus.Package/Mods/Mod.cs
@@ -174,7 +174,7 @@ public override string ToString()
         }
         protected override void CreateElementIni()
         {
-            if (this.Display)
+            if (Display)
             {
                 File.WriteAllText(Path.Combine(MoDirectoryFullName, "meta.ini"), string.Format(MetaIni, "0", Version, GetInstallFileName().Replace("\\", "/"), "0"));
             }            
@@ -265,7 +265,7 @@ protected override async Task DoUnpack()
                         ServiceSingleton.Logger.Log(string.Format("Unpacking mod {0}", Name));
                         var Counter = 0;
 
-                        foreach (BsaUnPacking BSA in this.Bsas)
+                        foreach (BsaUnPacking BSA in Bsas)
                         {
                             await BSA.UnPack(Path.Combine(ServiceSingleton.Folders.ExtractDirectory, ExtractSubDir));
 
@@ -333,7 +333,12 @@ protected override async Task DoPatch()
                     if (Patcher != null)
                     {
                         ServiceSingleton.Logger.Log(string.Format("Patching mod {0}", Name));
-                        await Patcher.PatchFiles(MoDirectoryFullName, ServiceSingleton.Instances.WorkingInstance.StockGame, DownloadingProgress, ExtractingProgress, PatchingProgress);
+
+                        await Patcher.PatchFiles(MoDirectoryFullName, 
+                            ServiceSingleton.Instances.WorkingInstance.StockGame, 
+                            DownloadingProgress, 
+                            ExtractingProgress, 
+                            PatchingProgress);
                     }                                        
                 }
                 catch (Exception ex)