GH-2819 mod list filter now also looks at descriptions and authors

MultiMC · Jan 8, 2020 · 355e5e2 · 355e5e2
1 parent 8bdff97
commit 355e5e2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/api/logic/minecraft/mod/ModFolderModel.h b/api/logic/minecraft/mod/ModFolderModel.h
@@ -85,6 +85,10 @@ class MULTIMC_LOGIC_EXPORT ModFolderModel : public QAbstractListModel
     {
         return mods[index];
     }
+    const Mod &at(size_t index) const
+    {
+        return mods.at(index);
+    }
 
     /// Reloads the mod list and returns true if the list changed.
     bool update();

diff --git a/application/pages/instance/ModFolderPage.cpp b/application/pages/instance/ModFolderPage.cpp
@@ -51,6 +51,26 @@ class ModSortProxy : public QSortFilterProxyModel
     }
 
 protected:
+    bool filterAcceptsRow(int source_row, const QModelIndex & source_parent) const override {
+        ModFolderModel *model = qobject_cast<ModFolderModel *>(sourceModel());
+        if(!model) {
+            return false;
+        }
+        const auto &mod = model->at(source_row);
+        if(mod.name().contains(filterRegExp())) {
+            return true;
+        }
+        if(mod.description().contains(filterRegExp())) {
+            return true;
+        }
+        for(auto & author: mod.authors()) {
+            if (author.contains(filterRegExp())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     bool lessThan(const QModelIndex & source_left, const QModelIndex & source_right) const override
     {
         ModFolderModel *model = qobject_cast<ModFolderModel *>(sourceModel());