CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added condition for modlist

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-06-24 15:02:00 +03:00
parent 25579fbedc
commit 4a84084d9d
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
launcher/modplatform/flame/FlamePackExportTask.cpp
View File

@ -118,7 +118,7 @@ void FlamePackExportTask::collectHashes()
} }
if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) { if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) {
resolvedFiles.insert(mod->fileinfo().absoluteFilePath(), resolvedFiles.insert(mod->fileinfo().absoluteFilePath(),
{ mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(), { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(), true,
mod->metadata()->name, mod->metadata()->slug, mod->authors().join(", ") }); mod->metadata()->name, mod->metadata()->slug, mod->authors().join(", ") });
setProgress(m_progress + 1, totalProgres); setProgress(m_progress + 1, totalProgres);
continue; continue;
@ -128,7 +128,7 @@ void FlamePackExportTask::collectHashes()
connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, totalProgres](QString hash) { connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, totalProgres](QString hash) {
if (m_state == Task::State::Running) { if (m_state == Task::State::Running) {
setProgress(m_progress + 1, totalProgres); setProgress(m_progress + 1, totalProgres);
pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled() }); pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled(), true });
} }
}); });
connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed); connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
@ -215,8 +215,8 @@ void FlamePackExportTask::makeApiRequest()
setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(mod->name)); setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(mod->name));
if (Json::ensureBoolean(file_obj, "isAvailable", false, "isAvailable")) if (Json::ensureBoolean(file_obj, "isAvailable", false, "isAvailable"))
resolvedFiles.insert(mod->path, resolvedFiles.insert(mod->path, { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"),
{ Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"), mod->enabled }); mod->enabled, mod->isMod });
} }
} catch (Json::JsonException& e) { } catch (Json::JsonException& e) {
@ -336,11 +336,13 @@ void FlamePackExportTask::buildZip()
} }
QString content = ""; QString content = "";
for (auto mod : resolvedFiles) { for (auto mod : resolvedFiles) {
content += QString(TEMPLATE) if (mod.isMod) {
.replace("{name}", mod.name) content += QString(TEMPLATE)
.replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug)) .replace("{name}", mod.name)
.replace("{authors}", mod.authors) + .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug))
"\n"; .replace("{authors}", mod.authors) +
"\n";
}
} }
content = "<ul>" + content + "</ul>"; content = "<ul>" + content + "</ul>";
modlist.write(content.toUtf8()); modlist.write(content.toUtf8());

2
launcher/modplatform/flame/FlamePackExportTask.h
View File

@ -57,6 +57,7 @@ class FlamePackExportTask : public Task {
int addonId; int addonId;
int version; int version;
bool enabled; bool enabled;
bool isMod;
QString name; QString name;
QString slug; QString slug;
@ -66,6 +67,7 @@ class FlamePackExportTask : public Task {
QString name; QString name;
QString path; QString path;
bool enabled; bool enabled;
bool isMod;
}; };
FlameAPI api; FlameAPI api;

2
launcher/ui/dialogs/ExportPackDialog.cpp
View File

@ -22,7 +22,7 @@
#include "modplatform/flame/FlamePackExportTask.h" #include "modplatform/flame/FlamePackExportTask.h"
#include "ui/dialogs/CustomMessageBox.h" #include "ui/dialogs/CustomMessageBox.h"
#include "ui/dialogs/ProgressDialog.h" #include "ui/dialogs/ProgressDialog.h"
#include "ui_ExportMrPackDialog.h" #include "ui_ExportPackDialog.h"
#include <QFileDialog> #include <QFileDialog>
#include <QFileSystemModel> #include <QFileSystemModel>