From fcfb2cfc3da9a8f897063db05fdf3aebc41a59ae Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Fri, 15 Apr 2022 00:24:57 -0300
Subject: feat: use mod metadata for getting mod information

For now this doesn't mean much, but it will help when we need data
exclusive from the metadata, such as addon id and mod provider.

Also removes the metadata when the mod is deleted, and make the Mod.h
file a little more pleasing to look at :)
---
 launcher/minecraft/mod/Mod.h | 73 ++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 47 deletions(-)

(limited to 'launcher/minecraft/mod/Mod.h')

diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index 921faeb1..c9fd5813 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -14,14 +14,14 @@
  */
 
 #pragma once
-#include <QFileInfo>
+
 #include <QDateTime>
+#include <QFileInfo>
 #include <QList>
 #include <memory>
 
 #include "ModDetails.h"
-
-
+#include "modplatform/packwiz/Packwiz.h"
 
 class Mod
 {
@@ -32,65 +32,41 @@ public:
         MOD_ZIPFILE,    //!< The mod is a zip file containing the mod's class files.
         MOD_SINGLEFILE, //!< The mod is a single file (not a zip file).
         MOD_FOLDER,     //!< The mod is in a folder on the filesystem.
-        MOD_LITEMOD, //!< The mod is a litemod
+        MOD_LITEMOD,    //!< The mod is a litemod
     };
 
     Mod() = default;
     Mod(const QFileInfo &file);
+    explicit Mod(const QDir& mods_dir, const Packwiz::Mod& metadata);
 
-    QFileInfo filename() const
-    {
-        return m_file;
-    }
-    QString mmc_id() const
-    {
-        return m_mmc_id;
-    }
-    ModType type() const
-    {
-        return m_type;
-    }
-    bool valid()
-    {
-        return m_type != MOD_UNKNOWN;
-    }
-
-    QDateTime dateTimeChanged() const
-    {
-        return m_changedDateTime;
-    }
-
-    bool enabled() const
-    {
-        return m_enabled;
-    }
+    QFileInfo filename()        const { return m_file; }
+    QDateTime dateTimeChanged() const { return m_changedDateTime; }
+    QString   mmc_id()          const { return m_mmc_id; }
+    ModType   type()            const { return m_type; }
+    bool      fromMetadata()    const { return m_from_metadata; }
+    bool      enabled()         const { return m_enabled; }
 
-    const ModDetails &details() const;
+    bool valid() const { return m_type != MOD_UNKNOWN; }
 
-    QString name() const;
-    QString version() const;
-    QString homeurl() const;
+    const ModDetails& details() const;
+    QString name()        const;
+    QString version()     const;
+    QString homeurl()     const;
     QString description() const;
     QStringList authors() const;
 
     bool enable(bool value);
 
     // delete all the files of this mod
-    bool destroy();
+    bool destroy(QDir& index_dir);
 
     // change the mod's filesystem path (used by mod lists for *MAGIC* purposes)
     void repath(const QFileInfo &file);
 
-    bool shouldResolve() {
-        return !m_resolving && !m_resolved;
-    }
-    bool isResolving() {
-        return m_resolving;
-    }
-    int resolutionTicket()
-    {
-        return m_resolutionTicket;
-    }
+    bool shouldResolve()    const { return !m_resolving && !m_resolved; }
+    bool isResolving()      const { return m_resolving; }
+    int  resolutionTicket() const { return m_resolutionTicket; }
+
     void setResolving(bool resolving, int resolutionTicket) {
         m_resolving = resolving;
         m_resolutionTicket = resolutionTicket;
@@ -104,12 +80,15 @@ public:
 protected:
     QFileInfo m_file;
     QDateTime m_changedDateTime;
+
     QString m_mmc_id;
     QString m_name;
+    ModType m_type = MOD_UNKNOWN;
+    bool m_from_metadata = false;
+    std::shared_ptr<ModDetails> m_localDetails;
+
     bool m_enabled = true;
     bool m_resolving = false;
     bool m_resolved = false;
     int m_resolutionTicket = 0;
-    ModType m_type = MOD_UNKNOWN;
-    std::shared_ptr<ModDetails> m_localDetails;
 };
-- 
cgit 


From e9fb566c0797865a37e5b59a49163258b3adb328 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Fri, 15 Apr 2022 22:07:35 -0300
Subject: refactor: remove unused mod info and organize some stuff

---
 launcher/minecraft/mod/Mod.cpp                     | 87 +++++++++-------------
 launcher/minecraft/mod/Mod.h                       |  4 +-
 launcher/minecraft/mod/ModDetails.h                | 15 +++-
 launcher/minecraft/mod/ModFolderModel.cpp          | 10 +--
 launcher/minecraft/mod/tasks/LocalModParseTask.cpp | 22 +-----
 launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp | 22 +++---
 launcher/ui/widgets/MCModInfoFrame.cpp             |  2 +-
 7 files changed, 67 insertions(+), 95 deletions(-)

(limited to 'launcher/minecraft/mod/Mod.h')

diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index 59f4d83b..64c9ffb5 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -13,12 +13,13 @@
  * limitations under the License.
  */
 
+#include "Mod.h"
+
 #include <QDir>
 #include <QString>
 
-#include "Mod.h"
-#include <QDebug>
 #include <FileSystem.h>
+#include <QDebug>
 
 namespace {
 
@@ -26,8 +27,7 @@ ModDetails invalidDetails;
 
 }
 
