Move logic to task
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
parent
88ef02474f
commit
6505b0c065
@ -522,6 +522,8 @@ set(MODRINTH_SOURCES
|
||||
modplatform/modrinth/ModrinthCheckUpdate.h
|
||||
modplatform/modrinth/ModrinthInstanceCreationTask.cpp
|
||||
modplatform/modrinth/ModrinthInstanceCreationTask.h
|
||||
modplatform/modrinth/ModrinthPackExportTask.cpp
|
||||
modplatform/modrinth/ModrinthPackExportTask.h
|
||||
)
|
||||
|
||||
set(MODPACKSCH_SOURCES
|
||||
|
110
launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
Normal file
110
launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
Normal file
@ -0,0 +1,110 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
/*
|
||||
* Prism Launcher - Minecraft Launcher
|
||||
* Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "ModrinthPackExportTask.h"
|
||||
#include <QFileInfoList>
|
||||
#include <QMessageBox>
|
||||
#include "MMCZip.h"
|
||||
#include "minecraft/MinecraftInstance.h"
|
||||
#include "minecraft/PackProfile.h"
|
||||
|
||||
ModrinthPackExportTask::ModrinthPackExportTask(const QString& name,
|
||||
const QString& version,
|
||||
const QString& summary,
|
||||
InstancePtr instance,
|
||||
const QString& output,
|
||||
MMCZip::FilterFunction filter)
|
||||
: name(name), version(version), summary(summary), instance(instance), output(output), filter(filter)
|
||||
{}
|
||||
|
||||
void ModrinthPackExportTask::executeTask()
|
||||
{
|
||||
QFileInfoList files;
|
||||
if (!MMCZip::collectFileListRecursively(instance->gameRoot(), nullptr, &files, filter)) {
|
||||
emitFailed(tr("Could not collect list of files"));
|
||||
return;
|
||||
}
|
||||
|
||||
setStatus("Adding files...");
|
||||
|
||||
QuaZip zip(output);
|
||||
if (!zip.open(QuaZip::mdCreate)) {
|
||||
QFile::remove(output);
|
||||
emitFailed(tr("Could not create file"));
|
||||
return;
|
||||
}
|
||||
|
||||
{
|
||||
QuaZipFile indexFile(&zip);
|
||||
if (!indexFile.open(QIODevice::WriteOnly, QuaZipNewInfo("modrinth.index.json"))) {
|
||||
QFile::remove(output);
|
||||
|
||||
emitFailed(tr("Could not create index"));
|
||||
return;
|
||||
}
|
||||
indexFile.write(generateIndex());
|
||||
}
|
||||
|
||||
// should exist
|
||||
QDir dotMinecraft(instance->gameRoot());
|
||||
|
||||
{
|
||||
size_t i = 0;
|
||||
for (const QFileInfo& file : files) {
|
||||
setProgress(i, files.length());
|
||||
if (!JlCompress::compressFile(&zip, file.absoluteFilePath(),
|
||||
"overrides/" + dotMinecraft.relativeFilePath(file.absoluteFilePath()))) {
|
||||
emitFailed(tr("Could not compress %1").arg(file.absoluteFilePath()));
|
||||
return;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
zip.close();
|
||||
|
||||
if (zip.getZipError() != 0) {
|
||||
QFile::remove(output);
|
||||
emitFailed(tr("A zip error occured"));
|
||||
return;
|
||||
}
|
||||
|
||||
emitSucceeded();
|
||||
}
|
||||
|
||||
QByteArray ModrinthPackExportTask::generateIndex()
|
||||
{
|
||||
QJsonObject obj;
|
||||
obj["formatVersion"] = 1;
|
||||
obj["game"] = "minecraft";
|
||||
obj["name"] = name;
|
||||
obj["versionId"] = version;
|
||||
obj["summary"] = summary;
|
||||
|
||||
MinecraftInstance* mc = dynamic_cast<MinecraftInstance*>(instance.get());
|
||||
if (mc) {
|
||||
auto profile = mc->getPackProfile();
|
||||
auto minecraft = profile->getComponent("net.minecraft");
|
||||
|
||||
QJsonObject dependencies;
|
||||
dependencies["minecraft"] = minecraft->m_version;
|
||||
obj["dependencies"] = dependencies;
|
||||
}
|
||||
|
||||
return QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
}
|
44
launcher/modplatform/modrinth/ModrinthPackExportTask.h
Normal file
44
launcher/modplatform/modrinth/ModrinthPackExportTask.h
Normal file
@ -0,0 +1,44 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
/*
|
||||
* Prism Launcher - Minecraft Launcher
|
||||
* Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "BaseInstance.h"
|
||||
#include "MMCZip.h"
|
||||
#include "tasks/Task.h"
|
||||
|
||||
class ModrinthPackExportTask : public Task {
|
||||
public:
|
||||
ModrinthPackExportTask(const QString& name,
|
||||
const QString& version,
|
||||
const QString& summary,
|
||||
InstancePtr instance,
|
||||
const QString& output,
|
||||
MMCZip::FilterFunction filter);
|
||||
|
||||
protected:
|
||||
void executeTask() override;
|
||||
|
||||
private:
|
||||
const QString name, version, summary;
|
||||
const InstancePtr instance;
|
||||
const QString output;
|
||||
const MMCZip::FilterFunction filter;
|
||||
|
||||
QByteArray generateIndex();
|
||||
};
|
@ -17,16 +17,16 @@
|
||||
*/
|
||||
|
||||
#include "ExportMrPackDialog.h"
|
||||
#include <QJsonDocument>
|
||||
#include "FileSystem.h"
|
||||
#include "minecraft/MinecraftInstance.h"
|
||||
#include "minecraft/PackProfile.h"
|
||||
#include "ui/dialogs/ProgressDialog.h"
|
||||
#include "ui_ExportMrPackDialog.h"
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QFileSystemModel>
|
||||
#include <QJsonDocument>
|
||||
#include <QMessageBox>
|
||||
#include "FileSystem.h"
|
||||
#include "MMCZip.h"
|
||||
#include "modplatform/modrinth/ModrinthPackExportTask.h"
|
||||
|
||||
ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent)
|
||||
: QDialog(parent), instance(instance), ui(new Ui::ExportMrPackDialog)
|
||||
@ -72,64 +72,10 @@ void ExportMrPackDialog::runExport()
|
||||
if (output.isEmpty())
|
||||
return;
|
||||
|
||||
QFileInfoList files;
|
||||
if (!MMCZip::collectFileListRecursively(instance->gameRoot(), nullptr, &files,
|
||||
[this](const QString& path) { return proxy->blockedPaths().covers(path); })) {
|
||||
QMessageBox::warning(this, tr("Unable to export modpack"), tr("Could not collect list of files"));
|
||||
return;
|
||||
}
|
||||
ModrinthPackExportTask task(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
|
||||
[this](const QString& path) { return proxy->blockedPaths().covers(path); });
|
||||
|
||||
QuaZip zip(output);
|
||||
if (!zip.open(QuaZip::mdCreate)) {
|
||||
QFile::remove(output);
|
||||
QMessageBox::warning(this, tr("Unable to export modpack"), tr("Could not create file"));
|
||||
return;
|
||||
}
|
||||
|
||||
{
|
||||
QuaZipFile indexFile(&zip);
|
||||
if (!indexFile.open(QIODevice::WriteOnly, QuaZipNewInfo("modrinth.index.json"))) {
|
||||
QFile::remove(output);
|
||||
QMessageBox::warning(this, tr("Unable to export modpack"), tr("Could not create index"));
|
||||
return;
|
||||
}
|
||||
indexFile.write(generateIndex());
|
||||
}
|
||||
|
||||
// should exist
|
||||
QDir dotMinecraft(instance->gameRoot());
|
||||
|
||||
for (const QFileInfo& file : files)
|
||||
if (!JlCompress::compressFile(&zip, file.absoluteFilePath(), "overrides/" + dotMinecraft.relativeFilePath(file.absoluteFilePath())))
|
||||
QMessageBox::warning(this, tr("Unable to export modpack"), tr("Could not compress %1").arg(file.absoluteFilePath()));
|
||||
|
||||
zip.close();
|
||||
|
||||
if (zip.getZipError() != 0) {
|
||||
QFile::remove(output);
|
||||
QMessageBox::warning(this, tr("Unable to export modpack"), tr("A zip error occured"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
QByteArray ExportMrPackDialog::generateIndex()
|
||||
{
|
||||
QJsonObject obj;
|
||||
obj["formatVersion"] = 1;
|
||||
obj["game"] = "minecraft";
|
||||
obj["name"] = ui->name->text();
|
||||
obj["versionId"] = ui->version->text();
|
||||
obj["summary"] = ui->summary->text();
|
||||
|
||||
MinecraftInstance* mc = dynamic_cast<MinecraftInstance*>(instance.get());
|
||||
if (mc) {
|
||||
auto profile = mc->getPackProfile();
|
||||
auto minecraft = profile->getComponent("net.minecraft");
|
||||
|
||||
QJsonObject dependencies;
|
||||
dependencies["minecraft"] = minecraft->m_version;
|
||||
obj["dependencies"] = dependencies;
|
||||
}
|
||||
|
||||
return QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
ProgressDialog progress(this);
|
||||
progress.setSkipButton(true, tr("Abort"));
|
||||
progress.execWithTask(&task);
|
||||
}
|
@ -36,10 +36,9 @@ class ExportMrPackDialog : public QDialog {
|
||||
void done(int result) override;
|
||||
|
||||
private:
|
||||
InstancePtr instance;
|
||||
const InstancePtr instance;
|
||||
Ui::ExportMrPackDialog* ui;
|
||||
PackIgnoreProxy* proxy;
|
||||
|
||||
void runExport();
|
||||
QByteArray generateIndex();
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user