dirmodel: Include empty directories in findFolders()

Directories which have just been created (and are still empty) should be
considered for inclusion in the folder list. Update the logic to support
this.

Signed-off-by: Simon Glass <sjg@chromium.org>

Author: sjg20

dirmodel.cpp

@@ -853,7 +853,7 @@ void Dirmodel::addMatches(QStringList& matches, uint baseLen,
    for (int i = 0; i < parent->childCount(); i++) {
       const TreeItem *child = parent->childConst(i);
 
-      if (!child->childCount())
+      if (!child->isDir())
          continue;
       QString leaf = child->dirName();
       QString fname = dirPath + leaf;
@@ -893,14 +893,15 @@ void Dirmodel::addFileMatches(QStringList& matches, const uint baseLen,
       const TreeItem *child = parent->childConst(i);
       const QString& fname = child->dirName();
 
-      if (child->childCount()) {
+      if (child->isDir()) {
          addFileMatches(matches, baseLen, dirPath + fname + "/", child, text);
       } else {
-
          if (fname.contains(text, Qt::CaseInsensitive))
             matches << dirPath.mid(baseLen) + fname;
       }
    }
+   if (!parent->childCount())
+      matches << dirPath.mid(baseLen);
 }
 
 QStringList Dirmodel::findFiles(const QString& text, const QString& dirPath,

test/test_dirmodel.cpp

@@ -58,7 +58,7 @@ void TestDirmodel::testAddDir()
    QModelIndex main = model->index(main_path);
    model->buildCache(main, 0);
 
-   QCOMPARE(getPaperTree(main_path), " one|  a|  b| two|");
+   QCOMPARE(getPaperTree(main_path), " + one|  + a|  + b| + two|");
 
    Q_ASSERT(main.isValid());
 
@@ -72,15 +72,15 @@ void TestDirmodel::testAddDir()
    Q_ASSERT(dira.exists());
    QCOMPARE(model->data(new_a, Qt::DisplayRole).toString(), "new-dira");
 
-   QCOMPARE(getPaperTree(main_path), " one|  a|  b|  new-dira| two|");
+   QCOMPARE(getPaperTree(main_path), " + one|  + a|  + b|  + new-dira| + two|");
 
    QDir dirb(_tempDir->path() + "/main/one/new-dirb");
    QModelIndex new_b = model->mkdir(dir_one, "new-dirb", 0);
    Q_ASSERT(new_b.isValid());
    Q_ASSERT(dirb.exists());
 
    QCOMPARE(getPaperTree(main_path),
-            " one|  a|  b|  new-dira|  new-dirb| two|");
+            " + one|  + a|  + b|  + new-dira|  + new-dirb| + two|");
 
    // Since we added something to the model, the old index isn't valid, so get
    // a new one
@@ -100,7 +100,8 @@ void TestDirmodel::testCacheFiles()
    QModelIndex main = model->index(main_path);
    model->buildCache(main, 0);
 
-   QCOMPARE(getPaperTree(main_path), " one|  a|  b|  ofile|  ofile2| two|");
+   QCOMPARE(getPaperTree(main_path),
+            " + one|  + a|  + b|  - ofile|  - ofile2| + two|");
 }
 
 void TestDirmodel::testAddFiles()
@@ -114,7 +115,8 @@ void TestDirmodel::testAddFiles()
    QModelIndex main = model->index(main_path);
    model->buildCache(main, 0);
 
-   QCOMPARE(getPaperTree(main_path), " one|  a|  b|  ofile|  ofile2| two|");
+   QCOMPARE(getPaperTree(main_path),
+            " + one|  + a|  + b|  - ofile|  - ofile2| + two|");
 
    Q_ASSERT(main.isValid());
 
@@ -126,26 +128,30 @@ void TestDirmodel::testAddFiles()
    QModelIndex dir_a = model->index(main_path + "/one/a");
    model->refreshCacheFrom(dir_a, nullptr);
 
-   QCOMPARE(getPaperTree(main_path), " one|  a|  b|  ofile|  ofile2| two|");
+   QCOMPARE(getPaperTree(main_path),
+            " + one|  + a|  + b|  - ofile|  - ofile2| + two|");
 
    // Refreshing 'one' should update
    QModelIndex one = model->index(main_path + "/one");
    model->refreshCacheFrom(one, nullptr);
 
    QCOMPARE(getPaperTree(main_path),
-            " one|  a|  b|  newfile|  ofile|  ofile2| two|");
+            " + one|  + a|  + b|  - newfile|  - ofile|  - ofile2| + two|");
 
    QDir dir;
    Q_ASSERT(dir.remove(dst + "/main/one/newfile"));
 
    // Refreshing 'two' should do nothing
