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

resolved local vaiables names

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2023-07-02 18:50:29 +03:00
parent aad5ca5474
commit 5f63c781b4
2 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,8 +108,8 @@ void FlamePackExportTask::collectHashes()
setStatus(tr("Finding file hashes...")); setStatus(tr("Finding file hashes..."));
setProgress(1, 5); setProgress(1, 5);
auto allMods = mcInstance->loaderModList()->allMods(); auto allMods = mcInstance->loaderModList()->allMods();
ConcurrentTask::Ptr hashing_task(new ConcurrentTask(this, "MakeHashesTask", 10)); ConcurrentTask::Ptr hashingTask(new ConcurrentTask(this, "MakeHashesTask", 10));
task.reset(hashing_task); task.reset(hashingTask);
for (const QFileInfo& file : files) { for (const QFileInfo& file : files) {
const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath()); const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
// require sensible file types // require sensible file types
@@ -120,14 +120,14 @@ void FlamePackExportTask::collectHashes()
if (relative.startsWith("resourcepacks/") && if (relative.startsWith("resourcepacks/") &&
(relative.endsWith(".zip") || relative.endsWith(".zip.disabled"))) { // is resourcepack (relative.endsWith(".zip") || relative.endsWith(".zip.disabled"))) { // is resourcepack
auto hash_task = Hashing::createFlameHasher(file.absoluteFilePath()); auto hashTask = Hashing::createFlameHasher(file.absoluteFilePath());
connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, relative, file](QString hash) { connect(hashTask.get(), &Hashing::Hasher::resultsReady, [this, relative, file](QString hash) {
if (m_state == Task::State::Running) { if (m_state == Task::State::Running) {
pendingHashes.insert(hash, { relative, file.absoluteFilePath(), relative.endsWith(".zip") }); pendingHashes.insert(hash, { relative, file.absoluteFilePath(), relative.endsWith(".zip") });
} }
}); });
connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed); connect(hashTask.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
hashing_task->addTask(hash_task); hashingTask->addTask(hashTask);
continue; continue;
} }
@@ -144,39 +144,39 @@ void FlamePackExportTask::collectHashes()
continue; continue;
} }
auto hash_task = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath()); auto hashTask = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod](QString hash) { connect(hashTask.get(), &Hashing::Hasher::resultsReady, [this, mod](QString hash) {
if (m_state == Task::State::Running) { if (m_state == Task::State::Running) {
pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled(), true }); pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled(), true });
} }
}); });
connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed); connect(hashTask.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
hashing_task->addTask(hash_task); hashingTask->addTask(hashTask);
} }
} }
auto step_progress = std::make_shared<TaskStepProgress>(); auto progressStep = std::make_shared<TaskStepProgress>();
connect(hashing_task.get(), &Task::finished, this, [this, step_progress] { connect(hashingTask.get(), &Task::finished, this, [this, progressStep] {
step_progress->state = TaskStepState::Succeeded; progressStep->state = TaskStepState::Succeeded;
stepProgress(*step_progress); stepProgress(*progressStep);
}); });
connect(hashing_task.get(), &Task::succeeded, this, &FlamePackExportTask::makeApiRequest); connect(hashingTask.get(), &Task::succeeded, this, &FlamePackExportTask::makeApiRequest);
connect(hashing_task.get(), &Task::failed, this, [this, step_progress](QString reason) { connect(hashingTask.get(), &Task::failed, this, [this, progressStep](QString reason) {
step_progress->state = TaskStepState::Failed; progressStep->state = TaskStepState::Failed;
stepProgress(*step_progress); stepProgress(*progressStep);
emitFailed(reason); emitFailed(reason);
}); });
connect(hashing_task.get(), &Task::stepProgress, this, &FlamePackExportTask::propogateStepProgress); connect(hashingTask.get(), &Task::stepProgress, this, &FlamePackExportTask::propogateStepProgress);
connect(hashing_task.get(), &Task::progress, this, [this, step_progress](qint64 current, qint64 total) { connect(hashingTask.get(), &Task::progress, this, [this, progressStep](qint64 current, qint64 total) {
step_progress->update(current, total); progressStep->update(current, total);
stepProgress(*step_progress); stepProgress(*progressStep);
}); });
connect(hashing_task.get(), &Task::status, this, [this, step_progress](QString status) { connect(hashingTask.get(), &Task::status, this, [this, progressStep](QString status) {
step_progress->status = status; progressStep->status = status;
stepProgress(*step_progress); stepProgress(*progressStep);
}); });
hashing_task->start(); hashingTask->start();
} }
void FlamePackExportTask::makeApiRequest() void FlamePackExportTask::makeApiRequest()
@@ -198,38 +198,38 @@ void FlamePackExportTask::makeApiRequest()
task.reset(api.matchFingerprints(fingerprints, response)); task.reset(api.matchFingerprints(fingerprints, response));
connect(task.get(), &Task::succeeded, this, [this, response] { connect(task.get(), &Task::succeeded, this, [this, response] {
QJsonParseError parse_error{}; QJsonParseError parseError{};
QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error); QJsonDocument doc = QJsonDocument::fromJson(*response, &parseError);
if (parse_error.error != QJsonParseError::NoError) { if (parseError.error != QJsonParseError::NoError) {
qWarning() << "Error while parsing JSON response from CurseForge::CurrentVersions at " << parse_error.offset qWarning() << "Error while parsing JSON response from CurseForge::CurrentVersions at " << parseError.offset
<< " reason: " << parse_error.errorString(); << " reason: " << parseError.errorString();
qWarning() << *response; qWarning() << *response;
failed(parse_error.errorString()); failed(parseError.errorString());
return; return;
} }
try { try {
auto doc_obj = Json::requireObject(doc); auto docObj = Json::requireObject(doc);
auto data_obj = Json::requireObject(doc_obj, "data"); auto dataObj = Json::requireObject(docObj, "data");
auto data_arr = Json::requireArray(data_obj, "exactMatches"); auto dataArr = Json::requireArray(dataObj, "exactMatches");
if (data_arr.isEmpty()) { if (dataArr.isEmpty()) {
qWarning() << "No matches found for fingerprint search!"; qWarning() << "No matches found for fingerprint search!";
return; return;
} }
for (auto match : data_arr) { for (auto match : dataArr) {
auto match_obj = Json::ensureObject(match, {}); auto matchObj = Json::ensureObject(match, {});
auto file_obj = Json::ensureObject(match_obj, "file", {}); auto fileObj = Json::ensureObject(matchObj, "file", {});
if (match_obj.isEmpty() || file_obj.isEmpty()) { if (matchObj.isEmpty() || fileObj.isEmpty()) {
qWarning() << "Fingerprint match is empty!"; qWarning() << "Fingerprint match is empty!";
return; return;
} }
auto fingerprint = QString::number(Json::ensureVariant(file_obj, "fileFingerprint").toUInt()); auto fingerprint = QString::number(Json::ensureVariant(fileObj, "fileFingerprint").toUInt());
auto mod = pendingHashes.find(fingerprint); auto mod = pendingHashes.find(fingerprint);
if (mod == pendingHashes.end()) { if (mod == pendingHashes.end()) {
qWarning() << "Invalid fingerprint from the API response."; qWarning() << "Invalid fingerprint from the API response.";
@@ -237,8 +237,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(fileObj, "isAvailable", false, "isAvailable"))
resolvedFiles.insert(mod->path, { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"), resolvedFiles.insert(mod->path, { Json::requireInteger(fileObj, "modId"), Json::requireInteger(fileObj, "id"),
mod->enabled, mod->isMod }); mod->enabled, mod->isMod });
} }
@@ -265,25 +265,25 @@ void FlamePackExportTask::getProjectsInfo()
} }
auto response = std::make_shared<QByteArray>(); auto response = std::make_shared<QByteArray>();
Task::Ptr proj_task; Task::Ptr projTask;
if (addonIds.isEmpty()) { if (addonIds.isEmpty()) {
buildZip(); buildZip();
return; return;
} else if (addonIds.size() == 1) { } else if (addonIds.size() == 1) {
proj_task = api.getProject(*addonIds.begin(), response); projTask = api.getProject(*addonIds.begin(), response);
} else { } else {
proj_task = api.getProjects(addonIds, response); projTask = api.getProjects(addonIds, response);
} }
connect(proj_task.get(), &Task::succeeded, this, [this, response, addonIds] { connect(projTask.get(), &Task::succeeded, this, [this, response, addonIds] {
QJsonParseError parse_error{}; QJsonParseError parseError{};
auto doc = QJsonDocument::fromJson(*response, &parse_error); auto doc = QJsonDocument::fromJson(*response, &parseError);
if (parse_error.error != QJsonParseError::NoError) { if (parseError.error != QJsonParseError::NoError) {
qWarning() << "Error while parsing JSON response from CurseForge projects task at " << parse_error.offset qWarning() << "Error while parsing JSON response from CurseForge projects task at " << parseError.offset
<< " reason: " << parse_error.errorString(); << " reason: " << parseError.errorString();
qWarning() << *response; qWarning() << *response;
failed(parse_error.errorString()); failed(parseError.errorString());
return; return;
} }
@@ -295,13 +295,13 @@ void FlamePackExportTask::getProjectsInfo()
entries = Json::requireArray(Json::requireObject(doc), "data"); entries = Json::requireArray(Json::requireObject(doc), "data");
for (auto entry : entries) { for (auto entry : entries) {
auto entry_obj = Json::requireObject(entry); auto entryObj = Json::requireObject(entry);
try { try {
setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(Json::requireString(entry_obj, "name"))); setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(Json::requireString(entryObj, "name")));
ModPlatform::IndexedPack pack; ModPlatform::IndexedPack pack;
FlameMod::loadIndexedPack(pack, entry_obj); FlameMod::loadIndexedPack(pack, entryObj);
for (auto key : resolvedFiles.keys()) { for (auto key : resolvedFiles.keys()) {
auto val = resolvedFiles.value(key); auto val = resolvedFiles.value(key);
if (val.addonId == pack.addonId) { if (val.addonId == pack.addonId) {
@@ -327,7 +327,7 @@ void FlamePackExportTask::getProjectsInfo()
} }
buildZip(); buildZip();
}); });
task.reset(proj_task); task.reset(projTask);
task->start(); task->start();
} }
@@ -370,18 +370,18 @@ void FlamePackExportTask::buildZip()
content = "<ul>" + content + "</ul>"; content = "<ul>" + content + "</ul>";
modlist.write(content.toUtf8()); modlist.write(content.toUtf8());
auto step_progress = std::make_shared<TaskStepProgress>(); auto progressStep = std::make_shared<TaskStepProgress>();
size_t progress = 0; size_t progress = 0;
for (const QFileInfo& file : files) { for (const QFileInfo& file : files) {
if (buildZipFuture.isCanceled()) { if (buildZipFuture.isCanceled()) {
QFile::remove(output); QFile::remove(output);
step_progress->state = TaskStepState::Failed; progressStep->state = TaskStepState::Failed;
stepProgress(*step_progress); stepProgress(*progressStep);
return BuildZipResult(); return BuildZipResult();
} }
step_progress->update(progress, files.length()); progressStep->update(progress, files.length());
stepProgress(*step_progress); stepProgress(*progressStep);
const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath()); const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
if (!resolvedFiles.contains(file.absoluteFilePath()) && if (!resolvedFiles.contains(file.absoluteFilePath()) &&
@@ -396,12 +396,12 @@ void FlamePackExportTask::buildZip()
if (zip.getZipError() != 0) { if (zip.getZipError() != 0) {
QFile::remove(output); QFile::remove(output);
step_progress->state = TaskStepState::Failed; progressStep->state = TaskStepState::Failed;
stepProgress(*step_progress); stepProgress(*progressStep);
return BuildZipResult(tr("A zip error occurred")); return BuildZipResult(tr("A zip error occurred"));
} }
step_progress->state = TaskStepState::Succeeded; progressStep->state = TaskStepState::Succeeded;
stepProgress(*step_progress); stepProgress(*progressStep);
return BuildZipResult(); return BuildZipResult();
}); });
connect(&buildZipWatcher, &QFutureWatcher<BuildZipResult>::finished, this, &FlamePackExportTask::finish); connect(&buildZipWatcher, &QFutureWatcher<BuildZipResult>::finished, this, &FlamePackExportTask::finish);

4
launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
View File

@@ -95,7 +95,7 @@ void ModrinthPackExportTask::collectFiles()
void ModrinthPackExportTask::collectHashes() void ModrinthPackExportTask::collectHashes()
{ {
setStatus(tr("Find file hashes...")); setStatus(tr("Finding file hashes..."));
for (const QFileInfo& file : files) { for (const QFileInfo& file : files) {
QCoreApplication::processEvents(); QCoreApplication::processEvents();
@@ -159,7 +159,7 @@ void ModrinthPackExportTask::makeApiRequest()
if (pendingHashes.isEmpty()) if (pendingHashes.isEmpty())
buildZip(); buildZip();
else { else {
setStatus(tr("Find versions for hashes...")); setStatus(tr("Finding versions for hashes..."));
auto response = std::make_shared<QByteArray>(); auto response = std::make_shared<QByteArray>();
task = api.currentVersions(pendingHashes.values(), "sha512", response); task = api.currentVersions(pendingHashes.values(), "sha512", response);
connect(task.get(), &NetJob::succeeded, [this, response]() { parseApiResponse(response); }); connect(task.get(), &NetJob::succeeded, [this, response]() { parseApiResponse(response); });