Merge pull request #15 from basharast/main

Features filter fix
fadilfadz01 · Oct 25, 2024 · e91e871 · e91e871
2 parents 7eaf9b1 + f0c049f
commit e91e871
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 39 deletions.
diff --git a/Universal Updater/DownloadPackages.cs b/Universal Updater/DownloadPackages.cs
@@ -297,66 +297,66 @@ public static async Task<bool> OfflineUpdate(string[] folderFiles)
                 }
             }
 
-            if (filteredPackages.Count > 0)
+            // Features packages
+            foreach (var feature in Program.GlobalFeaturesList)
             {
-                // Features packages
-                foreach (var feature in Program.GlobalFeaturesList)
+                if (feature.ShouldPresent)
                 {
-                    if (feature.ShouldPresent)
+                    if (feature.State)
                     {
-                        if (feature.State)
+                        for (int i = 0; i < feature.FeaturePackages.Length; i++)
                         {
-                            for (int i = 0; i < feature.FeaturePackages.Length; i++)
+                            var requiredPackages = folderFiles.Where(j => j.IndexOf(feature.FeaturePackages[i].PackageName, StringComparison.OrdinalIgnoreCase) >= 0).FirstOrDefault();
+                            if (requiredPackages != null)
                             {
-                                var requiredPackages = folderFiles.Where(j => j.IndexOf(feature.FeaturePackages[i].PackageName, StringComparison.OrdinalIgnoreCase) >= 0).FirstOrDefault();
-                                if (requiredPackages != null)
+                                if (feature.FeaturePackages[i].ReplaceStock)
                                 {
-                                    if (feature.FeaturePackages[i].ReplaceStock)
+                                    // Ensure to remove stock on from the list
+                                    var stockName = feature.FeaturePackages[i].TargetStockName;
+                                    for (int j = 0; j < targetExtensionList.Length; j++)
                                     {
-                                        // Ensure to remove stock on from the list
-                                        var stockName = feature.FeaturePackages[i].TargetStockName;
-                                        for (int j = 0; j < targetExtensionList.Length; j++)
+                                        var checkName = stockName + targetExtensionList[j];
+                                        var packageRemoval = folderFiles.Where(a => a.IndexOf(checkName, StringComparison.OrdinalIgnoreCase) >= 0).FirstOrDefault();
+                                        if (packageRemoval != null)
                                         {
-                                            var checkName = stockName + targetExtensionList[j];
-                                            var packageRemoval = folderFiles.Where(a => a.IndexOf(checkName, StringComparison.OrdinalIgnoreCase) >= 0).FirstOrDefault();
-                                            if (packageRemoval != null)
+                                            if (filteredPackages.Remove(packageRemoval))
+                                            {
+                                                Program.WriteLine($"Stock ({stockName}) replaced with feature", ConsoleColor.DarkYellow);
+                                                Program.appendLog($"Package ({stockName}) replaced with feature ({feature.FeaturePackages[i].PackageName})\n");
+                                            }
+                                            else
                                             {
-                                                if (filteredPackages.Remove(packageRemoval))
-                                                {
-                                                    Program.WriteLine($"Stock ({stockName}) replaced with feature", ConsoleColor.DarkYellow);
-                                                    Program.appendLog($"Package ({stockName}) replaced with feature ({feature.FeaturePackages[i].PackageName})\n");
-                                                }
-                                                else
-                                                {
-                                                    Program.WriteLine($"Stock ({stockName}) is not presented in filtered list!", ConsoleColor.DarkYellow);
-                                                }
+                                                Program.WriteLine($"Stock ({stockName}) is not presented in filtered list!", ConsoleColor.DarkYellow);
                                             }
                                         }
                                     }
+                                }
 
-                                    if (!shouldSkip(requiredPackages))
-                                    {
-                                        filteredPackages.Add(requiredPackages);
-                                        Program.appendLog($"Feature Package ({requiredPackages}) added to filtered list\n");
-                                    }
+                                if (!shouldSkip(requiredPackages))
+                                {
+                                    filteredPackages.Add(requiredPackages);
+                                    Program.appendLog($"Feature Package ({requiredPackages}) added to filtered list\n");
                                 }
                             }
                         }
-                        else
+                    }
+                    else
+                    {
+                        // Ensure package removed from the list
+                        for (int i = 0; i < feature.FeaturePackages.Length; i++)
                         {
-                            // Ensure package removed from the list
-                            for (int i = 0; i < feature.FeaturePackages.Length; i++)
+                            var requiredPackages = folderFiles.Where(j => j.IndexOf(feature.FeaturePackages[i].PackageName, StringComparison.OrdinalIgnoreCase) >= 0).FirstOrDefault();
+                            if (requiredPackages != null)
                             {
-                                var requiredPackages = folderFiles.Where(j => j.IndexOf(feature.FeaturePackages[i].PackageName, StringComparison.OrdinalIgnoreCase) >= 0).FirstOrDefault();
-                                if (requiredPackages != null)
-                                {
-                                    filteredPackages.Remove(requiredPackages);
-                                }
+                                filteredPackages.Remove(requiredPackages);
                             }
                         }
                     }
                 }
+            }
 
+            if (filteredPackages.Count > 0)
+            {
                 var testCabFile = filteredPackages.FirstOrDefault();
                 var certificateIssuer = "";
                 var certificateDate = "";

diff --git a/Universal Updater/Properties/AssemblyInfo.cs b/Universal Updater/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("2.7.3.0")]
-[assembly: AssemblyFileVersion("2.7.3.0")]
+[assembly: AssemblyVersion("2.7.4.0")]
+[assembly: AssemblyFileVersion("2.7.4.0")]