-
-Mod::Mod(const QFileInfo &file)
+Mod::Mod(const QFileInfo& file)
 {
     repath(file);
     m_changedDateTime = file.lastModified();
@@ -37,13 +37,12 @@ Mod::Mod(const QDir& mods_dir, const Packwiz::Mod& metadata)
     : m_file(mods_dir.absoluteFilePath(metadata.filename))
     // It is weird, but name is not reliable for comparing with the JAR files name
     // FIXME: Maybe use hash when implemented?
-    , m_mmc_id(metadata.filename)
+    , m_internal_id(metadata.filename)
     , m_name(metadata.name)
 {
-    if(m_file.isDir()){
+    if (m_file.isDir()) {
         m_type = MOD_FOLDER;
-    }
-    else{
+    } else {
         if (metadata.filename.endsWith(".zip") || metadata.filename.endsWith(".jar"))
             m_type = MOD_ZIPFILE;
         else if (metadata.filename.endsWith(".litemod"))
@@ -57,43 +56,32 @@ Mod::Mod(const QDir& mods_dir, const Packwiz::Mod& metadata)
     m_changedDateTime = m_file.lastModified();
 }
 
-void Mod::repath(const QFileInfo &file)
+void Mod::repath(const QFileInfo& file)
 {
     m_file = file;
     QString name_base = file.fileName();
 
     m_type = Mod::MOD_UNKNOWN;
 
-    m_mmc_id = name_base;
+    m_internal_id = name_base;
 
-    if (m_file.isDir())
-    {
+    if (m_file.isDir()) {
         m_type = MOD_FOLDER;
         m_name = name_base;
-    }
-    else if (m_file.isFile())
-    {
-        if (name_base.endsWith(".disabled"))
-        {
+    } else if (m_file.isFile()) {
+        if (name_base.endsWith(".disabled")) {
             m_enabled = false;
             name_base.chop(9);
-        }
-        else
-        {
+        } else {
             m_enabled = true;
         }
-        if (name_base.endsWith(".zip") || name_base.endsWith(".jar"))
-        {
+        if (name_base.endsWith(".zip") || name_base.endsWith(".jar")) {
             m_type = MOD_ZIPFILE;
             name_base.chop(4);
-        }
-        else if (name_base.endsWith(".litemod"))
-        {
+        } else if (name_base.endsWith(".litemod")) {
             m_type = MOD_LITEMOD;
             name_base.chop(8);
-        }
-        else
-        {
+        } else {
             m_type = MOD_SINGLEFILE;
         }
         m_name = name_base;
@@ -109,23 +97,22 @@ bool Mod::enable(bool value)
         return false;
 
     QString path = m_file.absoluteFilePath();
-    if (value)
-    {
-        QFile foo(path);
+    QFile file(path);
+    if (value) {
         if (!path.endsWith(".disabled"))
             return false;
         path.chop(9);
-        if (!foo.rename(path))
+
+        if (!file.rename(path))
             return false;
-    }
-    else
-    {
-        QFile foo(path);
+    } else {
         path += ".disabled";
-        if (!foo.rename(path))
+        
+        if (!file.rename(path))
             return false;
     }
-    if(!fromMetadata())
+
+    if (!fromMetadata())
         repath(QFileInfo(path));
 
     m_enabled = value;
@@ -141,29 +128,25 @@ bool Mod::destroy(QDir& index_dir)
     return FS::deletePath(m_file.filePath());
 }
 
-
-const ModDetails & Mod::details() const
-{
-    if(!m_localDetails)
-        return invalidDetails;
-    return *m_localDetails;
-}
-
-
-QString Mod::version() const
+const ModDetails& Mod::details() const
 {
-    return details().version;
+    return m_localDetails ? *m_localDetails : invalidDetails;
 }
 
 QString Mod::name() const
 {
-    auto & d = details();
-    if(!d.name.isEmpty()) {
-        return d.name;
+    auto d_name = details().name;
+    if (!d_name.isEmpty()) {
+        return d_name;
     }
     return m_name;
 }
 
+QString Mod::version() const
+{
+    return details().version;
+}
+
 QString Mod::homeurl() const
 {
     return details().homeurl;
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index c9fd5813..46bb1a59 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -41,7 +41,7 @@ public:
 
     QFileInfo filename()        const { return m_file; }
     QDateTime dateTimeChanged() const { return m_changedDateTime; }
-    QString   mmc_id()          const { return m_mmc_id; }
+    QString   internal_id()     const { return m_internal_id; }
     ModType   type()            const { return m_type; }
     bool      fromMetadata()    const { return m_from_metadata; }
     bool      enabled()         const { return m_enabled; }
@@ -81,7 +81,7 @@ protected:
     QFileInfo m_file;
     QDateTime m_changedDateTime;
 
-    QString m_mmc_id;
+    QString m_internal_id;
     QString m_name;
     ModType m_type = MOD_UNKNOWN;
     bool m_from_metadata = false;
diff --git a/launcher/minecraft/mod/ModDetails.h b/launcher/minecraft/mod/ModDetails.h
index 6ab4aee7..d8d4f66f 100644
--- a/launcher/minecraft/mod/ModDetails.h
+++ b/launcher/minecraft/mod/ModDetails.h
@@ -5,13 +5,24 @@
 
 struct ModDetails
 {
+    /* Mod ID as defined in the ModLoader-specific metadata */
     QString mod_id;
+    
+    /* Human-readable name */
     QString name;
+    
+    /* Human-readable mod version */
     QString version;
+    
+    /* Human-readable minecraft version */
     QString mcversion;
+    
+    /* URL for mod's home page */
     QString homeurl;
-    QString updateurl;
+    
+    /* Human-readable description */
     QString description;
+
+    /* List of the author's names */
     QStringList authors;
-    QString credits;
 };
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index 936b68d3..e2e041eb 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -159,7 +159,7 @@ void ModFolderModel::finishUpdate()
         modsIndex.clear();
         int idx = 0;
         for(auto & mod: mods) {
-            modsIndex[mod.mmc_id()] = idx;
+            modsIndex[mod.internal_id()] = idx;
             idx++;
         }
     }
@@ -182,7 +182,7 @@ void ModFolderModel::resolveMod(Mod& m)
 
     auto task = new LocalModParseTask(nextResolutionTicket, m.type(), m.filename());
     auto result = task->result();
-    result->id = m.mmc_id();
+    result->id = m.internal_id();
     activeTickets.insert(nextResolutionTicket, result);
     m.setResolving(true, nextResolutionTicket);
     nextResolutionTicket++;
@@ -388,7 +388,7 @@ QVariant ModFolderModel::data(const QModelIndex &index, int role) const
         }
 
     case Qt::ToolTipRole:
-        return mods[row].mmc_id();
+        return mods[row].internal_id();
 
     case Qt::CheckStateRole:
         switch (column)
@@ -443,11 +443,11 @@ bool ModFolderModel::setModStatus(int row, ModFolderModel::ModStatusAction actio
     }
 
     // preserve the row, but change its ID
-    auto oldId = mod.mmc_id();
+    auto oldId = mod.internal_id();
     if(!mod.enable(!mod.enabled())) {
         return false;
     }
-    auto newId = mod.mmc_id();
+    auto newId = mod.internal_id();
     if(modsIndex.contains(newId)) {
         // NOTE: this could handle a corner case, where we are overwriting a file, because the same 'mod' exists both enabled and disabled
         // But is it necessary?
diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
index a7bec5ae..3354732b 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
@@ -35,7 +35,6 @@ std::shared_ptr<ModDetails> ReadMCModInfo(QByteArray contents)
             details->name = name;
         }
         details->version = firstObj.value("version").toString();
-        details->updateurl = firstObj.value("updateUrl").toString();
         auto homeurl = firstObj.value("url").toString().trimmed();
         if(!homeurl.isEmpty())
         {
@@ -57,7 +56,6 @@ std::shared_ptr<ModDetails> ReadMCModInfo(QByteArray contents)
         {
             details->authors.append(author.toString());
         }
-        details->credits = firstObj.value("credits").toString();
         return details;
     };
     QJsonParseError jsonError;
@@ -168,27 +166,9 @@ std::shared_ptr<ModDetails> ReadMCModTOML(QByteArray contents)
     }
     if(!authors.isEmpty())
     {
-        // author information is stored as a string now, not a list
         details->authors.append(authors);
     }
-    // is credits even used anywhere? including this for completion/parity with old data version
-    toml_datum_t creditsDatum = toml_string_in(tomlData, "credits");
-    QString credits = "";
-    if(creditsDatum.ok)
-    {
-        authors = creditsDatum.u.s;
-        free(creditsDatum.u.s);
-    }
-    else
-    {
-        creditsDatum = toml_string_in(tomlModsTable0, "credits");
-        if(creditsDatum.ok)
-        {
-            credits = creditsDatum.u.s;
-            free(creditsDatum.u.s);
-        }
-    }
-    details->credits = credits;
+
     toml_datum_t homeurlDatum = toml_string_in(tomlData, "displayURL");
     QString homeurl = "";
     if(homeurlDatum.ok)
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index fd4d6008..bf7b28d6 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -3,32 +3,30 @@
 
 #include "modplatform/packwiz/Packwiz.h"
 
-ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir) :
-    m_mods_dir(mods_dir), m_index_dir(index_dir), m_result(new Result())
-{
-}
+ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir) 
+    : m_mods_dir(mods_dir), m_index_dir(index_dir), m_result(new Result())
+{}
 
 void ModFolderLoadTask::run()
 {
     // Read metadata first
     m_index_dir.refresh();
-    for(auto entry : m_index_dir.entryList()){
+    for (auto entry : m_index_dir.entryList()) {
         // QDir::Filter::NoDotAndDotDot seems to exclude all files for some reason...
-        if(entry == "." || entry == "..")
+        if (entry == "." || entry == "..")
             continue;
 
-        entry.chop(5); // Remove .toml at the end
+        entry.chop(5);  // Remove .toml at the end
         Mod mod(m_mods_dir, Packwiz::getIndexForMod(m_index_dir, entry));
-        m_result->mods[mod.mmc_id()] = mod;
+        m_result->mods[mod.internal_id()] = mod;
     }
 
     // Read JAR files that don't have metadata
     m_mods_dir.refresh();
-    for (auto entry : m_mods_dir.entryInfoList())
-    {
+    for (auto entry : m_mods_dir.entryInfoList()) {
         Mod mod(entry);
-        if(!m_result->mods.contains(mod.mmc_id()))
-            m_result->mods[mod.mmc_id()] = mod;
+        if (!m_result->mods.contains(mod.internal_id()))
+            m_result->mods[mod.internal_id()] = mod;
     }
 
     emit succeeded();
diff --git a/launcher/ui/widgets/MCModInfoFrame.cpp b/launcher/ui/widgets/MCModInfoFrame.cpp
index 8c4bd690..7d78006b 100644
--- a/launcher/ui/widgets/MCModInfoFrame.cpp
+++ b/launcher/ui/widgets/MCModInfoFrame.cpp
@@ -32,7 +32,7 @@ void MCModInfoFrame::updateWithMod(Mod &m)
     QString text = "";
     QString name = "";
     if (m.name().isEmpty())
-        name = m.mmc_id();
+        name = m.internal_id();
     else
         name = m.name();
 
-- 
cgit 


From fab4a7a6029beb60bade312ee89e649202d178de Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Sat, 16 Apr 2022 13:27:29 -0300
Subject: refactor: abstract metadata handling and clarify names

---
 launcher/CMakeLists.txt                            |  1 +
 launcher/MMCZip.cpp                                | 14 ++++----
 launcher/minecraft/MinecraftInstance.cpp           | 10 +++---
 launcher/minecraft/mod/MetadataHandler.h           | 41 ++++++++++++++++++++++
 launcher/minecraft/mod/Mod.cpp                     |  6 ++--
 launcher/minecraft/mod/Mod.h                       |  7 ++--
 launcher/minecraft/mod/ModFolderModel.cpp          |  2 +-
 .../minecraft/mod/tasks/LocalModUpdateTask.cpp     |  6 ++--
 launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp |  4 +--
 launcher/modplatform/packwiz/Packwiz.cpp           | 16 +++++----
 launcher/modplatform/packwiz/Packwiz.h             |  6 +++-
 11 files changed, 82 insertions(+), 31 deletions(-)
 create mode 100644 launcher/minecraft/mod/MetadataHandler.h

(limited to 'launcher/minecraft/mod/Mod.h')

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index b6df2851..03d68e66 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -322,6 +322,7 @@ set(MINECRAFT_SOURCES
     minecraft/WorldList.h
     minecraft/WorldList.cpp
 
+    minecraft/mod/MetadataHandler.h
     minecraft/mod/Mod.h
     minecraft/mod/Mod.cpp
     minecraft/mod/ModDetails.h
diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp
index 8591fcc0..627ceaf1 100644
--- a/launcher/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
@@ -151,23 +151,23 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
             continue;
         if (mod.type() == Mod::MOD_ZIPFILE)
         {
-            if (!mergeZipFiles(&zipOut, mod.filename(), addedFiles))
+            if (!mergeZipFiles(&zipOut, mod.fileinfo(), addedFiles))
             {
                 zipOut.close();
                 QFile::remove(targetJarPath);
-                qCritical() << "Failed to add" << mod.filename().fileName() << "to the jar.";
+                qCritical() << "Failed to add" << mod.fileinfo().fileName() << "to the jar.";
                 return false;
             }
         }
         else if (mod.type() == Mod::MOD_SINGLEFILE)
         {
             // FIXME: buggy - does not work with addedFiles
-            auto filename = mod.filename();
+            auto filename = mod.fileinfo();
             if (!JlCompress::compressFile(&zipOut, filename.absoluteFilePath(), filename.fileName()))
             {
                 zipOut.close();
                 QFile::remove(targetJarPath);
-                qCritical() << "Failed to add" << mod.filename().fileName() << "to the jar.";
+                qCritical() << "Failed to add" << mod.fileinfo().fileName() << "to the jar.";
                 return false;
             }
             addedFiles.insert(filename.fileName());
@@ -176,7 +176,7 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
         {
             // untested, but seems to be unused / not possible to reach
             // FIXME: buggy - does not work with addedFiles
-            auto filename = mod.filename();
+            auto filename = mod.fileinfo();
             QString what_to_zip = filename.absoluteFilePath();
             QDir dir(what_to_zip);
             dir.cdUp();
@@ -193,7 +193,7 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
             {
                 zipOut.close();
                 QFile::remove(targetJarPath);
-                qCritical() << "Failed to add" << mod.filename().fileName() << "to the jar.";
+                qCritical() << "Failed to add" << mod.fileinfo().fileName() << "to the jar.";
                 return false;
             }
             qDebug() << "Adding folder " << filename.fileName() << " from "
@@ -204,7 +204,7 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
             // Make sure we do not continue launching when something is missing or undefined...
             zipOut.close();
             QFile::remove(targetJarPath);
-            qCritical() << "Failed to add unknown mod type" << mod.filename().fileName() << "to the jar.";
+            qCritical() << "Failed to add unknown mod type" << mod.fileinfo().fileName() << "to the jar.";
             return false;
         }
     }
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 61326fac..2f339014 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -659,23 +659,23 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr
             out << QString("%1:").arg(label);
             auto modList = model.allMods();
             std::sort(modList.begin(), modList.end(), [](Mod &a, Mod &b) {
-                auto aName = a.filename().completeBaseName();
-                auto bName = b.filename().completeBaseName();
+                auto aName = a.fileinfo().completeBaseName();
+                auto bName = b.fileinfo().completeBaseName();
                 return aName.localeAwareCompare(bName) < 0;
             });
             for(auto & mod: modList)
             {
                 if(mod.type() == Mod::MOD_FOLDER)
                 {
-                    out << u8"  [📁] " + mod.filename().completeBaseName() + " (folder)";
+                    out << u8"  [📁] " + mod.fileinfo().completeBaseName() + " (folder)";
                     continue;
                 }
 
                 if(mod.enabled()) {
-                    out << u8"  [✔️] " + mod.filename().completeBaseName();
+                    out << u8"  [✔️] " + mod.fileinfo().completeBaseName();
                 }
                 else {
-                    out << u8"  [❌] " + mod.filename().completeBaseName() + " (disabled)";
+                    out << u8"  [❌] " + mod.fileinfo().completeBaseName() + " (disabled)";
                 }
 
             }
diff --git a/launcher/minecraft/mod/MetadataHandler.h b/launcher/minecraft/mod/MetadataHandler.h
new file mode 100644
index 00000000..26b1f799
--- /dev/null
+++ b/launcher/minecraft/mod/MetadataHandler.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <memory>
+
+#include "modplatform/packwiz/Packwiz.h"
+
+// launcher/minecraft/mod/Mod.h
+class Mod;
+
+/* Abstraction file for easily changing the way metadata is stored / handled
+ * Needs to be a class because of -Wunused-function and no C++17 [[maybe_unused]]
+ * */
+class Metadata {
+   public:
+    using ModStruct = Packwiz::V1::Mod;
+
+    static auto create(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> ModStruct
+    {
+        return Packwiz::V1::createModFormat(index_dir, mod_pack, mod_version);
+    }
+
+    static auto create(QDir& index_dir, Mod& internal_mod) -> ModStruct
+    {
+        return Packwiz::V1::createModFormat(index_dir, internal_mod);
+    }
+
+    static void update(QDir& index_dir, ModStruct& mod)
+    {
+        Packwiz::V1::updateModIndex(index_dir, mod);
+    }
+
+    static void remove(QDir& index_dir, QString& mod_name)
+    {
+        Packwiz::V1::deleteModIndex(index_dir, mod_name);
+    }
+
+    static auto get(QDir& index_dir, QString& mod_name) -> ModStruct
+    {
+        return Packwiz::V1::getIndexForMod(index_dir, mod_name);
+    }
+};
diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index 64c9ffb5..5b35156d 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -20,6 +20,7 @@
 
 #include <FileSystem.h>
 #include <QDebug>
+#include "MetadataHandler.h"
 
 namespace {
 
@@ -33,7 +34,7 @@ Mod::Mod(const QFileInfo& file)
     m_changedDateTime = file.lastModified();
 }
 
-Mod::Mod(const QDir& mods_dir, const Packwiz::Mod& metadata)
+Mod::Mod(const QDir& mods_dir, const Metadata::ModStruct& metadata)
     : m_file(mods_dir.absoluteFilePath(metadata.filename))
     // It is weird, but name is not reliable for comparing with the JAR files name
     // FIXME: Maybe use hash when implemented?
@@ -121,8 +122,7 @@ bool Mod::enable(bool value)
 
 bool Mod::destroy(QDir& index_dir)
 {
-    // Delete metadata
-    Packwiz::deleteModIndex(index_dir, m_name);
+    Metadata::remove(index_dir, m_name);
 
     m_type = MOD_UNKNOWN;
     return FS::deletePath(m_file.filePath());
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index 46bb1a59..fef8cbe4 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -21,7 +21,7 @@
 #include <memory>
 
 #include "ModDetails.h"
-#include "modplatform/packwiz/Packwiz.h"
+#include "minecraft/mod/MetadataHandler.h"
 
 class Mod
 {
@@ -37,9 +37,9 @@ public:
 
     Mod() = default;
     Mod(const QFileInfo &file);
-    explicit Mod(const QDir& mods_dir, const Packwiz::Mod& metadata);
+    explicit Mod(const QDir& mods_dir, const Metadata::ModStruct& metadata);
 
-    QFileInfo filename()        const { return m_file; }
+    QFileInfo fileinfo()        const { return m_file; }
     QDateTime dateTimeChanged() const { return m_changedDateTime; }
     QString   internal_id()     const { return m_internal_id; }
     ModType   type()            const { return m_type; }
@@ -82,6 +82,7 @@ protected:
     QDateTime m_changedDateTime;
 
     QString m_internal_id;
+    /* Name as reported via the file name */
     QString m_name;
     ModType m_type = MOD_UNKNOWN;
     bool m_from_metadata = false;
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index e2e041eb..e034e35e 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -180,7 +180,7 @@ void ModFolderModel::resolveMod(Mod& m)
         return;
     }
 
-    auto task = new LocalModParseTask(nextResolutionTicket, m.type(), m.filename());
+    auto task = new LocalModParseTask(nextResolutionTicket, m.type(), m.fileinfo());
     auto result = task->result();
     result->id = m.internal_id();
     activeTickets.insert(nextResolutionTicket, result);
diff --git a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
index 63f5cf9a..8b6e8ec7 100644
--- a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
@@ -3,7 +3,7 @@
 #include <toml.h>
 
 #include "FileSystem.h"
-#include "modplatform/packwiz/Packwiz.h"
+#include "minecraft/mod/MetadataHandler.h"
 
 LocalModUpdateTask::LocalModUpdateTask(QDir index_dir, ModPlatform::IndexedPack& mod, ModPlatform::IndexedVersion& mod_version)
     : m_index_dir(index_dir), m_mod(mod), m_mod_version(mod_version)
@@ -18,8 +18,8 @@ void LocalModUpdateTask::executeTask()
 {
     setStatus(tr("Updating index for mod:\n%1").arg(m_mod.name));
 
-    auto pw_mod = Packwiz::createModFormat(m_index_dir, m_mod, m_mod_version);
-    Packwiz::updateModIndex(m_index_dir, pw_mod);
+    auto pw_mod = Metadata::create(m_index_dir, m_mod, m_mod_version);
+    Metadata::update(m_index_dir, pw_mod);
 
     emitSucceeded();
 }
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index bf7b28d6..e94bdee9 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -1,7 +1,7 @@
 #include "ModFolderLoadTask.h"
 #include <QDebug>
 
-#include "modplatform/packwiz/Packwiz.h"
+#include "minecraft/mod/MetadataHandler.h"
 
 ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir) 
     : m_mods_dir(mods_dir), m_index_dir(index_dir), m_result(new Result())
@@ -17,7 +17,7 @@ void ModFolderLoadTask::run()
             continue;
 
         entry.chop(5);  // Remove .toml at the end
-        Mod mod(m_mods_dir, Packwiz::getIndexForMod(m_index_dir, entry));
+        Mod mod(m_mods_dir, Metadata::get(m_index_dir, entry));
         m_result->mods[mod.internal_id()] = mod;
     }
 
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 445d64fb..27339c2d 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -9,13 +9,15 @@
 #include "modplatform/ModIndex.h"
 #include "minecraft/mod/Mod.h"
 
+namespace Packwiz {
+
 // Helpers
 static inline QString indexFileName(QString const& mod_name)
 {
     return QString("%1.toml").arg(mod_name);
 }
 
-auto Packwiz::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> Mod
+auto V1::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> Mod
 {
     Mod mod;
 
@@ -33,7 +35,7 @@ auto Packwiz::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pac
     return mod;
 }
 
-auto Packwiz::createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod
+auto V1::createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod
 {
     auto mod_name = internal_mod.name();
 
@@ -44,7 +46,7 @@ auto Packwiz::createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod
 
     // Manually construct packwiz mod
     mod.name = internal_mod.name();
-    mod.filename = internal_mod.filename().fileName();
+    mod.filename = internal_mod.fileinfo().fileName();
 
     // TODO: Have a mechanism for telling the UI subsystem that we want to gather user information
     // (i.e. which mod provider we want to use). Maybe an object parameter with a signal for that?
@@ -52,7 +54,7 @@ auto Packwiz::createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod
     return mod;
 }
 
-void Packwiz::updateModIndex(QDir& index_dir, Mod& mod)
+void V1::updateModIndex(QDir& index_dir, Mod& mod)
 {
     if(!mod.isValid()){
         qCritical() << QString("Tried to update metadata of an invalid mod!");
@@ -94,7 +96,7 @@ void Packwiz::updateModIndex(QDir& index_dir, Mod& mod)
     }
 }
 
-void Packwiz::deleteModIndex(QDir& index_dir, QString& mod_name)
+void V1::deleteModIndex(QDir& index_dir, QString& mod_name)
 {
     QFile index_file(index_dir.absoluteFilePath(indexFileName(mod_name)));
 
@@ -108,7 +110,7 @@ void Packwiz::deleteModIndex(QDir& index_dir, QString& mod_name)
     }
 }
 
-auto Packwiz::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
+auto V1::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
 {
     Mod mod;
 
@@ -201,3 +203,5 @@ auto Packwiz::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
 
     return mod;
 }
+
+} // namespace Packwiz
diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
index 457d268a..777a365f 100644
--- a/launcher/modplatform/packwiz/Packwiz.h
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -11,7 +11,9 @@ class QDir;
 // Mod from launcher/minecraft/mod/Mod.h
 class Mod;
 
-class Packwiz {
+namespace Packwiz {
+
+class V1 {
    public:
     struct Mod {
         QString name {};
@@ -58,3 +60,5 @@ class Packwiz {
      * */
     static auto getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod;
 };
+
+} // namespace Packwiz
-- 
cgit 


From 23febc6d94bcc5903a9863ba7b854b5091b0813b Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Sun, 17 Apr 2022 09:30:32 -0300
Subject: feat: cache metadata in ModDetails

Allows for more easy access to the metadata by outside entities
---
 launcher/minecraft/mod/Mod.cpp      | 14 ++++++++++++++
 launcher/minecraft/mod/Mod.h        | 14 ++++++++------
 launcher/minecraft/mod/ModDetails.h |  7 +++++++
 3 files changed, 29 insertions(+), 6 deletions(-)

(limited to 'launcher/minecraft/mod/Mod.h')

diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index 5b35156d..46776239 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -55,6 +55,8 @@ Mod::Mod(const QDir& mods_dir, const Metadata::ModStruct& metadata)
     m_from_metadata = true;
     m_enabled = true;
     m_changedDateTime = m_file.lastModified();
+
+    m_temp_metadata = std::make_shared<Metadata::ModStruct>(std::move(metadata));
 }
 
 void Mod::repath(const QFileInfo& file)
@@ -161,3 +163,15 @@ QStringList Mod::authors() const
 {
     return details().authors;
 }
+
+void Mod::finishResolvingWithDetails(std::shared_ptr<ModDetails> details)
+{
+    m_resolving = false;
+    m_resolved = true;
+    m_localDetails = details;
+
+    if (fromMetadata() && m_temp_metadata->isValid()) {
+        m_localDetails->metadata = m_temp_metadata;
+        m_temp_metadata.reset();
+    }
+}
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index fef8cbe4..0d49d94b 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -18,7 +18,6 @@
 #include <QDateTime>
 #include <QFileInfo>
 #include <QList>
-#include <memory>
 
 #include "ModDetails.h"
 #include "minecraft/mod/MetadataHandler.h"
@@ -55,6 +54,9 @@ public:
     QString description() const;
     QStringList authors() const;
 
+    const std::shared_ptr<Metadata::ModStruct> metadata() const { return details().metadata; };
+    std::shared_ptr<Metadata::ModStruct> metadata() { return m_localDetails->metadata; };
+
     bool enable(bool value);
 
     // delete all the files of this mod
@@ -71,11 +73,7 @@ public:
         m_resolving = resolving;
         m_resolutionTicket = resolutionTicket;
     }
-    void finishResolvingWithDetails(std::shared_ptr<ModDetails> details){
-        m_resolving = false;
-        m_resolved = true;
-        m_localDetails = details;
-    }
+    void finishResolvingWithDetails(std::shared_ptr<ModDetails> details);
 
 protected:
     QFileInfo m_file;
@@ -86,6 +84,10 @@ protected:
     QString m_name;
     ModType m_type = MOD_UNKNOWN;
     bool m_from_metadata = false;
+
+    /* If the mod has metadata, this will be filled in the constructor, and passed to 
+     * the ModDetails when calling finishResolvingWithDetails */
+    std::shared_ptr<Metadata::ModStruct> m_temp_metadata;
     std::shared_ptr<ModDetails> m_localDetails;
 
     bool m_enabled = true;
diff --git a/launcher/minecraft/mod/ModDetails.h b/launcher/minecraft/mod/ModDetails.h
index d8d4f66f..f9973fc2 100644
--- a/launcher/minecraft/mod/ModDetails.h
+++ b/launcher/minecraft/mod/ModDetails.h
@@ -1,8 +1,12 @@
 #pragma once
 
+#include <memory>
+
 #include <QString>
 #include <QStringList>
 
+#include "minecraft/mod/MetadataHandler.h"
+
 struct ModDetails
 {
     /* Mod ID as defined in the ModLoader-specific metadata */
@@ -25,4 +29,7 @@ struct ModDetails
 
     /* List of the author's names */
     QStringList authors;
+
+    /* Metadata information, if any */
+    std::shared_ptr<Metadata::ModStruct> metadata;
 };
-- 
cgit 


From d7f6b3699074b268fd554bd1eb9da68f1e533355 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Sun, 17 Apr 2022 11:40:41 -0300
Subject: test+fix: add basic tests and fix issues with it

---
 launcher/CMakeLists.txt                            |  6 ++
 launcher/minecraft/mod/Mod.cpp                     |  7 +-
 launcher/minecraft/mod/Mod.h                       |  1 -
 launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp | 10 ++-
 launcher/modplatform/ModIndex.h                    |  2 +-
 launcher/modplatform/packwiz/Packwiz.cpp           | 76 +++++++++++++---------
 launcher/modplatform/packwiz/Packwiz.h             | 11 +++-
 launcher/modplatform/packwiz/Packwiz_test.cpp      | 68 +++++++++++++++++++
 .../packwiz/testdata/borderless-mining.toml        | 13 ++++
 .../testdata/screenshot-to-clipboard-fabric.toml   | 13 ++++
 10 files changed, 168 insertions(+), 39 deletions(-)
 create mode 100644 launcher/modplatform/packwiz/Packwiz_test.cpp
 create mode 100644 launcher/modplatform/packwiz/testdata/borderless-mining.toml
 create mode 100644 launcher/modplatform/packwiz/testdata/screenshot-to-clipboard-fabric.toml

(limited to 'launcher/minecraft/mod/Mod.h')

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 03d68e66..6c7b5e43 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -551,6 +551,12 @@ set(PACKWIZ_SOURCES
     modplatform/packwiz/Packwiz.cpp
 )
 
+add_unit_test(Packwiz
+    SOURCES modplatform/packwiz/Packwiz_test.cpp
+    DATA modplatform/packwiz/testdata
+    LIBS Launcher_logic
+    )
+
 set(TECHNIC_SOURCES
     modplatform/technic/SingleZipPackInstallTask.h
     modplatform/technic/SingleZipPackInstallTask.cpp
diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index 7b560845..ef3699e8 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -20,6 +20,8 @@
 
 #include <FileSystem.h>
 #include <QDebug>
+
+#include "Application.h"
 #include "MetadataHandler.h"
 
 namespace {
@@ -174,8 +176,7 @@ void Mod::finishResolvingWithDetails(std::shared_ptr<ModDetails> details)
     m_resolved = true;
     m_localDetails = details;
 
-    if (fromMetadata() && m_temp_metadata->isValid()) {
-        m_localDetails->metadata = m_temp_metadata;
-        m_temp_metadata.reset();
+    if (fromMetadata() && m_temp_metadata->isValid() && m_localDetails.get()) {
+        m_localDetails->metadata.swap(m_temp_metadata);
     }
 }
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index 0d49d94b..1e7ed1ed 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -20,7 +20,6 @@
 #include <QList>
 
 #include "ModDetails.h"
-#include "minecraft/mod/MetadataHandler.h"
 
 class Mod
 {
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index 5afbb08a..03a17461 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -34,8 +34,14 @@ void ModFolderLoadTask::getFromMetadata()
         if (entry == "." || entry == "..")
             continue;
 
-        entry.chop(5);  // Remove .toml at the end
-        Mod mod(m_mods_dir, Metadata::get(m_index_dir, entry));
+        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;
+        }
+
+        Mod mod(m_mods_dir, metadata);
         m_result->mods[mod.internal_id()] = mod;
     }
 }
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index c5329772..ee623b78 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -19,7 +19,7 @@ class ProviderCapabilities {
     {
         switch(p){
         case Provider::MODRINTH:
-            return "sha256";
+            return "sha512";
         case Provider::FLAME:
             return "murmur2";
         }
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 27339c2d..8fd74a3e 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -14,6 +14,8 @@ namespace Packwiz {
 // Helpers
 static inline QString indexFileName(QString const& mod_name)
 {
+    if(mod_name.endsWith(".toml"))
+        return mod_name;
     return QString("%1.toml").arg(mod_name);
 }
 
@@ -91,8 +93,16 @@ void V1::updateModIndex(QDir& index_dir, Mod& mod)
 
         in_stream << QString("\n[update]\n");
         in_stream << QString("[update.%1]\n").arg(ModPlatform::ProviderCapabilities::providerName(mod.provider));
-        addToStream("file-id", mod.file_id.toString());
-        addToStream("project-id", mod.project_id.toString());
+        switch(mod.provider){
+        case(ModPlatform::Provider::FLAME):
+            in_stream << QString("file-id = %1\n").arg(mod.file_id.toString());
+            in_stream << QString("project-id = %1\n").arg(mod.project_id.toString());
+            break;
+        case(ModPlatform::Provider::MODRINTH):
+            addToStream("mod-id", mod.mod_id().toString());
+            addToStream("version", mod.version().toString());
+            break;
+        }
     }
 }
 
@@ -110,18 +120,44 @@ void V1::deleteModIndex(QDir& index_dir, QString& mod_name)
     }
 }
 
-auto V1::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
+// Helper functions for extracting data from the TOML file
+static auto stringEntry(toml_table_t* parent, const char* entry_name) -> QString
+{
+    toml_datum_t var = toml_string_in(parent, entry_name);
+    if (!var.ok) {
+        qCritical() << QString("Failed to read str property '%1' in mod metadata.").arg(entry_name);
+        return {};
+    }
+
+    QString tmp = var.u.s;
+    free(var.u.s);
+
+    return tmp;
+}
+
+static auto intEntry(toml_table_t* parent, const char* entry_name) -> int
+{
+    toml_datum_t var = toml_int_in(parent, entry_name);
+    if (!var.ok) {
+        qCritical() << QString("Failed to read int property '%1' in mod metadata.").arg(entry_name);
+        return {};
+    }
+
+    return var.u.i;
+}
+
+auto V1::getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod
 {
     Mod mod;
 
-    QFile index_file(index_dir.absoluteFilePath(indexFileName(mod_name)));
+    QFile index_file(index_dir.absoluteFilePath(indexFileName(index_file_name)));
 
     if (!index_file.exists()) {
-        qWarning() << QString("Tried to get a non-existent mod metadata for %1").arg(mod_name);
+        qWarning() << QString("Tried to get a non-existent mod metadata for %1").arg(index_file_name);
         return {};
     }
     if (!index_file.open(QIODevice::ReadOnly)) {
-        qWarning() << QString("Failed to open mod metadata for %1").arg(mod_name);
+        qWarning() << QString("Failed to open mod metadata for %1").arg(index_file_name);
         return {};
     }
 
@@ -136,29 +172,9 @@ auto V1::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
         qCritical() << QString("Could not open file %1!").arg(indexFileName(mod.name));
         return {};
     }
-
-    // Helper function for extracting data from the TOML file
-    auto stringEntry = [&](toml_table_t* parent, const char* entry_name) -> QString {
-        toml_datum_t var = toml_string_in(parent, entry_name);
-        if (!var.ok) {
-            qCritical() << QString("Failed to read property '%1' in mod metadata.").arg(entry_name);
-            return {};
-        }
-
-        QString tmp = var.u.s;
-        free(var.u.s);
-
-        return tmp;
-    };
-
+    
     { // Basic info
         mod.name = stringEntry(table, "name");
-        // Basic sanity check
-        if (mod.name != mod_name) {
-            qCritical() << QString("Name mismatch in mod metadata:\nExpected:%1\nGot:%2").arg(mod_name, mod.name);
-            return {};
-        }
-
         mod.filename = stringEntry(table, "filename");
         mod.side = stringEntry(table, "side");
     }
@@ -188,15 +204,17 @@ auto V1::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
         toml_table_t* mod_provider_table;
         if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::FLAME)))) {
             mod.provider = Provider::FLAME;
+            mod.file_id = intEntry(mod_provider_table, "file-id");
+            mod.project_id = intEntry(mod_provider_table, "project-id");
         } else if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::MODRINTH)))) {
             mod.provider = Provider::MODRINTH;
+            mod.mod_id() = stringEntry(mod_provider_table, "mod-id");
+            mod.version() = stringEntry(mod_provider_table, "version");
         } else {
             qCritical() << QString("No mod provider on mod metadata!");
             return {};
         }
         
