From e17b6804a7424dd5161662c4ef92972f3311675c Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Thu, 21 Apr 2022 15:45:20 -0300
Subject: fix: implement PR suggestions
Some stylistic changes, and get hashes from the mod providers when
building the metadata.
---
launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
(limited to 'launcher/minecraft')
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index addb0dd8..fe807a29 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -10,7 +10,7 @@ ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir)
void ModFolderLoadTask::run()
{
- if (!APPLICATION->settings()->get("DontUseModMetadata").toBool()) {
+ if (!APPLICATION->settings()->get("ModMetadataDisabled").toBool()) {
// Read metadata first
getFromMetadata();
}
@@ -34,14 +34,9 @@ void ModFolderLoadTask::run()
void ModFolderLoadTask::getFromMetadata()
{
m_index_dir.refresh();
- for (auto entry : m_index_dir.entryList()) {
- // QDir::Filter::NoDotAndDotDot seems to exclude all files for some reason...
- if (entry == "." || entry == "..")
- continue;
-
+ for (auto entry : m_index_dir.entryList(QDir::Files)) {
auto metadata = Metadata::get(m_index_dir, entry);
- // TODO: Don't simply return. Instead, show to the user that the metadata is there, but
- // it's not currently 'installed' (i.e. there's no JAR file yet).
+
if(!metadata.isValid()){
return;
}
--
cgit