From 34b022a2297b869c7be306e3f6bf8e124adaf1a7 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 5 Feb 2020 16:21:41 -0500
Subject: fixed warning when comparing empty strings filter in data tab fixed
 some bad iterators when removing rows fixed empty directories not being
 marked as such when refreshing always sort directories first even when
 reversing the sort order fixed children not being sorted fixed errors about
 file sizes for directories remember state of checkboxes in data tab

---
 src/filetreemodel.cpp | 71 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 50 insertions(+), 21 deletions(-)

(limited to 'src/filetreemodel.cpp')

diff --git a/src/filetreemodel.cpp b/src/filetreemodel.cpp
index aa87edbf..912e2007 100644
--- a/src/filetreemodel.cpp
+++ b/src/filetreemodel.cpp
@@ -87,31 +87,32 @@ public:
   //
   FileTreeItem::Children::const_iterator remove()
   {
-    if (m_first == -1) {
-      // nothing to remove
-      return m_parentItem.children().begin() + m_current + 1;
-    }
+    if (m_first >= 0) {
+      const auto last = m_current - 1;
+      const auto parentIndex = m_model->indexFromItem(m_parentItem);
 
-    const auto last = m_current - 1;
-    const auto parentIndex = m_model->indexFromItem(m_parentItem);
+      trace(log::debug("Range::remove() {} to {}", m_first, last));
 
-    trace(log::debug("Range::remove() {} to {}", m_first, last));
+      m_model->beginRemoveRows(parentIndex, m_first, last);
 
-    m_model->beginRemoveRows(parentIndex, m_first, last);
+      m_parentItem.remove(
+        static_cast<std::size_t>(m_first),
+        static_cast<std::size_t>(last - m_first + 1));
 
-    m_parentItem.remove(
-      static_cast<std::size_t>(m_first),
-      static_cast<std::size_t>(last - m_first + 1));
+      m_model->endRemoveRows();
 
-    m_model->endRemoveRows();
+      m_model->removePendingIcons(parentIndex, m_first, last);
 
-    m_model->removePendingIcons(parentIndex, m_first, last);
+      // adjust current row to account for those that were just removed
+      m_current -= (m_current - m_first);
 
-    // adjust current row to account for those that were just removed
-    m_current -= (m_current - m_first);
+      // reset
+      m_first = -1;
+    }
 
-    // reset
-    m_first = -1;
+    if (m_current >= m_parentItem.children().size()) {
+      return m_parentItem.children().end();
+    }
 
     return m_parentItem.children().begin() + m_current + 1;
   }
@@ -138,7 +139,7 @@ void* makeInternalPointer(FileTreeItem* item)
 FileTreeModel::FileTreeModel(OrganizerCore& core, QObject* parent) :
   QAbstractItemModel(parent), m_core(core),
   m_root(FileTreeItem::createDirectory(nullptr, L"", L"")),
-  m_flags(NoFlags)
+  m_flags(NoFlags), m_fullyLoaded(false)
 {
   m_root->setExpanded(true);
 
@@ -148,16 +149,40 @@ FileTreeModel::FileTreeModel(OrganizerCore& core, QObject* parent) :
 void FileTreeModel::refresh()
 {
   TimeThis tt("FileTreeModel::refresh()");
+
+  m_fullyLoaded = false;
   update(*m_root, *m_core.directoryStructure(), L"");
 }
 
 void FileTreeModel::clear()
 {
+  m_fullyLoaded = false;
+
   beginResetModel();
   m_root->clear();
   endResetModel();
 }
 
+void FileTreeModel::recursiveFetchMore(const QModelIndex& m)
+{
+  if (canFetchMore(m)) {
+    fetchMore(m);
+  }
+
+  for (int i=0; i<rowCount(m); ++i) {
+    recursiveFetchMore(index(i, 0, m));
+  }
+}
+
+void FileTreeModel::ensureFullyLoaded()
+{
+  if (!m_fullyLoaded) {
+    TimeThis tt("FileTreeModel:: fully loading for search");
+    recursiveFetchMore(QModelIndex());
+    m_fullyLoaded = true;
+  }
+}
+
 bool FileTreeModel::showArchives() const
 {
   return (m_flags.testFlag(Archives) && m_core.getArchiveParsing());
@@ -493,9 +518,12 @@ void FileTreeModel::removeDisappearingDirectories(
       if (shouldShowFolder(*d, item.get())) {
         // folder should be left in the list
         if (!item->areChildrenVisible() && item->isLoaded()) {
-          // the item is loaded (previously expanded but now collapsed), mark
-          // it as unloaded so it updates when next expanded
-          item->setLoaded(false);
+          if (!d->isEmpty()) {
+            // the item is loaded (previously expanded but now collapsed) and
+            // has children, mark  it as unloaded so it updates when next
+            // expanded
+            item->setLoaded(false);
+          }
         }
       } else {
         // item wouldn't have any children, prune it
@@ -694,6 +722,7 @@ bool FileTreeModel::addNewFiles(
       } else {
         // this is a new file, but it shouldn't be shown
         trace(log::debug("new file {}, not shown", QString::fromStdWString(file->getName())));
+        return true;
       }
     }
 
-- 
cgit v1.3.1