refind: filetype filter, dir exclusion filter

diff --git a/appl/refind/filefinder.cpp b/appl/refind/filefinder.cpp
index 91b609ea71e555b8400429930d47e5df74d8f7df..1b89746b7264dabff5852ba1a615a5c4b8a8e394 100644 (file)
--- a/appl/refind/filefinder.cpp
+++ b/appl/refind/filefinder.cpp
@@ -6,6 +6,7 @@
  * The original sources can be found on https://github.com/republib.
  */
 
+#include <QDir>
 #include "mainwindow.hpp"
 #include "filefinder.hpp"
 
@@ -21,9 +22,11 @@ FileFinder::FileFinder() :
             m_maxDepth(512),
             m_baseDir(""),
             m_checkDates(false),
-            m_countDirs(0),
             m_countFiles(0),
-            m_bytes(0){
+            m_countDirs(0),
+            m_bytes(0),
+            m_excludedDirs()
+{
    m_youngerThan.setMSecsSinceEpoch(0);
    m_olderThan.setMSecsSinceEpoch(0);
 }
@@ -110,11 +113,11 @@ QString typeOf(QFileInfo& info){
 void FileFinder::fillTable(const QString& path, int depth, QTableWidget* table){
    QDir dir(path);
    QFileInfoList entries;
-   if (m_patterns.count() == 0)
-      entries = dir.entryInfoList(m_fileTypes | QDir::NoDotAndDotDot,
-         QDir::NoSort);
-   else
-      entries = dir.entryInfoList(m_patterns, m_fileTypes, QDir::NoSort);
+   if (m_patterns.count() > 0)
+       dir.setNameFilters(m_patterns);
+   QDir::Filters filters = m_fileTypes | QDir::NoDotAndDotDot;
+   dir.setFilter(filters);
+   dir.setFilter(m_fileTypes);
    QList <QFileInfo>::iterator it;
    QString relativePath = path.mid(1 + m_baseDir.length());
    QString node, ext;
@@ -152,14 +155,34 @@ void FileFinder::fillTable(const QString& path, int depth, QTableWidget* table){
    if (depth < m_maxDepth){
       entries = dir.entryInfoList(
          QDir::NoSymLinks | QDir::NoDotAndDotDot | QDir::AllDirs, QDir::NoSort);
+      bool filtered = m_excludedDirs.length() > 0;
       for (it = entries.begin(); it != entries.end(); ++it){
          QString node = it->fileName();
-         fillTable(path + QDir::separator() + node, depth + 1, table);
+         if (! filtered || !isExcludedDir(node))
+             fillTable(path + QDir::separator() + node, depth + 1, table);
       }
    }
    table->setRowCount(m_lines);
 }
 
+/**
+ * Checks whether a filename matches the list of excluded directories.
+ *
+ * @param node  filename to check
+ * @return      <code>true</code>: the node is part of the excluded dirs
+ */
+bool FileFinder::isExcludedDir(const QString& node){
+    bool rc = false;
+    QList <QString>::iterator it;
+    for (it = m_excludedDirs.begin(); it != m_excludedDirs.end(); ++it){
+        if (QString::compare(node, *it, Qt::CaseInsensitive) == 0){
+            rc = true;
+            break;
+        }
+    }
+    return rc;
+}
+
 /**
  * Tests whether a file matches the filter conditions.
  *
@@ -187,7 +210,16 @@ bool FileFinder::isValid(const QFileInfo& file){
  * @param baseDir   the directory where the search starts
  */
 void FileFinder::setBaseDir(const QString& baseDir){
-   m_baseDir = baseDir;
+    m_baseDir = baseDir;
+}
+
+/**
+ * Sets the list of excluded directories.
+ * @param excludedDirs  each entry of this list will not be entered for search
+ */
+void FileFinder::setExcludedDirs(const QStringList& excludedDirs)
+{
+    m_excludedDirs = excludedDirs;
 }
 
 /**

diff --git a/appl/refind/filefinder.hpp b/appl/refind/filefinder.hpp
index 20a558e91e89450f3cf9eea7a173a51a3563d892..98d14106038974802c12d6f167d05c3454598cd7 100644 (file)
--- a/appl/refind/filefinder.hpp
+++ b/appl/refind/filefinder.hpp
@@ -26,12 +26,15 @@ public:
    void setFiletypes(const QDir::Filters& filetypes);
    void setMaxDepth(int maxDepth);
    void setMinDepth(int minDepth);
+   void setExcludedDirs(const QStringList& excludedDirs);
    void setOlderThan(const QDateTime& olderThan);
    void setPatterns(const QStringList& patterns);
    void setMaxSize(const int64_t& maxSize);
    void setMinSize(const int64_t& minSize);
    void setYoungerThan(const QDateTime& youngerThan);
+
 private:
+   bool isExcludedDir(const QString& node);
    bool isValid(const QFileInfo& file);
 private:
    int m_lines;
@@ -48,6 +51,7 @@ private:
    int m_countFiles;
    int m_countDirs;
    int64_t m_bytes;
+   QStringList m_excludedDirs;
 };
 
 #endif // FILEFINDER_HPP

diff --git a/appl/refind/main.cpp b/appl/refind/main.cpp
index 1feb89c25b1067ff4339708fac01f443dc7a1beb..ef96fdf3eff7678d5a3ba29e12fc2a855797746d 100644 (file)
--- a/appl/refind/main.cpp
+++ b/appl/refind/main.cpp
@@ -1,6 +1,6 @@
 /*
  * main.cpp
- * 
+ *
  * License: Public Domain
  * You can use and modify this file without any restriction.
  * Do what you want.
@@ -9,8 +9,9 @@
  * The latest sources: https://github.com/republib
  */
 
-#include "mainwindow.hpp"
 #include <QApplication>
+#include <QDir>
+#include "mainwindow.hpp"
 
 int main(int argc, char *argv[]){
    QApplication a(argc, argv);

diff --git a/appl/refind/mainwindow.cpp b/appl/refind/mainwindow.cpp
index d6ebe3c687276ab0b17042244f279dfc988fd269..941cfb10a69e1382fc93ae159914d93a64a8aace 100644 (file)
--- a/appl/refind/mainwindow.cpp
+++ b/appl/refind/mainwindow.cpp
@@ -10,6 +10,7 @@
  */
 
 #include <QDir>
+#include <QFileDialog>
 #include "base/rebase.hpp"
 #include "mainwindow.hpp"
 #include "ui_mainwindow.h"
@@ -33,6 +34,7 @@ MainWindow::MainWindow(QWidget *parent) :
    connect(ui->pushButtonSearch, SIGNAL(clicked()), this, SLOT(search()));
    connect(ui->pushButtonSearch2, SIGNAL(clicked()), this, SLOT(search()));
    connect(ui->pushButtonUp, SIGNAL(clicked()), this, SLOT(up()));
+   connect(ui->pushButtonDirectory, SIGNAL(clicked()), this, SLOT(selectDirectory()));
    ui->tableWidget->setColumnWidth(TC_NODE, 200);
    ui->tableWidget->setColumnWidth(TC_EXT, 40);
    ui->tableWidget->setColumnWidth(TC_SIZE, 125);
@@ -111,7 +113,7 @@ int64_t MainWindow::comboSize(QComboBox* combo){
       rc = parser.asInt64(-1);
       if (rc >= 0){
          setInHistory(combo, value);
-         combo->setCurrentText(QString("").sprintf("%lld", rc));
+         combo->setCurrentText(QString("").sprintf("%ld", rc));
       }else
          guiError(combo, parser.errorMessage());
    }
@@ -136,6 +138,35 @@ QString MainWindow::comboText(QComboBox* combo){
    return rc;
 }
 
+/**
+ * Converts the checkbox states to a filetype mask.
+ * @return the filetypes selected by the checkboxes
+ */
+QDir::Filters MainWindow::buildFileTypes(){
+    QDir::Filters rc = 0;
+    if (ui->checkBoxDirs->isChecked())
+        rc |= QDir::Dirs;
+    if (ui->checkBoxFiles->isChecked())
+        rc |= QDir::Files;
+    if (rc == 0)
+        rc |= QDir::Dirs | QDir::Files;
+    if (! ui->checkBoxLinks->isChecked())
+        rc |= QDir::NoSymLinks;
+    if (ui->checkBoxHidden)
+        rc |= QDir::Hidden | QDir::System;
+    QDir::Filters mask = 0;
+    if (ui->checkBoxWritable->isChecked())
+        mask |= QDir::Writable;
+    if (ui->checkBoxReadable->isChecked())
+        mask |= QDir::Readable;
+    if (ui->checkBoxExecutable->isChecked())
+        mask |= QDir::Executable;
+    if (mask == 0)
+        mask |= QDir::PermissionMask;
+    rc |= mask;
+    return rc;
+}
+
 /**
  * Handles the "search" button.
  */
@@ -150,11 +181,20 @@ void MainWindow::search(){
    finder.setYoungerThan(comboDate(ui->comboBoxYounger));
    finder.setMinDepth(comboInt(ui->comboBoxMinDepth, 0));
    finder.setMaxDepth(comboInt(ui->comboBoxMaxDepth, -1));
+   finder.setFiletypes(buildFileTypes());
    QStringList patterns;
    QString value = ui->comboBoxFilePatterns->currentText();
    if (!value.isEmpty())
-      patterns = value.split(";");
+      patterns = value.split(",");
    finder.setPatterns(patterns);
+   value = ui->comboBoxExcludedDirs->currentText();
+   if (value.indexOf('/')>= 0 || value.indexOf('\\') >= 0)
+       guiError(ui->comboBoxExcludedDirs, tr("no path delimiter allowed"));
+   else if (value.indexOf('*')>= 0)
+       guiError(ui->comboBoxExcludedDirs, tr("no patterns allowed. Do not use '*"));
+   else if (!value.isEmpty())
+       patterns = value.split(",");
+   finder.setExcludedDirs(patterns);
    if (m_errors == 0){
       clock_t start = clock();
       finder.fillTable(path, 0, ui->tableWidget);
@@ -167,6 +207,16 @@ void MainWindow::search(){
       setStatusMessage(false, msg);
    }
 }
+/**
+ * Handles the push of the button "select directory".
+ */
+void MainWindow::selectDirectory(){
+    QString dir = QFileDialog::getExistingDirectory(this,
+      tr("Select Directory"), ui->comboBoxDirectory->currentText(),
+      QFileDialog::ShowDirsOnly| QFileDialog::DontResolveSymlinks);
+    if (! dir.isEmpty())
+        ui->comboBoxDirectory->setCurrentText(dir);
+}
 
 /**
  * @brief Sets a text in a combobox uses as history.

diff --git a/appl/refind/mainwindow.hpp b/appl/refind/mainwindow.hpp
index 99def87c0beb5e1d9f78fd16b9c4b490dc16ed79..f742f6919f8059dcae6c445645450db9b5518299 100644 (file)
--- a/appl/refind/mainwindow.hpp
+++ b/appl/refind/mainwindow.hpp
@@ -34,7 +34,10 @@ public:
 private slots:
    void search();
    void up();
+   void selectDirectory();
+
 private:
+   QDir::Filters buildFileTypes();
    QDateTime comboDate(QComboBox* combo);
    int comboInt(QComboBox* combo, int defaultValue);
    int64_t comboSize(QComboBox* combo);

diff --git a/appl/refind/mainwindow.ui b/appl/refind/mainwindow.ui
index 0727c6bf7791c64cfa0bb9f1aebb31960ade1f76..7ef477f1fdbc9dd1cb7c1c24503654ec79fd95ad 100644 (file)
--- a/appl/refind/mainwindow.ui
+++ b/appl/refind/mainwindow.ui
@@ -32,7 +32,7 @@
          </size>
         </property>
         <property name="currentIndex">
-         <number>1</number>
+         <number>0</number>
         </property>
         <widget class="QWidget" name="tabMain">
          <attribute name="title">
@@ -57,7 +57,7 @@
             <item row="2" column="5" colspan="2">
              <layout class="QHBoxLayout" name="horizontalLayout">
               <item>
-               <widget class="QCheckBox" name="checkBox">
+               <widget class="QCheckBox" name="checkBoxFiles">
                 <property name="minimumSize">
                  <size>
                   <width>75</width>
@@ -79,7 +79,7 @@
                </widget>
               </item>
               <item>
-               <widget class="QCheckBox" name="checkBox_4">
+               <widget class="QCheckBox" name="checkBoxLinks">
                 <property name="minimumSize">
                  <size>
                   <width>75</width>
@@ -101,7 +101,7 @@
                </widget>
               </item>
               <item>
-               <widget class="QCheckBox" name="checkBox_3">
+               <widget class="QCheckBox" name="checkBoxHidden">
                 <property name="minimumSize">
                  <size>
                   <width>75</width>
@@ -120,7 +120,7 @@
                </widget>
               </item>
               <item>
-               <widget class="QCheckBox" name="checkBox_5">
+               <widget class="QCheckBox" name="checkBoxWritable">
                 <property name="minimumSize">
                  <size>
                   <width>75</width>
@@ -134,7 +134,30 @@
                  </size>
                 </property>
                 <property name="text">
-                 <string>Specials</string>
+                 <string>Write</string>
+                </property>
+                <property name="checked">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="checkBoxReadable">
+                <property name="text">
+                 <string>Read</string>
+                </property>
+                <property name="checked">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="checkBoxExecutable">
+                <property name="text">
+                 <string>Exec.</string>
+                </property>
+                <property name="checked">
+                 <bool>true</bool>
                 </property>
                </widget>
               </item>
@@ -197,6 +220,9 @@
             </item>
             <item row="2" column="1">
              <widget class="QComboBox" name="comboBoxFilePatterns">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;a comma (',') separated list of filename patterns&lt;/p&gt;&lt;p&gt;Example: *.txt,*.odt&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
               <property name="editable">
                <bool>true</bool>
               </property>
@@ -208,7 +234,7 @@
                <widget class="QCheckBox" name="checkBoxRegExpr">
                 <property name="minimumSize">
                  <size>
-                  <width>157</width>
+                  <width>130</width>
                   <height>0</height>
                  </size>
                 </property>
@@ -283,8 +309,11 @@
                   <height>16777215</height>
                  </size>
                 </property>
+                <property name="toolTip">
+                 <string>change to parent directory</string>
+                </property>
                 <property name="text">
-                 <string>Up</string>
+                 <string>⇑</string>
                 </property>
                </widget>
               </item>
@@ -302,6 +331,9 @@
                   <height>16777215</height>
                  </size>
                 </property>
+                <property name="toolTip">
+                 <string>select directory by a dialog box</string>
+                </property>
                 <property name="text">
                  <string>...</string>
                 </property>
@@ -330,7 +362,7 @@
              </widget>
             </item>
             <item row="2" column="2">
-             <widget class="QCheckBox" name="checkBox_2">
+             <widget class="QCheckBox" name="checkBoxDirs">
               <property name="text">
                <string>Files</string>
               </property>
@@ -347,7 +379,7 @@
          <attribute name="title">
           <string>Size, Date, Depth, Excluded Dirs</string>
          </attribute>
-         <widget class="QWidget" name="">
+         <widget class="QWidget" name="layoutWidget">
           <property name="geometry">
            <rect>
             <x>10</x>
@@ -522,6 +554,9 @@
            </item>
            <item row="2" column="1" colspan="3">
             <widget class="QComboBox" name="comboBoxExcludedDirs">
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;a comma (',') separated list of directory names not entered for the search&lt;/p&gt;&lt;p&gt;Example: .git,.cache&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
              <property name="editable">
               <bool>true</bool>
              </property>
@@ -675,11 +710,11 @@
   <tabstop>pushButtonUp</tabstop>
   <tabstop>pushButtonDirectory</tabstop>
   <tabstop>comboBoxFilePatterns</tabstop>
-  <tabstop>checkBox_2</tabstop>
-  <tabstop>checkBox</tabstop>
-  <tabstop>checkBox_4</tabstop>
-  <tabstop>checkBox_3</tabstop>
-  <tabstop>checkBox_5</tabstop>
+  <tabstop>checkBoxDirs</tabstop>
+  <tabstop>checkBoxFiles</tabstop>
+  <tabstop>checkBoxLinks</tabstop>
+  <tabstop>checkBoxHidden</tabstop>
+  <tabstop>checkBoxWritable</tabstop>
   <tabstop>comboBoxTextPattern</tabstop>
   <tabstop>checkBoxTextIgnoreCase</tabstop>
   <tabstop>checkBoxRegExpr</tabstop>