fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made JavaDownloader a task and added some quick UI

Browse Source 
Signed-off-by: timoreo <contact@timoreo.fr>
This commit is contained in:
timoreo
2022-07-10 19:56:52 +02:00
parent 54ad91c3b7
commit 53ddba8077
3 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
launcher/JavaDownloader.cpp
View File

@@ -15,17 +15,21 @@ struct File {
bool isExec;
};
void JavaDownloader::downloadJava(bool isLegacy, const QString& OS)
void JavaDownloader::executeTask()
{
auto OS = m_OS;
auto isLegacy = m_isLegacy;
auto netJob = new NetJob(QString("JRE::QueryVersions"), APPLICATION->network());
auto response = new QByteArray();
setStatus(tr("Querying mojang meta"));
netJob->addNetAction(Net::Download::makeByteArray(
QUrl("https://piston-meta.mojang.com/v1/products/java-runtime/2ec0cc96c44e5a76b9c8b7c39df7210883d12871/all.json"), response));
QObject::connect(netJob, &NetJob::finished, [netJob, response] {
netJob->deleteLater();
delete response;
});
QObject::connect(netJob, &NetJob::succeeded, [response, OS, isLegacy] {
QObject::connect(netJob, &NetJob::progress, this, &JavaDownloader::progress);
QObject::connect(netJob, &NetJob::succeeded, [response, OS, isLegacy, this] {
QJsonParseError parse_error{};
QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
if (parse_error.error != QJsonParseError::NoError) {
@@ -35,6 +39,7 @@ void JavaDownloader::downloadJava(bool isLegacy, const QString& OS)
}
auto versionArray = Json::ensureArray(Json::ensureObject(doc.object(), OS), isLegacy ? "jre-legacy" : "java-runtime-gamma");
if (!versionArray.empty()) {
setStatus(tr("Downloading java from Mojang"));
auto url = versionArray[0].toObject()["manifest"].toObject()["url"].toString();
auto download = new NetJob(QString("JRE::DownloadJava"), APPLICATION->network());
auto files = new QByteArray();
@@ -45,7 +50,8 @@ void JavaDownloader::downloadJava(bool isLegacy, const QString& OS)
download->deleteLater();
delete files;
});
QObject::connect(download, &NetJob::succeeded, [files, isLegacy] {
QObject::connect(download, &NetJob::progress, this, &JavaDownloader::progress);
QObject::connect(download, &NetJob::succeeded, [files, isLegacy, this] {
QJsonParseError parse_error{};
QJsonDocument doc = QJsonDocument::fromJson(*files, &parse_error);
if (parse_error.error != QJsonParseError::NoError) {
@@ -89,12 +95,14 @@ void JavaDownloader::downloadJava(bool isLegacy, const QString& OS)
elementDownload->addNetAction(dl);
}
QObject::connect(elementDownload, &NetJob::finished, [elementDownload] { elementDownload->deleteLater(); });
QObject::connect(elementDownload, &NetJob::succeeded, [this]{emitSucceeded();});
elementDownload->start();
});
download->start();
} else {
// mojang does not have a JRE for us, let's get azul zulu
QString javaVersion = isLegacy ? QString("8.0") : QString("18.0");
setStatus(tr("Querying Azul meta"));
QString javaVersion = isLegacy ? QString("8.0") : QString("17.0");
QString azulOS;
QString arch;
QString bitness;
@@ -117,23 +125,24 @@ void JavaDownloader::downloadJava(bool isLegacy, const QString& OS)
}
auto metaResponse = new QByteArray();
auto downloadJob = new NetJob(QString("JRE::QueryAzulMeta"), APPLICATION->network());
downloadJob->addNetAction(Net::Download::makeByteArray(QString("https://api.azul.com/zulu/download/community/v1.0/bundles/?"
"java_version=%1"
"&os=%2"
"&arch=%3"
"&hw_bitness=%4"
"&ext=zip" // as a zip for all os, even linux
"&bundle_type=jre" // jre only
"&latest=true" // only get the one latest entry
)
.arg(javaVersion, azulOS, arch, bitness),
metaResponse));
downloadJob->addNetAction(
Net::Download::makeByteArray(QString("https://api.azul.com/zulu/download/community/v1.0/bundles/?"
"java_version=%1"
"&os=%2"
"&arch=%3"
"&hw_bitness=%4"
"&ext=zip" // as a zip for all os, even linux NOTE !! Linux ARM is .deb only !!
"&bundle_type=jre" // jre only
"&latest=true" // only get the one latest entry
)
.arg(javaVersion, azulOS, arch, bitness),
metaResponse));
QObject::connect(downloadJob, &NetJob::finished, [downloadJob, metaResponse] {
downloadJob->deleteLater();
delete metaResponse;
});
QObject::connect(downloadJob, &NetJob::succeeded, [metaResponse, isLegacy] {
QObject::connect(downloadJob, &NetJob::progress, this, &JavaDownloader::progress);
QObject::connect(downloadJob, &NetJob::succeeded, [metaResponse, isLegacy, this] {
QJsonParseError parse_error{};
QJsonDocument doc = QJsonDocument::fromJson(*metaResponse, &parse_error);
if (parse_error.error != QJsonParseError::NoError) {
@@ -144,6 +153,7 @@ void JavaDownloader::downloadJava(bool isLegacy, const QString& OS)
auto array = doc.array();
if (!array.empty()) {
// JRE found ! download the zip
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();
@@ -152,15 +162,18 @@ void JavaDownloader::downloadJava(bool isLegacy, const QString& OS)
download->addNetAction(Net::Download::makeCached(downloadURL, entry));
auto zippath = entry->getFullPath();
QObject::connect(download, &NetJob::finished, [download] { download->deleteLater(); });
QObject::connect(download, &NetJob::succeeded, [isLegacy, zippath, downloadURL] {
QObject::connect(download, &NetJob::progress, this, &JavaDownloader::progress);
QObject::connect(download, &NetJob::succeeded, [isLegacy, zippath, 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);
emitSucceeded();
});
download->start();
} else {
qWarning() << "No suitable JRE found !!";
emitFailed(tr("No suitable JRE found"));
}
});
downloadJob->start();