-        mod.file_id = stringEntry(mod_provider_table, "file-id");
-        mod.project_id = stringEntry(mod_provider_table, "project-id");
     }
 
     toml_free(table);
diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
index 777a365f..69125dbc 100644
--- a/launcher/modplatform/packwiz/Packwiz.h
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -33,8 +33,13 @@ class V1 {
         QVariant project_id {};
 
        public:
-        // This is a heuristic, but should work for now.
-        auto isValid() const -> bool { return !name.isEmpty(); }
+        // This is a totally heuristic, but should work for now.
+        auto isValid() const -> bool { return !name.isEmpty() && !project_id.isNull(); }
+
+        // Different providers can use different names for the same thing
+        // Modrinth-specific
+        auto mod_id() -> QVariant& { return project_id; }
+        auto version() -> QVariant& { return file_id; }
     };
 
     /* Generates the object representing the information in a mod.toml file via
@@ -58,7 +63,7 @@ class V1 {
     /* Gets the metadata for a mod with a particular name.
      * If the mod doesn't have a metadata, it simply returns an empty Mod object.
      * */
-    static auto getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod;
+    static auto getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod;
 };
 
 } // namespace Packwiz
diff --git a/launcher/modplatform/packwiz/Packwiz_test.cpp b/launcher/modplatform/packwiz/Packwiz_test.cpp
new file mode 100644
index 00000000..2e61c167
--- /dev/null
+++ b/launcher/modplatform/packwiz/Packwiz_test.cpp
@@ -0,0 +1,68 @@
+#include <QTemporaryDir>
+#include <QTest>
+
+#include "TestUtil.h"
+#include "Packwiz.h"
+
+class PackwizTest : public QObject {
+    Q_OBJECT
+
+   private slots:
+   // Files taken from https://github.com/packwiz/packwiz-example-pack
+   void loadFromFile_Modrinth()
+   {
+        QString source = QFINDTESTDATA("testdata");
+
+        QDir index_dir(source);
+        QString name_mod("borderless-mining.toml");
+        QVERIFY(index_dir.entryList().contains(name_mod));
+
+        auto metadata = Packwiz::V1::getIndexForMod(index_dir, name_mod);
+
+        QVERIFY(metadata.isValid());
+
+        QCOMPARE(metadata.name, "Borderless Mining");
+        QCOMPARE(metadata.filename, "borderless-mining-1.1.1+1.18.jar");
+        QCOMPARE(metadata.side, "client");
+        
+        QCOMPARE(metadata.url, QUrl("https://cdn.modrinth.com/data/kYq5qkSL/versions/1.1.1+1.18/borderless-mining-1.1.1+1.18.jar"));
+        QCOMPARE(metadata.hash_format, "sha512");
+        QCOMPARE(metadata.hash, "c8fe6e15ddea32668822dddb26e1851e5f03834be4bcb2eff9c0da7fdc086a9b6cead78e31a44d3bc66335cba11144ee0337c6d5346f1ba63623064499b3188d");
+
+        QCOMPARE(metadata.provider, ModPlatform::Provider::MODRINTH);
+        QCOMPARE(metadata.version(), "ug2qKTPR");
+        QCOMPARE(metadata.mod_id(), "kYq5qkSL");
+   }
+
+    void loadFromFile_Curseforge()
+    {
+        QString source = QFINDTESTDATA("testdata");
+
+        QDir index_dir(source);
+        QString name_mod("screenshot-to-clipboard-fabric.toml");
+        QVERIFY(index_dir.entryList().contains(name_mod));
+
+        // Try without the .toml at the end
+        name_mod.chop(5);
+
+        auto metadata = Packwiz::V1::getIndexForMod(index_dir, name_mod);
+
+        QVERIFY(metadata.isValid());
+
+        QCOMPARE(metadata.name, "Screenshot to Clipboard (Fabric)");
+        QCOMPARE(metadata.filename, "screenshot-to-clipboard-1.0.7-fabric.jar");
+        QCOMPARE(metadata.side, "both");
+        
+        QCOMPARE(metadata.url, QUrl("https://edge.forgecdn.net/files/3509/43/screenshot-to-clipboard-1.0.7-fabric.jar"));
+        QCOMPARE(metadata.hash_format, "murmur2");
+        QCOMPARE(metadata.hash, "1781245820");
+
+        QCOMPARE(metadata.provider, ModPlatform::Provider::FLAME);
+        QCOMPARE(metadata.file_id, 3509043);
+        QCOMPARE(metadata.project_id, 327154);
+    }
+};
+
+QTEST_GUILESS_MAIN(PackwizTest)
+
+#include "Packwiz_test.moc"
diff --git a/launcher/modplatform/packwiz/testdata/borderless-mining.toml b/launcher/modplatform/packwiz/testdata/borderless-mining.toml
new file mode 100644
index 00000000..16545fd4
--- /dev/null
+++ b/launcher/modplatform/packwiz/testdata/borderless-mining.toml
@@ -0,0 +1,13 @@
+name = "Borderless Mining"
+filename = "borderless-mining-1.1.1+1.18.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/kYq5qkSL/versions/1.1.1+1.18/borderless-mining-1.1.1+1.18.jar"
+hash-format = "sha512"
+hash = "c8fe6e15ddea32668822dddb26e1851e5f03834be4bcb2eff9c0da7fdc086a9b6cead78e31a44d3bc66335cba11144ee0337c6d5346f1ba63623064499b3188d"
+
+[update]
+[update.modrinth]
+mod-id = "kYq5qkSL"
+version = "ug2qKTPR"
diff --git a/launcher/modplatform/packwiz/testdata/screenshot-to-clipboard-fabric.toml b/launcher/modplatform/packwiz/testdata/screenshot-to-clipboard-fabric.toml
new file mode 100644
index 00000000..87d70ada
--- /dev/null
+++ b/launcher/modplatform/packwiz/testdata/screenshot-to-clipboard-fabric.toml
@@ -0,0 +1,13 @@
+name = "Screenshot to Clipboard (Fabric)"
+filename = "screenshot-to-clipboard-1.0.7-fabric.jar"
+side = "both"
+
+[download]
+url = "https://edge.forgecdn.net/files/3509/43/screenshot-to-clipboard-1.0.7-fabric.jar"
+hash-format = "murmur2"
+hash = "1781245820"
+
+[update]
+[update.curseforge]
+file-id = 3509043
+project-id = 327154
-- 
cgit 


