mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-01 10:56:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(clang-tidy): fix clang tidy warnings

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2026-05-07 10:22:37 +03:00
parent 4c9081a934
commit bac959bc6f
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
23 changed files with 650 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

69
launcher/minecraft/mod/tasks/ResourceFolderLoadTask.cpp
View file

@ -41,26 +41,28 @@
#include "minecraft/mod/MetadataHandler.h"
#include <QThread>
#include <utility>
ResourceFolderLoadTask::ResourceFolderLoadTask(const QDir& resource_dir,
const QDir& index_dir,
bool is_indexed,
bool clean_orphan,
std::function<Resource*(const QFileInfo&)> create_function)
ResourceFolderLoadTask::ResourceFolderLoadTask(const QDir& resourceDir,
const QDir& indexDir,
bool isIndexed,
bool cleanOrphan,
std::function<Resource*(const QFileInfo&)> createFunction)
: Task(false)
, m_resource_dir(resource_dir)
, m_index_dir(index_dir)
, m_is_indexed(is_indexed)
, m_clean_orphan(clean_orphan)
, m_create_func(create_function)
, m_resource_dir(resourceDir)
, m_index_dir(indexDir)
, m_is_indexed(isIndexed)
, m_clean_orphan(cleanOrphan)
, m_create_func(std::move(createFunction))
, m_result(new Result())
, m_thread_to_spawn_into(thread())
{}
void ResourceFolderLoadTask::executeTask()
{
if (thread() != m_thread_to_spawn_into)
if (thread() != m_thread_to_spawn_into) {
connect(this, &Task::finished, this->thread(), &QThread::quit);
}
if (m_is_indexed) {
// Read metadata first
@ -71,7 +73,7 @@ void ResourceFolderLoadTask::executeTask()
m_resource_dir.refresh();
for (auto entry : m_resource_dir.entryInfoList()) {
auto filePath = entry.absoluteFilePath();
if (auto app = APPLICATION_DYN; app && app->checkQSavePath(filePath)) {
if (auto* app = APPLICATION_DYN; (app != nullptr) && app->checkQSavePath(filePath)) {
continue;
}
auto newFilePath = FS::getUniqueResourceName(filePath);
@ -83,29 +85,29 @@ void ResourceFolderLoadTask::executeTask()
Resource* resource = m_create_func(entry);
if (resource->enabled()) {
if (m_result->resources.contains(resource->internal_id())) {
m_result->resources[resource->internal_id()]->setStatus(ResourceStatus::INSTALLED);
if (m_result->resources.contains(resource->internalId())) {
m_result->resources[resource->internalId()]->setStatus(ResourceStatus::Installed);
// Delete the object we just created, since a valid one is already in the mods list.
delete resource;
} else {
m_result->resources[resource->internal_id()].reset(resource);
m_result->resources[resource->internal_id()]->setStatus(ResourceStatus::NO_METADATA);
m_result->resources[resource->internalId()].reset(resource);
m_result->resources[resource->internalId()]->setStatus(ResourceStatus::NoMetadata);
}
} else {
QString chopped_id = resource->internal_id().chopped(9);
if (m_result->resources.contains(chopped_id)) {
m_result->resources[resource->internal_id()].reset(resource);
QString choppedId = resource->internalId().chopped(9);
if (m_result->resources.contains(choppedId)) {
m_result->resources[resource->internalId()].reset(resource);
auto metadata = m_result->resources[chopped_id]->metadata();
auto metadata = m_result->resources[choppedId]->metadata();
if (metadata) {
resource->setMetadata(*metadata);
m_result->resources[resource->internal_id()]->setStatus(ResourceStatus::INSTALLED);
m_result->resources.remove(chopped_id);
m_result->resources[resource->internalId()]->setStatus(ResourceStatus::Installed);
m_result->resources.remove(choppedId);
}
} else {
m_result->resources[resource->internal_id()].reset(resource);
m_result->resources[resource->internal_id()]->setStatus(ResourceStatus::NO_METADATA);
m_result->resources[resource->internalId()].reset(resource);
m_result->resources[resource->internalId()]->setStatus(ResourceStatus::NoMetadata);
}
}
}
@ -116,38 +118,41 @@ void ResourceFolderLoadTask::executeTask()
QMutableMapIterator iter(m_result->resources);
while (iter.hasNext()) {
auto resource = iter.next().value();
if (resource->status() == ResourceStatus::NOT_INSTALLED) {
if (resource->status() == ResourceStatus::NotInstalled) {
resource->destroy(m_index_dir, false, false);
iter.remove();
}
}
}
for (auto mod : m_result->resources)
for (const auto& mod : m_result->resources) {
mod->moveToThread(m_thread_to_spawn_into);
}
if (m_aborted)
if (m_aborted) {
emit finished();
else
} else {
emitSucceeded();
}
}
void ResourceFolderLoadTask::getFromMetadata()
{
m_index_dir.refresh();
for (auto entry : m_index_dir.entryList(QDir::Files)) {
for (const auto& entry : m_index_dir.entryList(QDir::Files)) {
if (!entry.endsWith(".pw.toml")) {
continue;
}
auto metadata = Metadata::get(m_index_dir, entry);
if (!metadata.isValid())
if (!metadata.isValid()) {
continue;
}
auto* resource = m_create_func(QFileInfo(m_resource_dir.filePath(metadata.filename)));
resource->setMetadata(metadata);
resource->setStatus(ResourceStatus::NOT_INSTALLED);
m_result->resources[resource->internal_id()].reset(resource);
resource->setStatus(ResourceStatus::NotInstalled);
m_result->resources[resource->internalId()].reset(resource);
}
}