Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-13 05:37:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Made tar.gz parser

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2024-03-21 19:46:57 +02:00
parent ab7fc2e46c
commit 1a6dfd04d6
15 changed files with 381 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/ui/java/InstallJavaDialog.cpp
View File

@ -19,16 +19,19 @@
#include "InstallJavaDialog.h"
#include <QDialogButtonBox>
#include <QMessageBox>
#include <QPushButton>
#include <QVBoxLayout>
#include <QWidget>
#include "Application.h"
#include "BaseVersionList.h"
#include "FileSystem.h"
#include "java/download/ArchiveDownloadTask.h"
#include "java/download/ManifestDownloadTask.h"
#include "meta/Index.h"
#include "meta/VersionList.h"
#include "ui/dialogs/CustomMessageBox.h"
#include "ui/dialogs/ProgressDialog.h"
#include "ui/java/VersionList.h"
#include "ui/widgets/PageContainer.h"
@ -71,8 +74,7 @@ class InstallJavaPage : public QWidget, public BasePage {
//! loads the list if needed.
void initialize(Meta::VersionList::Ptr vlist)
{
vlist->setProvidedRoles({ BaseVersionList::VersionRole, BaseVersionList::RecommendedRole, BaseVersionList::VersionPointerRole });
vlist->sort(1);
vlist->setProvidedRoles({ BaseVersionList::JavaMajorRole, BaseVersionList::RecommendedRole, BaseVersionList::VersionPointerRole });
majorVersionSelect->initialize(vlist.get());
}
@ -219,7 +221,11 @@ void InstallDialog::done(int result)
break;
}
auto deletePath = [final_path] { FS::deletePath(final_path); };
connect(task.get(), &Task::failed, this, deletePath);
connect(task.get(), &Task::failed, this, [this, &deletePath](QString reason) {
QString error = QString("Java download failed: %1").arg(reason);
CustomMessageBox::selectable(this, tr("Error"), error, QMessageBox::Warning)->show();
deletePath();
});
connect(task.get(), &Task::aborted, this, deletePath);
ProgressDialog pg(this);
pg.setSkipButton(true, tr("Abort"));

7
launcher/ui/java/VersionList.cpp
View File

@ -78,6 +78,13 @@ QVariant VersionList::data(const QModelIndex& index, int role) const
return false; // do not recommend any version
case JavaNameRole:
return version->name();
case JavaMajorRole: {
auto major = version->version.toString();
if (major.startsWith("java")) {
major = "Java " + major.mid(4);
}
return major;
}
case TypeRole:
return version->packageType;
case Meta::VersionList::TimeRole: