From a902f29ccff347f1c51ab95330748cb6e71d1539 Mon Sep 17 00:00:00 2001
From: timoreo <contact@timoreo.fr>
Date: Mon, 12 Sep 2022 08:19:42 +0200
Subject: [PATCH] Changed to a temporary file

Signed-off-by: timoreo <contact@timoreo.fr>
---
 launcher/JavaDownloader.cpp                | 21 ++++++++++++++-------
 launcher/ui/widgets/JavaSettingsWidget.cpp |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/launcher/JavaDownloader.cpp b/launcher/JavaDownloader.cpp
index cb8fd1116..e56a87d0c 100644
--- a/launcher/JavaDownloader.cpp
+++ b/launcher/JavaDownloader.cpp
@@ -1,6 +1,7 @@
 #include "JavaDownloader.h"
 #include <QMessageBox>
 #include <QPushButton>
+#include <memory>
 #include "Application.h"
 #include "FileSystem.h"
 #include "Json.h"
@@ -127,6 +128,11 @@ void JavaDownloader::executeTask()
                 azulOS = "linux";
                 arch = "arm";
                 bitness = "32";
+            } else if (OS == "linux"){
+                // linux x86 64 (used for debugging, should never reach here)
+                azulOS = "linux";
+                arch = "x86";
+                bitness = "64";
             }
             auto metaResponse = new QByteArray();
             auto downloadJob = new NetJob(QString("JRE::QueryAzulMeta"), APPLICATION->network());
@@ -161,19 +167,20 @@ void JavaDownloader::executeTask()
                     setStatus(tr("Downloading java from Azul"));
                     auto downloadURL = QUrl(array[0].toObject()["url"].toString());
                     auto download = new NetJob(QString("JRE::DownloadJava"), APPLICATION->network());
-                    const QString path = downloadURL.host() + '/' + downloadURL.path();
-                    auto entry = APPLICATION->metacache()->resolveEntry("general", path);
-                    entry->setStale(true);
-                    download->addNetAction(Net::Download::makeCached(downloadURL, entry));
-                    auto zippath = entry->getFullPath();
+                    auto temp = std::make_unique<QTemporaryFile>(FS::PathCombine(APPLICATION->root(), "temp", "XXXXXX.zip"));
+                    FS::ensureFolderPathExists(FS::PathCombine(APPLICATION->root(),"temp"));
+                    // Have to open at least once to generate path
+                    temp->open();
+                    temp->close();
+                    download->addNetAction(Net::Download::makeFile(downloadURL, temp->fileName()));
                     QObject::connect(download, &NetJob::finished, [download] { download->deleteLater(); });
                     QObject::connect(download, &NetJob::progress, this, &JavaDownloader::progress);
-                    QObject::connect(download, &NetJob::succeeded, [isLegacy, zippath, downloadURL, this] {
+                    QObject::connect(download, &NetJob::succeeded, [isLegacy, file = std::move(temp), downloadURL, this] {
                         setStatus(tr("Extracting java"));
                         auto output = FS::PathCombine(FS::PathCombine(QCoreApplication::applicationDirPath(), "java"),
                                                       isLegacy ? "java-legacy" : "java-current");
                         // This should do all of the extracting and creating folders
-                        MMCZip::extractDir(zippath, downloadURL.fileName().chopped(4), output);
+                        MMCZip::extractDir(file->fileName(), downloadURL.fileName().chopped(4), output);
                         emitSucceeded();
                     });
                     download->start();
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index e62cdd1f0..6494b79fd 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -118,7 +118,7 @@ void JavaSettingsWidget::setupUi()
 
     m_verticalLayout->addWidget(m_memoryGroupBox);
 
-    m_javaDownloadBtn = new QPushButton("Download Java",this);
+    m_javaDownloadBtn = new QPushButton(tr("Download Java"), this);
 
     m_verticalLayout->addWidget(m_javaDownloadBtn);