From 589d8b6923531a53cbccabb8b79ed9861d0fe27c Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 16 Aug 2023 19:53:39 +0300
Subject: feat:Added remove metadata button

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/minecraft/mod/Mod.cpp            | 18 ++++++++++++------
 launcher/minecraft/mod/Mod.h              |  2 ++
 launcher/minecraft/mod/ModFolderModel.cpp | 19 +++++++++++++++++++
 launcher/minecraft/mod/ModFolderModel.h   |  1 +
 4 files changed, 34 insertions(+), 6 deletions(-)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index ae3dea8d..c9952998 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -132,17 +132,23 @@ auto Mod::destroy(QDir& index_dir, bool preserve_metadata, bool attempt_trash) -
     if (!preserve_metadata) {
         qDebug() << QString("Destroying metadata for '%1' on purpose").arg(name());
 
-        if (metadata()) {
-            Metadata::remove(index_dir, metadata()->slug);
-        } else {
-            auto n = name();
-            Metadata::remove(index_dir, n);
-        }
+        destroyMetadata(index_dir);
     }
 
     return Resource::destroy(attempt_trash);
 }
 
+void Mod::destroyMetadata(QDir& index_dir)
+{
+    if (metadata()) {
+        Metadata::remove(index_dir, metadata()->slug);
+    } else {
+        auto n = name();
+        Metadata::remove(index_dir, n);
+    }
+    m_local_details.metadata = nullptr;
+}
+
 auto Mod::details() const -> const ModDetails&
 {
     return m_local_details;
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index 6dafecfc..e97ee9d3 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -93,6 +93,8 @@ class Mod : public Resource {
 
     // Delete all the files of this mod
     auto destroy(QDir& index_dir, bool preserve_metadata = false, bool attempt_trash = true) -> bool;
+    // Delete the metadata only
+    void destroyMetadata(QDir& index_dir);
 
     void finishResolvingWithDetails(ModDetails&& details);
 
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index 280e70d7..d6ce98ed 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -228,6 +228,25 @@ bool ModFolderModel::deleteMods(const QModelIndexList& indexes)
     return true;
 }
 
+bool ModFolderModel::deleteModsMeatadata(const QModelIndexList& indexes)
+{
+    if (indexes.isEmpty())
+        return true;
+
+    for (auto i : indexes) {
+        if (i.column() != 0) {
+            continue;
+        }
+        auto m = at(i.row());
+        auto index_dir = indexDir();
+        m->destroyMetadata(index_dir);
+    }
+
+    update();
+
+    return true;
+}
+
 bool ModFolderModel::isValid()
 {
     return m_dir.exists() && m_dir.isReadable();
diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index 06fd7814..c512c58f 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -79,6 +79,7 @@ class ModFolderModel : public ResourceFolderModel {
 
     /// Deletes all the selected mods
     bool deleteMods(const QModelIndexList& indexes);
+    bool deleteModsMeatadata(const QModelIndexList& indexes);
 
     bool isValid();
 
-- 
cgit 


From f919d363b706e4c00317b56849702d8f95446bdb Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 16 Aug 2023 20:02:32 +0300
Subject: made safe for vegetarians

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/minecraft/mod/ModFolderModel.cpp    | 2 +-
 launcher/minecraft/mod/ModFolderModel.h      | 2 +-
 launcher/ui/pages/instance/ModFolderPage.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index d6ce98ed..42ee9499 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -228,7 +228,7 @@ bool ModFolderModel::deleteMods(const QModelIndexList& indexes)
     return true;
 }
 
-bool ModFolderModel::deleteModsMeatadata(const QModelIndexList& indexes)
+bool ModFolderModel::deleteModsMetadata(const QModelIndexList& indexes)
 {
     if (indexes.isEmpty())
         return true;
diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index c512c58f..4d1bafae 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -79,7 +79,7 @@ class ModFolderModel : public ResourceFolderModel {
 
     /// Deletes all the selected mods
     bool deleteMods(const QModelIndexList& indexes);
-    bool deleteModsMeatadata(const QModelIndexList& indexes);
+    bool deleteModsMetadata(const QModelIndexList& indexes);
 
     bool isValid();
 
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 146e1d97..d4e7a25c 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -328,5 +328,5 @@ void ModFolderPage::deleteModMetadata()
                         ->exec();
 
     if (response == QMessageBox::Yes)
-        m_model->deleteModsMeatadata(selection);
+        m_model->deleteModsMetadata(selection);
 }
-- 
cgit