From ba50765c306d2907e411bc0ed9a10d990cf42fd3 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Tue, 19 Apr 2022 20:19:51 -0300
Subject: tidy: apply clang-tidy to some files

Mostly the ones created in this PR + Mod.h / Mod.cpp / ModDetails.h
---
 launcher/minecraft/mod/Mod.cpp                     | 16 ++++-----
 launcher/minecraft/mod/Mod.h                       | 40 +++++++++++-----------
 .../minecraft/mod/tasks/LocalModUpdateTask.cpp     |  2 +-
 launcher/minecraft/mod/tasks/LocalModUpdateTask.h  |  6 ++--
 launcher/modplatform/packwiz/Packwiz.cpp           |  9 ++---
 launcher/modplatform/packwiz/Packwiz_test.cpp      |  2 +-
 6 files changed, 38 insertions(+), 37 deletions(-)

(limited to 'launcher/minecraft/mod/Mod.h')

diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index ef3699e8..992b91dc 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -93,7 +93,7 @@ void Mod::repath(const QFileInfo& file)
     }
 }
 
-bool Mod::enable(bool value)
+auto Mod::enable(bool value) -> bool
 {
     if (m_type == Mod::MOD_UNKNOWN || m_type == Mod::MOD_FOLDER)
         return false;
@@ -124,7 +124,7 @@ bool Mod::enable(bool value)
     return true;
 }
 
