Fixed Issue with Incompatible Version Filtering

LavaGang · Apr 29, 2021 · ae135e2 · ae135e2
1 parent d4cc8e6
commit ae135e2
Showing 1 changed file with 35 additions and 38 deletions.
diff --git a/Main.cs b/Main.cs
@@ -80,32 +80,46 @@ private static bool ProcessSpecific(string requested_version)
             return ProcessUnityVersion(version);
         }
 
-        private static bool ProcessAll()
+        private static bool VersionFilter(UnityVersion version, bool should_error = true)
         {
-            List<UnityVersion> sortedversiontbl = new List<UnityVersion>();
-            foreach (UnityVersion version in UnityVersion.VersionTbl)
-            {
-                if ((version.Version.StartsWith("2020")
+            if ((version.Version.StartsWith("2020")
                     && !version.Version.StartsWith("2020.1"))
                     || version.Version.StartsWith("2021"))
-                {
-                    Logger.Warning(version.Version + " is Incompatible with Current Extraction Method! Skipping...");
-                    continue;
-                }
+            {
+                if (should_error)
+                    Logger.Error(version.Version + " is Incompatible with Current Extraction Method!");
+                else
+                    Logger.Warning(version.Version + " is Incompatible with Current Extraction Method!");
+                return false;
+            }
 
-                if ((OperationMode == OperationModes.Android_Il2Cpp)
-                    || (OperationMode == OperationModes.Android_Mono))
+            if ((OperationMode == OperationModes.Android_Il2Cpp)
+                || (OperationMode == OperationModes.Android_Mono))
+            {
+                if (version.Version.StartsWith("5.2")
+                    || version.Version.StartsWith("5.1")
+                    || version.Version.StartsWith("5.0")
+                    || version.Version.StartsWith("4")
+                    || version.Version.StartsWith("3"))
                 {
-                    if (version.Version.StartsWith("5.2")
-                        || version.Version.StartsWith("5.1")
-                        || version.Version.StartsWith("5.0")
-                        || version.Version.StartsWith("4")
-                        || version.Version.StartsWith("3"))
-                    {
-                        Logger.Warning(version.Version + " Has No Android Support Installer! Skipping...");
-                        continue;
-                    }
+                    if (should_error)
+                        Logger.Error(version.Version + " Has No Android Support Installer!");
+                    else
+                        Logger.Warning(version.Version + " Has No Android Support Installer!");
+                    return false;
                 }
+            }
+
+            return true;
+        }
+
+        private static bool ProcessAll()
+        {
+            List<UnityVersion> sortedversiontbl = new List<UnityVersion>();
+            foreach (UnityVersion version in UnityVersion.VersionTbl)
+            {
+                if (!VersionFilter(version, false))
+                    continue;
 
                 string zip_path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, (version.Version + ".zip"));
                 if (File.Exists(zip_path))
@@ -142,25 +156,8 @@ private static bool ProcessAll()
 
         private static bool ProcessUnityVersion(UnityVersion version)
         {
-            if (version.Version.StartsWith("2020") && !version.Version.StartsWith("2020.1"))
-            {
-                Logger.Error(version.Version + " is Incompatible with Extraction Method!");
+            if (!VersionFilter(version))
                 return false;
-            }
-
-            if ((OperationMode == OperationModes.Android_Il2Cpp)
-                || (OperationMode == OperationModes.Android_Mono))
-            {
-                if (version.Version.StartsWith("5.2")
-                    || version.Version.StartsWith("5.1")
-                    || version.Version.StartsWith("5.0")
-                    || version.Version.StartsWith("4")
-                    || version.Version.StartsWith("3"))
-                {
-                    Logger.Error(version.Version + " Has No Android Support Installer!");
-                    return false;
-                }
-            }
 
             string zip_path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, (version.Version + ".zip"));
             if (File.Exists(zip_path))