From 139c33ccc4f529083b0288907caad2946a3f5a8f Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 25 Jun 2019 11:41:00 -0400
Subject: various optimizations and caching fixed conflict list not sorting
 when changing parameters switched from QDirIterator to std::filesystem, much
 faster FilterWidget precompiles the list

---
 src/filterwidget.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/filterwidget.cpp')

diff --git a/src/filterwidget.cpp b/src/filterwidget.cpp
index 16a46b0e..82644658 100644
--- a/src/filterwidget.cpp
+++ b/src/filterwidget.cpp
@@ -30,21 +30,29 @@ void FilterWidget::clear()
   m_edit->clear();
 }
 
-bool FilterWidget::matches(std::function<bool (const QString& what)> pred) const
+void FilterWidget::compile()
 {
+  m_compiled.clear();
+
   const QStringList ORList = [&] {
     QString filterCopy = QString(m_text);
     filterCopy.replace("||", ";").replace("OR", ";").replace("|", ";");
     return filterCopy.split(";", QString::SkipEmptyParts);
   }();
 
-  if (ORList.isEmpty() || !pred) {
+  // split in ORSegments that internally use AND logic
+  for (auto& ORSegment : ORList) {
+    m_compiled.push_back(ORSegment.split(" ", QString::SkipEmptyParts));
+  }
+}
+
+bool FilterWidget::matches(std::function<bool (const QString& what)> pred) const
+{
+  if (m_compiled.isEmpty() || !pred) {
     return true;
   }
 
-  // split in ORSegments that internally use AND logic
-  for (auto& ORSegment : ORList) {
-    QStringList ANDKeywords = ORSegment.split(" ", QString::SkipEmptyParts);
+  for (auto& ANDKeywords : m_compiled) {
     bool segmentGood = true;
 
     // check each word in the segment for match, each word needs to be matched
@@ -115,6 +123,7 @@ void FilterWidget::onTextChanged()
 
   if (text != m_text) {
     m_text = text;
+    compile();
 
     if (changed) {
       changed();
-- 
cgit v1.3.1


From 19a19ead4059c600680d6e7ac193490e32e03245 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 25 Jun 2019 16:41:32 -0400
Subject: filterwidget now support automatically installing a proxy on lists
 filters on txt and ini tabs

---
 src/filterwidget.cpp           | 70 +++++++++++++++++++++++++++++++++++++++---
 src/filterwidget.h             | 41 ++++++++++++++++++++++---
 src/modinfodialog.ui           |  8 ++++-
 src/modinfodialogconflicts.cpp |  4 +--
 src/modinfodialogtextfiles.cpp | 13 +++++---
 src/modinfodialogtextfiles.h   |  4 ++-
 6 files changed, 123 insertions(+), 17 deletions(-)

(limited to 'src/filterwidget.cpp')

diff --git a/src/filterwidget.cpp b/src/filterwidget.cpp
index 82644658..1b9efd7c 100644
--- a/src/filterwidget.cpp
+++ b/src/filterwidget.cpp
@@ -1,12 +1,41 @@
 #include "filterwidget.h"
 #include "eventfilter.h"
 
-FilterWidget::FilterWidget()
-  : m_edit(nullptr), m_eventFilter(nullptr), m_clear(nullptr)
+FilterWidgetProxyModel::FilterWidgetProxyModel(FilterWidget& fw, QWidget* parent)
+  : QSortFilterProxyModel(parent), m_filter(fw)
 {
+  connect(&fw, &FilterWidget::changed, [&]{ invalidateFilter(); });
 }
 
-void FilterWidget::set(QLineEdit* edit)
+bool FilterWidgetProxyModel::filterAcceptsRow(
+  int sourceRow, const QModelIndex& sourceParent) const
+{
+  const auto cols = sourceModel()->columnCount();
+
+  const auto m = m_filter.matches([&](auto&& what) {
+    for (int c=0; c<cols; ++c) {
+      QModelIndex index = sourceModel()->index(sourceRow, c, sourceParent);
+      const auto text = sourceModel()->data(index, Qt::DisplayRole).toString();
+
+      if (text.contains(what, Qt::CaseInsensitive)) {
+        return true;
+      }
+    }
+
+    return false;
+    });
+
+  return m;
+}
+
+
+FilterWidget::FilterWidget() :
+  m_edit(nullptr), m_list(nullptr), m_proxy(nullptr),
+  m_eventFilter(nullptr), m_clear(nullptr)
+{
+}
+
+void FilterWidget::setEdit(QLineEdit* edit)
 {
   unhook();
 
@@ -16,11 +45,22 @@ void FilterWidget::set(QLineEdit* edit)
     return;
   }
 
+  m_edit->setPlaceholderText(QObject::tr("Filter"));
+
   createClear();
   hookEvents();
   clear();
 }
 
+void FilterWidget::setList(QAbstractItemView* list)
+{
+  m_list = list;
+
+  m_proxy = new FilterWidgetProxyModel(*this);
+  m_proxy->setSourceModel(m_list->model());
+  m_list->setModel(m_proxy);
+}
+
 void FilterWidget::clear()
 {
   if (!m_edit) {
@@ -30,6 +70,16 @@ void FilterWidget::clear()
   m_edit->clear();
 }
 
+QModelIndex FilterWidget::map(const QModelIndex& index)
+{
+  if (m_proxy) {
+    return m_proxy->mapToSource(index);
+  } else {
+    qCritical() << "FilterWidget::map() called, but proxy isn't set up";
+    return index;
+  }
+}
+
 void FilterWidget::compile()
 {
   m_compiled.clear();
@@ -83,6 +133,14 @@ void FilterWidget::unhook()
   if (m_edit) {
     m_edit->removeEventFilter(m_eventFilter);
   }
+
+  if (m_proxy && m_list) {
+    auto* model = m_proxy->sourceModel();
+    m_proxy->setSourceModel(nullptr);
+    delete m_proxy;
+
+    m_list->setModel(model);
+  }
 }
 
 void FilterWidget::createClear()
@@ -125,9 +183,11 @@ void FilterWidget::onTextChanged()
     m_text = text;
     compile();
 
-    if (changed) {
-      changed();
+    if (m_proxy) {
+      m_proxy->invalidateFilter();
     }
+
+    emit changed();
   }
 }
 
diff --git a/src/filterwidget.h b/src/filterwidget.h
index 762d9b15..5b08c3ae 100644
--- a/src/filterwidget.h
+++ b/src/filterwidget.h
@@ -1,22 +1,55 @@
 #ifndef FILTERWIDGET_H
 #define FILTERWIDGET_H
 
+#include <QObject>
+#include <QLineEdit>
+#include <QToolButton>
+#include <QList>
+#include <QAbstractItemView>
+
 class EventFilter;
+class FilterWidget;
 
-class FilterWidget
+class FilterWidgetProxyModel : public QSortFilterProxyModel
 {
+  Q_OBJECT;
+
 public:
-  std::function<void ()> changed;
+  FilterWidgetProxyModel(FilterWidget& fw, QWidget* parent=nullptr);
+  using QSortFilterProxyModel::invalidateFilter;
+
+protected:
+  bool filterAcceptsRow(int row, const QModelIndex& parent) const override;
+
+private:
+  FilterWidget& m_filter;
+};
+
+
+class FilterWidget : public QObject
+{
+  Q_OBJECT;
+
+public:
+  using predFun = std::function<bool (const QString& what)>;
 
   FilterWidget();
 
-  void set(QLineEdit* edit);
+  void setEdit(QLineEdit* edit);
+  void setList(QAbstractItemView* list);
   void clear();
 
-  bool matches(std::function<bool (const QString& what)> pred) const;
+  QModelIndex map(const QModelIndex& index);
+
+  bool matches(predFun pred) const;
+
+signals:
+  void changed();
 
 private:
   QLineEdit* m_edit;
+  QAbstractItemView* m_list;
+  FilterWidgetProxyModel* m_proxy;
   EventFilter* m_eventFilter;
   QToolButton* m_clear;
   QString m_text;
diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index 9f4ae873..69e73da4 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -72,6 +72,9 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLineEdit" name="textFileFilter"/>
+           </item>
           </layout>
          </widget>
          <widget class="QWidget" name="widget_7" native="true">
@@ -108,7 +111,7 @@
           <enum>Qt::Horizontal</enum>
          </property>
          <widget class="QWidget" name="layoutWidget">
-          <layout class="QVBoxLayout" name="verticalLayout_5" stretch="0,0">
+          <layout class="QVBoxLayout" name="verticalLayout_5" stretch="0,0,0">
            <property name="spacing">
             <number>6</number>
            </property>
@@ -132,6 +135,9 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLineEdit" name="iniFileFilter"/>
+           </item>
           </layout>
          </widget>
          <widget class="QWidget" name="layoutWidget1">
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index c053e64c..e631db30 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -999,8 +999,8 @@ AdvancedConflictsTab::AdvancedConflictsTab(
     ui->conflictsAdvancedList, &QTreeView::customContextMenuRequested,
     [&](const QPoint& p){ m_tab->showContextMenu(p, ui->conflictsAdvancedList); });
 
-  m_filter.set(ui->conflictsAdvancedFilter);
-  m_filter.changed = [&]{ update(); };
+  m_filter.setEdit(ui->conflictsAdvancedFilter);
+  QObject::connect(&m_filter, &FilterWidget::changed, [&]{ update(); });
 }
 
 void AdvancedConflictsTab::clear()
diff --git a/src/modinfodialogtextfiles.cpp b/src/modinfodialogtextfiles.cpp
index 675a4c79..2b5ab489 100644
--- a/src/modinfodialogtextfiles.cpp
+++ b/src/modinfodialogtextfiles.cpp
@@ -100,7 +100,7 @@ private:
 GenericFilesTab::GenericFilesTab(
   OrganizerCore& oc, PluginContainer& plugin,
   QWidget* parent, Ui::ModInfoDialog* ui, int id,
-  QListView* list, QSplitter* sp, TextEditor* e) :
+  QListView* list, QSplitter* sp, TextEditor* e, QLineEdit* filter) :
     ModInfoDialogTab(oc, plugin, parent, ui, id),
     m_list(list), m_editor(e), m_model(new FileListModel)
 {
@@ -111,6 +111,9 @@ GenericFilesTab::GenericFilesTab(
   sp->setStretchFactor(0, 0);
   sp->setStretchFactor(1, 1);
 
+  m_filter.setEdit(filter);
+  m_filter.setList(m_list);
+
   QObject::connect(
     m_list->selectionModel(), &QItemSelectionModel::currentRowChanged,
     [&](auto current, auto previous){ onSelection(current, previous); });
@@ -187,7 +190,7 @@ void GenericFilesTab::select(const QModelIndex& index)
   }
 
   m_editor->setEnabled(true);
-  m_editor->load(m_model->fullPath(index));
+  m_editor->load(m_model->fullPath(m_filter.map(index)));
 }
 
 
@@ -196,7 +199,8 @@ TextFilesTab::TextFilesTab(
   QWidget* parent, Ui::ModInfoDialog* ui, int id)
     : GenericFilesTab(
         oc, plugin, parent, ui, id,
-        ui->textFileList, ui->tabTextSplitter, ui->textFileEditor)
+        ui->textFileList, ui->tabTextSplitter,
+        ui->textFileEditor, ui->textFileFilter)
 {
 }
 
@@ -218,7 +222,8 @@ IniFilesTab::IniFilesTab(
   QWidget* parent, Ui::ModInfoDialog* ui, int id)
     : GenericFilesTab(
         oc, plugin, parent, ui, id,
-        ui->iniFileList, ui->tabIniSplitter, ui->iniFileEditor)
+        ui->iniFileList, ui->tabIniSplitter,
+        ui->iniFileEditor, ui->iniFileFilter)
 {
 }
 
diff --git a/src/modinfodialogtextfiles.h b/src/modinfodialogtextfiles.h
index d879c2bd..037c6bb3 100644
--- a/src/modinfodialogtextfiles.h
+++ b/src/modinfodialogtextfiles.h
@@ -2,6 +2,7 @@
 #define MODINFODIALOGTEXTFILES_H
 
 #include "modinfodialogtab.h"
+#include "filterwidget.h"
 #include <QSplitter>
 #include <QListView>
 
@@ -23,11 +24,12 @@ protected:
   QListView* m_list;
   TextEditor* m_editor;
   FileListModel* m_model;
+  FilterWidget m_filter;
 
   GenericFilesTab(
     OrganizerCore& oc, PluginContainer& plugin,
     QWidget* parent, Ui::ModInfoDialog* ui, int id,
-    QListView* list, QSplitter* splitter, TextEditor* editor);
+    QListView* list, QSplitter* splitter, TextEditor* editor, QLineEdit* filter);
 
   virtual bool wantsFile(const QString& rootPath, const QString& fullPath) const = 0;
 
-- 
cgit v1.3.1


From 65b3eb24fc5e3e1033d583a24cb51a19b0cfac2c Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 25 Jun 2019 17:20:19 -0400
Subject: filterable images

---
 src/filterwidget.cpp        |   5 ++
 src/filterwidget.h          |   1 +
 src/modinfodialog.ui        |   3 ++
 src/modinfodialogimages.cpp | 111 +++++++++++++++++++++++++++++++++++---------
 src/modinfodialogimages.h   |   9 ++++
 5 files changed, 108 insertions(+), 21 deletions(-)

(limited to 'src/filterwidget.cpp')

diff --git a/src/filterwidget.cpp b/src/filterwidget.cpp
index 1b9efd7c..44cbb274 100644
--- a/src/filterwidget.cpp
+++ b/src/filterwidget.cpp
@@ -70,6 +70,11 @@ void FilterWidget::clear()
   m_edit->clear();
 }
 