-bool Mod::destroy(QDir& index_dir)
+auto Mod::destroy(QDir& index_dir) -> bool
 {
     auto n = name();
     // FIXME: This can fail to remove the metadata if the
@@ -136,12 +136,12 @@ bool Mod::destroy(QDir& index_dir)
     return FS::deletePath(m_file.filePath());
 }
 
-const ModDetails& Mod::details() const
+auto Mod::details() const -> const ModDetails&
 {
     return m_localDetails ? *m_localDetails : invalidDetails;
 }
 
-QString Mod::name() const
+auto Mod::name() const -> QString
 {
     auto d_name = details().name;
     if (!d_name.isEmpty()) {
@@ -150,22 +150,22 @@ QString Mod::name() const
     return m_name;
 }
 
-QString Mod::version() const
+auto Mod::version() const -> QString
 {
     return details().version;
 }
 
-QString Mod::homeurl() const
+auto Mod::homeurl() const -> QString
 {
     return details().homeurl;
 }
 
-QString Mod::description() const
+auto Mod::description() const -> QString
 {
     return details().description;
 }
 
-QStringList Mod::authors() const
+auto Mod::authors() const -> QStringList
 {
     return details().authors;
 }
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index 1e7ed1ed..3a0ccfa6 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -37,36 +37,36 @@ public:
     Mod(const QFileInfo &file);
     explicit Mod(const QDir& mods_dir, const Metadata::ModStruct& metadata);
 
-    QFileInfo fileinfo()        const { return m_file; }
-    QDateTime dateTimeChanged() const { return m_changedDateTime; }
-    QString   internal_id()     const { return m_internal_id; }
-    ModType   type()            const { return m_type; }
-    bool      fromMetadata()    const { return m_from_metadata; }
-    bool      enabled()         const { return m_enabled; }
+    auto fileinfo()        const -> QFileInfo { return m_file; }
+    auto dateTimeChanged() const -> QDateTime { return m_changedDateTime; }
+    auto internal_id()     const -> QString { return m_internal_id; }
+    auto type()            const -> ModType { return m_type; }
+    auto fromMetadata()    const -> bool { return m_from_metadata; }
+    auto enabled()         const -> bool { return m_enabled; }
 
-    bool valid() const { return m_type != MOD_UNKNOWN; }
+    auto valid() const -> bool { return m_type != MOD_UNKNOWN; }
 
-    const ModDetails& details() const;
-    QString name()        const;
-    QString version()     const;
-    QString homeurl()     const;
-    QString description() const;
-    QStringList authors() const;
+    auto details()     const -> const ModDetails&;
+    auto name()        const -> QString;
+    auto version()     const -> QString;
+    auto homeurl()     const -> QString;
+    auto description() const -> QString;
+    auto authors()     const -> QStringList;
 
-    const std::shared_ptr<Metadata::ModStruct> metadata() const { return details().metadata; };
-    std::shared_ptr<Metadata::ModStruct> metadata() { return m_localDetails->metadata; };
+    auto metadata() const -> const std::shared_ptr<Metadata::ModStruct> { return details().metadata; };
+    auto metadata() -> std::shared_ptr<Metadata::ModStruct> { return m_localDetails->metadata; };
 
-    bool enable(bool value);
+    auto enable(bool value) -> bool;
 
     // delete all the files of this mod
-    bool destroy(QDir& index_dir);
+    auto destroy(QDir& index_dir) -> bool;
 
     // change the mod's filesystem path (used by mod lists for *MAGIC* purposes)
     void repath(const QFileInfo &file);
 
-    bool shouldResolve()    const { return !m_resolving && !m_resolved; }
-    bool isResolving()      const { return m_resolving; }
-    int  resolutionTicket() const { return m_resolutionTicket; }
+    auto shouldResolve()    const -> bool { return !m_resolving && !m_resolved; }
+    auto isResolving()      const -> bool { return m_resolving; }
+    auto resolutionTicket() const -> int  { return m_resolutionTicket; }
 
     void setResolving(bool resolving, int resolutionTicket) {
         m_resolving = resolving;
diff --git a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
index 3c9b76a8..47207ada 100644
--- a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
@@ -30,7 +30,7 @@ void LocalModUpdateTask::executeTask()
     emitSucceeded();
 }
 
-bool LocalModUpdateTask::abort()
+auto LocalModUpdateTask::abort() -> bool
 {
     emitAborted();
     return true;
diff --git a/launcher/minecraft/mod/tasks/LocalModUpdateTask.h b/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
index 866089e9..15591b21 100644
--- a/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
+++ b/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
@@ -2,8 +2,8 @@
 
 #include <QDir>
 
-#include "tasks/Task.h"
 #include "modplatform/ModIndex.h"
+#include "tasks/Task.h"
 
 class LocalModUpdateTask : public Task {
     Q_OBJECT
@@ -12,8 +12,8 @@ class LocalModUpdateTask : public Task {
 
     explicit LocalModUpdateTask(QDir mods_dir, ModPlatform::IndexedPack& mod, ModPlatform::IndexedVersion& mod_version);
 
-    bool canAbort() const override { return true; }
-    bool abort() override;
+    auto canAbort() const -> bool override { return true; }
+    auto abort() -> bool override;
 
    protected slots:
     //! Entry point for tasks.
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 8fd74a3e..978be462 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -6,13 +6,13 @@
 
 #include "toml.h"
 
-#include "modplatform/ModIndex.h"
 #include "minecraft/mod/Mod.h"
+#include "modplatform/ModIndex.h"
 
 namespace Packwiz {
 
 // Helpers
-static inline QString indexFileName(QString const& mod_name)
+static inline auto indexFileName(QString const& mod_name) -> QString
 {
     if(mod_name.endsWith(".toml"))
         return mod_name;
@@ -161,8 +161,9 @@ auto V1::getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod
         return {};
     }
 
-    toml_table_t* table;
+    toml_table_t* table = nullptr;
 
+    // NOLINTNEXTLINE(modernize-avoid-c-arrays)
     char errbuf[200];
     table = toml_parse(index_file.readAll().data(), errbuf, sizeof(errbuf));
 
@@ -201,7 +202,7 @@ auto V1::getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod
             return {};
         }
 
-        toml_table_t* mod_provider_table;
+        toml_table_t* mod_provider_table = nullptr;
         if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::FLAME)))) {
             mod.provider = Provider::FLAME;
             mod.file_id = intEntry(mod_provider_table, "file-id");
diff --git a/launcher/modplatform/packwiz/Packwiz_test.cpp b/launcher/modplatform/packwiz/Packwiz_test.cpp
index 2e61c167..08de332d 100644
--- a/launcher/modplatform/packwiz/Packwiz_test.cpp
+++ b/launcher/modplatform/packwiz/Packwiz_test.cpp
@@ -1,8 +1,8 @@
 #include <QTemporaryDir>
 #include <QTest>
 
-#include "TestUtil.h"
 #include "Packwiz.h"
+#include "TestUtil.h"
 
 class PackwizTest : public QObject {
     Q_OBJECT
-- 
cgit 


From 96e36f060443cbfa6d58df2adca3c8605851b4a3 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Wed, 20 Apr 2022 18:45:39 -0300
Subject: refactor: make mod metadata presence (or lack of) easier to find out

---
 launcher/minecraft/mod/Mod.cpp                     | 28 +++++++++++++++++++---
 launcher/minecraft/mod/Mod.h                       |  6 +++--
 launcher/minecraft/mod/ModDetails.h                |  9 +++++++
 launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp |  8 ++++++-
 launcher/modplatform/ModIndex.cpp                  |  2 ++
 launcher/modplatform/packwiz/Packwiz.cpp           |  9 ++-----
 6 files changed, 49 insertions(+), 13 deletions(-)

(limited to 'launcher/minecraft/mod/Mod.h')

diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index 992b91dc..261ae9d2 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -54,7 +54,6 @@ Mod::Mod(const QDir& mods_dir, const Metadata::ModStruct& metadata)
             m_type = MOD_SINGLEFILE;
     }
 
-    m_from_metadata = true;
     m_enabled = true;
     m_changedDateTime = m_file.lastModified();
 
@@ -117,13 +116,27 @@ auto Mod::enable(bool value) -> bool
             return false;
     }
 