-   QModelIndex two = model->index(main_path + "/two/a");
+   QModelIndex two = model->index(main_path + "/two");
+   Q_ASSERT(two.isValid());
    model->refreshCacheFrom(two, nullptr);
 
    // Refreshing 'one' should update
+   Q_ASSERT(one.isValid());
    model->refreshCacheFrom(one, nullptr);
 
-   QCOMPARE(getPaperTree(main_path), " one|  a|  b|  ofile|  ofile2| two|");
+   QCOMPARE(getPaperTree(main_path),
+            " + one|  + a|  + b|  - ofile|  - ofile2| + two|");
 }
 
 void TestDirmodel::checkModel(const QAbstractItemModel *model,

utils.cpp

@@ -777,7 +777,7 @@ bool utilDropSupported(QDropEvent *event, const QStringList& allowedTypes)
 }
 
 TreeItem::TreeItem(const QVector<QVariant> &data, TreeItem *parent)
-    : m_itemData(data), m_parentItem(parent)
+    : m_itemData(data), m_parentItem(parent), m_isDir(false)
 {}
 
 TreeItem::~TreeItem()
@@ -829,6 +829,16 @@ int TreeItem::childCount() const
     return m_childItems.count();
 }
 
+bool TreeItem::isDir() const
+{
+    return m_isDir;
+}
+
+void TreeItem::setDir(bool isdir)
+{
+   m_isDir = isdir;
+}
+
 int TreeItem::columnCount() const
 {
     return m_itemData.count();
@@ -901,6 +911,10 @@ void TreeItem::write(QTextStream& stream, int level) const
    if (level) {
       for (int i = 0; i < level; i++)
          stream << QString(" ");
+      if (isDir())
+         stream << QString("+ ");
+      else
+         stream << QString("- ");
       stream << dirName() << '\n';
    }
    foreach (TreeItem *item, m_childItems)
@@ -925,9 +939,18 @@ bool TreeItem::read(QTextStream& stream, TreeItem *parent, int cur_level)
          qInfo() << "Invalid level < 1" << line;
          return false;
       }
-      QString fname = line.mid(level);
+
+      QString type, fname;
+      if (line.mid(level + 1, 1) == " ") {
+         type = line.mid(level, 1);
+         fname = line.mid(level + 2);
+      } else {
+         fname = line.mid(level);
+      }
 
       TreeItem *child = new TreeItem({fname}, nullptr);
+      if (type == "+")
+         child->setDir(true);
 
       if (level == cur_level) {
          child->m_parentItem = parent;
@@ -979,8 +1002,10 @@ static void scanDir(const QString &dirPath, TreeItem *parent, Operation *op)
          TreeItem *child = new TreeItem(columnData, parent);
 
          parent->appendChild(child);
-         if (fi.isDir ())
+         if (fi.isDir ()) {
+            child->setDir(true);
             scanDir(dirPath + fi.fileName() + "/", child, 0);
+         }
       }
       if (op)
          op->setProgress(i);

utils.h

@@ -67,6 +67,8 @@ class TreeItem
     TreeItem *child(const QString& name) const;
 
     const TreeItem *childConst(int row) const;
+    bool isDir() const;
+    void setDir(bool isdir);
     int childCount() const;
     int columnCount() const;
     QVariant data(int column) const;
@@ -102,6 +104,7 @@ class TreeItem
     QVector<TreeItem*> m_childItems;
     QVector<QVariant> m_itemData;
     TreeItem *m_parentItem;
+    bool m_isDir;  // true if this is a directory
 };
 
 /** retrieves a list of sizes from the Qt settings file.