fix JavaChecker: legacyJavaChecker doesn't set JavaBinaryPath property

RiversideValley · Jun 14, 2021 · 0efdd8d · 0efdd8d
1 parent 6a78a57
commit 0efdd8d
Showing 1 changed file with 26 additions and 15 deletions.
diff --git a/CmlLib/Core/Files/JavaChecker.cs b/CmlLib/Core/Files/JavaChecker.cs
@@ -28,7 +28,23 @@ public class JavaChecker : IFileChecker
             if (string.IsNullOrEmpty(javaVersion))
                 javaVersion = "jre-legacy";
 
-            version.JavaBinaryPath = Path.Combine(path.Runtime, javaVersion, "bin", JavaBinaryName);
+            var files = internalCheckFile(
+                javaVersion, path, downloadProgress, out string binPath);
+
+            version.JavaBinaryPath = binPath;
+            return files;
+        }
+
+        public Task<DownloadFile[]?> CheckFilesTaskAsync(MinecraftPath path, MVersion version,
+            IProgress<DownloadFileChangedEventArgs>? downloadProgress)
+        {
+            return Task.Run(() => CheckFiles(path, version, downloadProgress));
+        }
+
+        private DownloadFile[]? internalCheckFile(string javaVersion, MinecraftPath path,
+            IProgress<DownloadFileChangedEventArgs>? downloadProgress, out string binPath)
+        {
+            binPath = Path.Combine(path.Runtime, javaVersion, "bin", JavaBinaryName);
 
             try
             {
@@ -41,30 +57,24 @@ public class JavaChecker : IFileChecker
                     if (javaManifest == null)
                         javaManifest = getJavaVersionManifest(javaVersions, "jre-legacy");
                     if (javaManifest == null)
-                        return legacyJavaChecker(path);
+                        return legacyJavaChecker(path, out binPath);
 
                     var files = javaManifest["files"] as JObject;
                     if (files == null)
-                        return legacyJavaChecker(path);
+                        return legacyJavaChecker(path, out binPath);
 
                     return toDownloadFiles(javaVersion, files, path, downloadProgress);
                 }
                 else
-                    return legacyJavaChecker(path);
+                    return legacyJavaChecker(path, out binPath);
             }
             catch (Exception e)
             {
                 Debug.WriteLine(e);
-                return null;
+                return legacyJavaChecker(path, out binPath);
             }
         }
 
-        public Task<DownloadFile[]?> CheckFilesTaskAsync(MinecraftPath path, MVersion version, 
-            IProgress<DownloadFileChangedEventArgs>? downloadProgress)
-        {
-            return Task.Run(() => CheckFiles(path, version, downloadProgress));
-        }
-
         private string getJavaOSName()
         {
             string osName = "";
@@ -148,7 +158,7 @@ private DownloadFile[] toDownloadFiles(string javaVersionName, JObject manifest,
                         if (executable)
                             file.AfterDownload = new Func<Task>[]
                             {
-                                () => Task.Run(() => TryChmod755(filePath))
+                                () => Task.Run(() => tryChmod755(filePath))
                             };
                         files.Add(file);
                     }
@@ -189,10 +199,11 @@ private DownloadFile[] toDownloadFiles(string javaVersionName, JObject manifest,
             };
         }
 
-        private DownloadFile[] legacyJavaChecker(MinecraftPath path)
+        private DownloadFile[] legacyJavaChecker(MinecraftPath path, out string binPath)
         {
             string legacyJavaPath = Path.Combine(path.Runtime, "m-legacy");
             MJava mJava = new MJava(legacyJavaPath);
+            binPath = mJava.GetBinaryPath();
 
             if (mJava.CheckJavaExistence())
                 return new DownloadFile[] {};
@@ -214,15 +225,15 @@ private DownloadFile[] legacyJavaChecker(MinecraftPath path)
                         var z = new SharpZip(zipPath);
                         z.Unzip(legacyJavaPath);
 
-                        TryChmod755(mJava.GetBinaryPath());
+                        tryChmod755(mJava.GetBinaryPath());
                     })
                 }
             };
 
             return new[] {file};
         }
 
-        private void TryChmod755(string path)
+        private void tryChmod755(string path)
         {
             try
             {