-    if (!fromMetadata())
+    if (status() == ModStatus::NoMetadata)
         repath(QFileInfo(path));
 
     m_enabled = value;
     return true;
 }
 
+void Mod::setStatus(ModStatus status)
+{
+    if(m_localDetails.get())
+        m_localDetails->status = status;
+}
+void Mod::setMetadata(Metadata::ModStruct* metadata)
+{
+    if(status() == ModStatus::NoMetadata)
+        setStatus(ModStatus::Installed);
+
+    if(m_localDetails.get())
+        m_localDetails->metadata.reset(metadata);
+}
+
 auto Mod::destroy(QDir& index_dir) -> bool
 {
     auto n = name();
@@ -170,13 +183,22 @@ auto Mod::authors() const -> QStringList
     return details().authors;
 }
 
+auto Mod::status() const -> ModStatus
+{
+    return details().status;
+}
+
 void Mod::finishResolvingWithDetails(std::shared_ptr<ModDetails> details)
 {
     m_resolving = false;
     m_resolved = true;
     m_localDetails = details;
 
-    if (fromMetadata() && m_temp_metadata->isValid() && m_localDetails.get()) {
+    if (status() != ModStatus::NoMetadata 
+            && m_temp_metadata.get()
+            && m_temp_metadata->isValid() && 
+            m_localDetails.get()) {
+        
         m_localDetails->metadata.swap(m_temp_metadata);
     }
 }
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index 3a0ccfa6..58c7a80f 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -41,7 +41,6 @@ public:
     auto dateTimeChanged() const -> QDateTime { return m_changedDateTime; }
     auto internal_id()     const -> QString { return m_internal_id; }
     auto type()            const -> ModType { return m_type; }
-    auto fromMetadata()    const -> bool { return m_from_metadata; }
     auto enabled()         const -> bool { return m_enabled; }
 
     auto valid() const -> bool { return m_type != MOD_UNKNOWN; }
@@ -52,10 +51,14 @@ public:
     auto homeurl()     const -> QString;
     auto description() const -> QString;
     auto authors()     const -> QStringList;
+    auto status()      const -> ModStatus;
 
     auto metadata() const -> const std::shared_ptr<Metadata::ModStruct> { return details().metadata; };
     auto metadata() -> std::shared_ptr<Metadata::ModStruct> { return m_localDetails->metadata; };
 
+    void setStatus(ModStatus status);
+    void setMetadata(Metadata::ModStruct* metadata);
+
     auto enable(bool value) -> bool;
 
     // delete all the files of this mod
@@ -82,7 +85,6 @@ protected:
     /* Name as reported via the file name */
     QString m_name;
     ModType m_type = MOD_UNKNOWN;
-    bool m_from_metadata = false;
 
     /* If the mod has metadata, this will be filled in the constructor, and passed to 
      * the ModDetails when calling finishResolvingWithDetails */
diff --git a/launcher/minecraft/mod/ModDetails.h b/launcher/minecraft/mod/ModDetails.h
index f9973fc2..75ffea32 100644
--- a/launcher/minecraft/mod/ModDetails.h
+++ b/launcher/minecraft/mod/ModDetails.h
@@ -7,6 +7,12 @@
 
 #include "minecraft/mod/MetadataHandler.h"
 
+enum class ModStatus {
+    Installed,      // Both JAR and Metadata are present
+    NotInstalled,   // Only the Metadata is present
+    NoMetadata,     // Only the JAR is present
+};
+
 struct ModDetails
 {
     /* Mod ID as defined in the ModLoader-specific metadata */
@@ -30,6 +36,9 @@ struct ModDetails
     /* List of the author's names */
     QStringList authors;
 
+    /* Installation status of the mod */
+    ModStatus status;
+
     /* Metadata information, if any */
     std::shared_ptr<Metadata::ModStruct> metadata;
 };
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index 03a17461..addb0dd8 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -19,8 +19,13 @@ void ModFolderLoadTask::run()
     m_mods_dir.refresh();
     for (auto entry : m_mods_dir.entryInfoList()) {
         Mod mod(entry);
-        if (!m_result->mods.contains(mod.internal_id()))
+        if(m_result->mods.contains(mod.internal_id())){
+            m_result->mods[mod.internal_id()].setStatus(ModStatus::Installed);
+        }
+        else {
             m_result->mods[mod.internal_id()] = mod;
+            m_result->mods[mod.internal_id()].setStatus(ModStatus::NoMetadata);
+        }
     }
 
     emit succeeded();
@@ -42,6 +47,7 @@ void ModFolderLoadTask::getFromMetadata()
         }
 
         Mod mod(m_mods_dir, metadata);