+bool FilterWidget::empty() const
+{
+  return m_text.isEmpty();
+}
+
 QModelIndex FilterWidget::map(const QModelIndex& index)
 {
   if (m_proxy) {
diff --git a/src/filterwidget.h b/src/filterwidget.h
index 5b08c3ae..4fb9831f 100644
--- a/src/filterwidget.h
+++ b/src/filterwidget.h
@@ -38,6 +38,7 @@ public:
   void setEdit(QLineEdit* edit);
   void setList(QAbstractItemView* list);
   void clear();
+  bool empty() const;
 
   QModelIndex map(const QModelIndex& index);
 
diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index 69e73da4..fd367e74 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -196,6 +196,9 @@
              </widget>
             </widget>
            </item>
+           <item>
+            <widget class="QLineEdit" name="imagesFilter"/>
+           </item>
           </layout>
          </widget>
          <widget class="QWidget" name="imagesContainer" native="true">
diff --git a/src/modinfodialogimages.cpp b/src/modinfodialogimages.cpp
index 9b0e98c5..deaacd14 100644
--- a/src/modinfodialogimages.cpp
+++ b/src/modinfodialogimages.cpp
@@ -23,6 +23,9 @@ ImagesTab::ImagesTab(
   ui->imagesScrollArea->setTab(this);
   ui->imagesThumbnails->setTab(this);
 
+  m_filter.setEdit(ui->imagesFilter);
+  connect(&m_filter, &FilterWidget::changed, [&]{ onFilterChanged(); });
+
   connect(ui->imagesExplore, &QAbstractButton::clicked, [&]{ onExplore(); });
 
   getSupportedFormats();
@@ -31,6 +34,8 @@ ImagesTab::ImagesTab(
 void ImagesTab::clear()
 {
   m_files.clear();
+  m_filteredFiles.clear();
+
   select(nullptr);
   setHasData(false);
 }
@@ -50,10 +55,62 @@ bool ImagesTab::feedFile(const QString& rootPath, const QString& fullPath)
 void ImagesTab::update()
 {
   setHasData(!m_files.empty());
+
+  filterImages();
   resizeWidget();
   ui->imagesThumbnails->update();
 }
 
+void ImagesTab::filterImages()
+{
+  m_filteredFiles.clear();
+
+  if (m_filter.empty()) {
+    return;
+  }
+
+  for (auto& f : m_files) {
+    const auto m = m_filter.matches([&](auto&& what) {
+      return f.path.contains(what, Qt::CaseInsensitive);
+    });
+
+    if (m) {
+      m_filteredFiles.push_back(&f);
+    }
+  }
+}
+
+std::size_t ImagesTab::fileCount() const
+{
+  if (m_filter.empty()) {
+    return m_files.size();
+  } else {
+    return m_filteredFiles.size();
+  }
+}
+
+const ImagesTab::File* ImagesTab::getFile(std::size_t i) const
+{
+  if (m_filter.empty()) {
+    if (i >= m_files.size()) {
+      return nullptr;
+    }
+
+    return &m_files[i];
+  } else {
+    if (i >= m_filteredFiles.size()) {
+      return nullptr;
+    }
+
+    return m_filteredFiles[i];
+  }
+}
+
+ImagesTab::File* ImagesTab::getFile(std::size_t i)
+{
+  return const_cast<File*>(std::as_const(*this).getFile(i));
+}
+
 void ImagesTab::getSupportedFormats()
 {
   for (const auto& entry : QImageReader::supportedImageFormats()) {
@@ -74,7 +131,7 @@ void ImagesTab::getSupportedFormats()
 void ImagesTab::select(const File* f)
 {
   if (f) {
-    ui->imagesPath->setText(f->path);
+    ui->imagesPath->setText(QDir::toNativeSeparators(f->path));
     ui->imagesExplore->setEnabled(true);
     m_image->setImage(f->original);
   } else {
@@ -93,7 +150,7 @@ int ImagesTab::calcThumbSize(int availableWidth) const
 
 int ImagesTab::calcWidgetHeight(int availableWidth) const
 {
-  if (m_files.empty()) {
+  if (fileCount() == 0) {
     return 0;
   }
 
@@ -106,7 +163,7 @@ int ImagesTab::calcWidgetHeight(int availableWidth) const
 
   // subsequent thumbs with padding before each
   const auto thumbWithPadding = m_padding + thumbSize;
-  h += static_cast<int>(thumbWithPadding * (m_files.size() - 1));
+  h += static_cast<int>(thumbWithPadding * (fileCount() - 1));
 
   // margin top and bottom
   h += m_margins * 2;
@@ -170,7 +227,8 @@ void ImagesTab::paintThumbnails(QPaintEvent* e)
   const auto [begin, end] = calcVisibleRange(
     e->rect().top(), e->rect().bottom(), cx.thumbSize);
 
-  for (std::size_t i=begin; i<end && i<m_files.size(); ++i) {
+  const auto n = fileCount();
+  for (std::size_t i=begin; i<end && i<n; ++i) {
     paintThumbnail(cx, i);
   }
 }
@@ -191,29 +249,34 @@ void ImagesTab::paintThumbnailBorder(PaintContext& cx, std::size_t i)
 
 void ImagesTab::paintThumbnailImage(PaintContext& cx, std::size_t i)
 {
-  auto& file = m_files[i];
-  if (file.failed) {
+  auto* file = getFile(i);
+  if (!file) {
+    qCritical() << "ImagesTab: no file at index " << i;
+    return;
+  }
+
+  if (file->failed) {
     return;
   }
 
   const auto imageRect = calcImageRect(cx.topRect, cx.thumbSize, i);
 
-  if (needsReload(file, imageRect.size())) {
-    reload(file, imageRect.size());
+  if (needsReload(*file, imageRect.size())) {
+    reload(*file, imageRect.size());
   }
 
-  if (file.thumbnail.isNull()) {
+  if (file->thumbnail.isNull()) {
     return;
   }
 
   // center scaled image in rect
   const QRect scaledThumbRect(
-    (imageRect.left()+imageRect.width()/2) - file.thumbnail.width()/2,
-    (imageRect.top()+imageRect.height()/2) - file.thumbnail.height()/2,
-    file.thumbnail.width(),
-    file.thumbnail.height());
+    (imageRect.left()+imageRect.width()/2) - file->thumbnail.width()/2,
+    (imageRect.top()+imageRect.height()/2) - file->thumbnail.height()/2,
+    file->thumbnail.width(),
+    file->thumbnail.height());
 
-  cx.painter.drawImage(scaledThumbRect, file.thumbnail);
+  cx.painter.drawImage(scaledThumbRect, file->thumbnail);
 }
 
 const ImagesTab::File* ImagesTab::fileAtPos(const QPoint& p) const
@@ -222,7 +285,7 @@ const ImagesTab::File* ImagesTab::fileAtPos(const QPoint& p) const
 
   // calculate index purely based on y position
   const std::size_t i = p.y() / (thumbSize + m_padding);
-  if (i >= m_files.size()) {
+  if (i >= fileCount()) {
     return nullptr;
   }
 
@@ -234,7 +297,7 @@ const ImagesTab::File* ImagesTab::fileAtPos(const QPoint& p) const
     return nullptr;
   }
 
-  return &m_files[i];
+  return getFile(i);
 }
 
 void ImagesTab::scrollAreaResized(const QSize&)
@@ -248,9 +311,7 @@ void ImagesTab::thumbnailsMouseEvent(QMouseEvent* e)
     return;
   }
 
-  if (const auto* file=fileAtPos(e->pos())) {
-    select(file);
-  }
+  select(fileAtPos(e->pos()));
 }
 
 void ImagesTab::onExplore()
@@ -262,6 +323,11 @@ void ImagesTab::onExplore()
   MOBase::shell::ExploreFile(m_selection->path);
 }
 
+void ImagesTab::onFilterChanged()
+{
+  update();
+}
+
 bool ImagesTab::needsReload(const File& file, const QSize& imageSize) const
 {
   if (file.failed) {
@@ -299,14 +365,17 @@ void ImagesTab::reload(File& file, const QSize& scaledSize)
 
 void ImagesTab::resizeWidget()
 {
-  if (m_files.empty()) {
+  if (fileCount() == 0) {
     ui->imagesThumbnails->setGeometry(QRect());
     return;
   }
 
   const auto availableWidth = ui->imagesScrollArea->viewport()->width();
 
-  const int widgetHeight = calcWidgetHeight(availableWidth);
+  const int widgetHeight = std::max(
+    calcWidgetHeight(availableWidth),
+    ui->imagesScrollArea->viewport()->height());
+
   ui->imagesThumbnails->setGeometry(QRect(0, 0, availableWidth, widgetHeight));
 }
 
diff --git a/src/modinfodialogimages.h b/src/modinfodialogimages.h
index cb9a2d67..d90f2bfd 100644
--- a/src/modinfodialogimages.h
+++ b/src/modinfodialogimages.h
@@ -2,6 +2,7 @@
 #define MODINFODIALOGIMAGES_H
 
 #include "modinfodialogtab.h"
+#include "filterwidget.h"
 #include <QScrollArea>
 
 class ImagesTab;
@@ -105,9 +106,11 @@ private:
 
   ScalableImage* m_image;
   std::vector<File> m_files;
+  std::vector<File*> m_filteredFiles;
   std::vector<QString> m_supportedFormats;
   int m_margins, m_padding, m_border;
   const File* m_selection;
+  FilterWidget m_filter;
 
   void getSupportedFormats();
   void select(const File* file);
@@ -116,6 +119,7 @@ private:
   void paintThumbnails(QPaintEvent* e);
   void thumbnailsMouseEvent(QMouseEvent* e);
   void onExplore();
+  void onFilterChanged();
 
   int calcThumbSize(int availableWidth) const;
   int calcWidgetHeight(int availableWidth) const;
@@ -134,6 +138,11 @@ private:
 
   const File* fileAtPos(const QPoint& p) const;
 
+  std::size_t fileCount() const;
+  const File* getFile(std::size_t i) const;
+  File* getFile(std::size_t i);
+
+  void filterImages();
   bool needsReload(const File& file, const QSize& imageSize) const;
   void reload(File& file, const QSize& imageSize);
   void resizeWidget();
-- 
cgit v1.3.1