+        mod.setStatus(ModStatus::NotInstalled);
         m_result->mods[mod.internal_id()] = mod;
     }
 }
diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index eb8be992..b3c057fb 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -10,6 +10,7 @@ auto ProviderCapabilities::name(Provider p) -> const char*
     case Provider::FLAME:
         return "curseforge";
     }
+    return {};
 }
 auto ProviderCapabilities::hashType(Provider p) -> QString
 {
@@ -19,6 +20,7 @@ auto ProviderCapabilities::hashType(Provider p) -> QString
     case Provider::FLAME:
         return "murmur2";
     }
+    return {};
 }
 
 } // namespace ModPlatform
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 872da9b1..50f87c24 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -48,14 +48,9 @@ auto V1::createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod
     if(mod.isValid())
         return mod;
 
-    // Manually construct packwiz mod
-    mod.name = internal_mod.name();
-    mod.filename = internal_mod.fileinfo().fileName();
+    qWarning() << QString("Tried to create mod metadata with a Mod without metadata!");
 
-    // TODO: Have a mechanism for telling the UI subsystem that we want to gather user information
-    // (i.e. which mod provider we want to use). Maybe an object parameter with a signal for that?
-
-    return mod;
+    return {};
 }
 
 void V1::updateModIndex(QDir& index_dir, Mod& mod)
-- 
cgit 


From 2fc1b999117ceebc3ebf05d96b0a749e3a0f9e98 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Tue, 10 May 2022 19:57:47 -0300
Subject: chore: add license headers

Prevents a massive inload of Scrumplex ditto's :)

I didn't add it to every file modified in this PR because the other
changes are pretty minor, and would explode the diff of the PR. I hope
that's not a problem O_O
---
 launcher/ModDownloadTask.cpp                       | 20 ++++++++-
 launcher/ModDownloadTask.h                         | 27 +++++++++---
 launcher/minecraft/mod/MetadataHandler.h           | 18 ++++++++
 launcher/minecraft/mod/Mod.cpp                     | 48 +++++++++++++++-------
 launcher/minecraft/mod/Mod.h                       | 48 +++++++++++++++-------
 launcher/minecraft/mod/ModDetails.h                | 35 ++++++++++++++++
 .../minecraft/mod/tasks/LocalModUpdateTask.cpp     | 20 ++++++++-
 launcher/minecraft/mod/tasks/LocalModUpdateTask.h  | 18 ++++++++
 launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp | 36 +++++++++++++++-
 launcher/minecraft/mod/tasks/ModFolderLoadTask.h   | 35 ++++++++++++++++
 launcher/modplatform/ModIndex.cpp                  | 18 ++++++++
 launcher/modplatform/ModIndex.h                    | 18 ++++++++
 .../modplatform/modrinth/ModrinthPackIndex.cpp     | 29 ++++++-------
 launcher/modplatform/packwiz/Packwiz.cpp           | 18 ++++++++
 launcher/modplatform/packwiz/Packwiz.h             | 18 ++++++++
 launcher/modplatform/packwiz/Packwiz_test.cpp      | 18 ++++++++
 16 files changed, 373 insertions(+), 51 deletions(-)

(limited to 'launcher/minecraft/mod/Mod.h')

diff --git a/launcher/ModDownloadTask.cpp b/launcher/ModDownloadTask.cpp
index 52de9c94..301b6637 100644
--- a/launcher/ModDownloadTask.cpp
+++ b/launcher/ModDownloadTask.cpp
@@ -1,7 +1,25 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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 "ModDownloadTask.h"
 
 #include "Application.h"
-#include "minecraft/mod/tasks/LocalModUpdateTask.h"
+#include "minecraft/mod/ModFolderModel.h"
 
 ModDownloadTask::ModDownloadTask(ModPlatform::IndexedPack mod, ModPlatform::IndexedVersion version, const std::shared_ptr<ModFolderModel> mods)
     : m_mod(mod), m_mod_version(version), mods(mods)
diff --git a/launcher/ModDownloadTask.h b/launcher/ModDownloadTask.h
index 5eaee187..f4438a8d 100644
--- a/launcher/ModDownloadTask.h
+++ b/launcher/ModDownloadTask.h
@@ -1,14 +1,31 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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 <QUrl>
-#include "QObjectPtr.h"
-#include "minecraft/mod/ModFolderModel.h"
-#include "modplatform/ModIndex.h"
 #include "net/NetJob.h"
-
 #include "tasks/SequentialTask.h"
+
+#include "modplatform/ModIndex.h"
 #include "minecraft/mod/tasks/LocalModUpdateTask.h"
 
+class ModFolderModel;
+
 class ModDownloadTask : public SequentialTask {
     Q_OBJECT
 public:
diff --git a/launcher/minecraft/mod/MetadataHandler.h b/launcher/minecraft/mod/MetadataHandler.h
index 26b1f799..56962818 100644
--- a/launcher/minecraft/mod/MetadataHandler.h
+++ b/launcher/minecraft/mod/MetadataHandler.h
@@ -1,3 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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 <memory>
diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index 261ae9d2..71a32d32 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -1,17 +1,37 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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/>.
+*
+* This file incorporates work covered by the following copyright and
+* permission notice:
+*
+*      Copyright 2013-2021 MultiMC Contributors
+*
+*      Licensed under the Apache License, Version 2.0 (the "License");
+*      you may not use this file except in compliance with the License.
+*      You may obtain a copy of the License at
+*
+*          http://www.apache.org/licenses/LICENSE-2.0
+*
+*      Unless required by applicable law or agreed to in writing, software
+*      distributed under the License is distributed on an "AS IS" BASIS,
+*      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*      See the License for the specific language governing permissions and
+*      limitations under the License.
+*/
 
 #include "Mod.h"
 
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index 58c7a80f..96d471b4 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -1,17 +1,37 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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/>.
+*
+* This file incorporates work covered by the following copyright and
+* permission notice:
+*
+*      Copyright 2013-2021 MultiMC Contributors
+*
+*      Licensed under the Apache License, Version 2.0 (the "License");
+*      you may not use this file except in compliance with the License.
+*      You may obtain a copy of the License at
+*
+*          http://www.apache.org/licenses/LICENSE-2.0
+*
+*      Unless required by applicable law or agreed to in writing, software
+*      distributed under the License is distributed on an "AS IS" BASIS,
+*      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*      See the License for the specific language governing permissions and
+*      limitations under the License.
+*/
 
 #pragma once
 
diff --git a/launcher/minecraft/mod/ModDetails.h b/launcher/minecraft/mod/ModDetails.h
index 75ffea32..3e0a7ab0 100644
--- a/launcher/minecraft/mod/ModDetails.h
+++ b/launcher/minecraft/mod/ModDetails.h
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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/>.
+*
+* This file incorporates work covered by the following copyright and
+* permission notice:
+*
+*      Copyright 2013-2021 MultiMC Contributors
+*
+*      Licensed under the Apache License, Version 2.0 (the "License");
+*      you may not use this file except in compliance with the License.
+*      You may obtain a copy of the License at
+*
+*          http://www.apache.org/licenses/LICENSE-2.0
+*
+*      Unless required by applicable law or agreed to in writing, software
+*      distributed under the License is distributed on an "AS IS" BASIS,
+*      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*      See the License for the specific language governing permissions and
+*      limitations under the License.
+*/
+
 #pragma once
 
 #include <memory>
diff --git a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
index 47207ada..cbe16567 100644
--- a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
@@ -1,6 +1,22 @@
-#include "LocalModUpdateTask.h"
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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 <toml.h>
+#include "LocalModUpdateTask.h"
 
 #include "Application.h"
 #include "FileSystem.h"
diff --git a/launcher/minecraft/mod/tasks/LocalModUpdateTask.h b/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
index f21c0b06..2db183e0 100644
--- a/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
+++ b/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
@@ -1,3 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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 <QDir>
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index fe807a29..62d856f6 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -1,5 +1,39 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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/>.
+*
+* This file incorporates work covered by the following copyright and
+* permission notice:
+*
+*      Copyright 2013-2021 MultiMC Contributors
+*
+*      Licensed under the Apache License, Version 2.0 (the "License");
+*      you may not use this file except in compliance with the License.
+*      You may obtain a copy of the License at
+*
+*          http://www.apache.org/licenses/LICENSE-2.0
+*
+*      Unless required by applicable law or agreed to in writing, software
+*      distributed under the License is distributed on an "AS IS" BASIS,
+*      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*      See the License for the specific language governing permissions and
+*      limitations under the License.
+*/
+
 #include "ModFolderLoadTask.h"
-#include <QDebug>
 
 #include "Application.h"
 #include "minecraft/mod/MetadataHandler.h"
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.h b/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
index ba997874..89a0f84e 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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/>.
+*
+* This file incorporates work covered by the following copyright and
+* permission notice:
+*
+*      Copyright 2013-2021 MultiMC Contributors
+*
+*      Licensed under the Apache License, Version 2.0 (the "License");
+*      you may not use this file except in compliance with the License.
+*      You may obtain a copy of the License at
+*
+*          http://www.apache.org/licenses/LICENSE-2.0
+*
+*      Unless required by applicable law or agreed to in writing, software
+*      distributed under the License is distributed on an "AS IS" BASIS,
+*      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*      See the License for the specific language governing permissions and
+*      limitations under the License.
+*/
+
 #pragma once
 
 #include <QDir>
diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 6027c4f3..3c4b7887 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -1,3 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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 "modplatform/ModIndex.h"
 
 #include <QCryptographicHash>
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 8ada1fc6..04dd2dac 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -1,3 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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 <QList>
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index 30693a82..fdce71c3 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -1,19 +1,20 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
- *
- *  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/>.
- */
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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 "ModrinthPackIndex.h"
 #include "ModrinthAPI.h"
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 1ad6d75b..91a5f9c6 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -1,3 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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 "Packwiz.h"
 
 #include <QDebug>
diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
index e66d0030..58b86484 100644
--- a/launcher/modplatform/packwiz/Packwiz.h
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -1,3 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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 "modplatform/ModIndex.h"
diff --git a/launcher/modplatform/packwiz/Packwiz_test.cpp b/launcher/modplatform/packwiz/Packwiz_test.cpp
index 9f3c486e..023b990e 100644
--- a/launcher/modplatform/packwiz/Packwiz_test.cpp
+++ b/launcher/modplatform/packwiz/Packwiz_test.cpp
@@ -1,3 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*
+*  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 <QTemporaryDir>
 #include <QTest>
 
-- 
cgit