enable search in Browse & Recording views

src/library/browse/browsefeature.cpp

@@ -32,7 +32,7 @@ BrowseFeature::BrowseFeature(
         : LibraryFeature(pLibrary, pConfig, QString("computer")),
           m_pTrackCollection(pLibrary->trackCollectionManager()->internalCollection()),
           m_browseModel(this, pLibrary->trackCollectionManager(), pRecordingManager),
-          m_proxyModel(&m_browseModel),
+          m_proxyModel(&m_browseModel, true),
           m_pSidebarModel(new FolderTreeModel(this)),
           m_pLastRightClickedItem(nullptr) {
     connect(this,
@@ -243,7 +243,7 @@ void BrowseFeature::activate() {
 void BrowseFeature::activateChild(const QModelIndex& index) {
     TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
     qDebug() << "BrowseFeature::activateChild " << item->getLabel() << " "
-             << item->getData();
+             << item->getData().toString();
 
     QString path = item->getData().toString();
     if (path == QUICK_LINK_NODE || path == DEVICE_NODE) {
@@ -267,7 +267,10 @@ void BrowseFeature::activateChild(const QModelIndex& index) {
         m_browseModel.setPath(std::move(dirAccess));
     }
     emit showTrackModel(&m_proxyModel);
-    emit disableSearch();
+    // Search is restored in Library::slotShowTrackModel, disable it where it's useless
+    if (path == QUICK_LINK_NODE || path == DEVICE_NODE) {
+        emit disableSearch();
+    }
     emit enableCoverArtDisplay(false);
 }
 

src/library/browse/browsetablemodel.cpp

@@ -283,6 +283,7 @@ CoverInfo BrowseTableModel::getCoverInfo(const QModelIndex& index) const {
         return CoverInfo();
     }
 }
+
 const QVector<int> BrowseTableModel::getTrackRows(TrackId trackId) const {
     Q_UNUSED(trackId);
     // We can't implement this as it stands.
@@ -378,7 +379,8 @@ TrackModel::Capabilities BrowseTableModel::getCapabilities() const {
 }
 
 QString BrowseTableModel::modelKey(bool noSearch) const {
-    // Browse feature does currently not support searching.
+    // Searching is handled by the proxy model, so if there is an active search
+    // modelkey is composed there, too.
     Q_UNUSED(noSearch);
     return QStringLiteral("browse:") + m_currentDirectory;
 }

src/library/proxytrackmodel.cpp

@@ -2,6 +2,7 @@
 
 #include <QVariant>
 
+#include "library/searchqueryparser.h"
 #include "util/assert.h"
 
 ProxyTrackModel::ProxyTrackModel(QAbstractItemModel* pTrackModel,
@@ -77,7 +78,14 @@ void ProxyTrackModel::search(const QString& searchText, const QString& extraFilt
 }
 
 QString ProxyTrackModel::modelKey(bool noSearch) const {
-    return m_pTrackModel ? m_pTrackModel->modelKey(noSearch) : QString();
+    if (m_pTrackModel) {
+        if (m_bHandleSearches) {
+            return m_pTrackModel->modelKey(true) + QStringLiteral("#") + currentSearch();
+        } else {
+            return m_pTrackModel->modelKey(noSearch);
+        }
+    }
+    return QString();
 }
 
 const QString ProxyTrackModel::currentSearch() const {
@@ -147,26 +155,41 @@ bool ProxyTrackModel::filterAcceptsRow(int sourceRow,
         return false;
     }
 
+    const QString currSearch = m_currentSearch.trimmed();
+    if (currSearch.isEmpty()) {
+        return true;
+    }
+
+    QStringList tokens = SearchQueryParser::splitQueryIntoWords(currSearch);
+    tokens.removeDuplicates();
+
     const QList<int>& filterColumns = m_pTrackModel->searchColumns();
     QAbstractItemModel* itemModel =
             dynamic_cast<QAbstractItemModel*>(m_pTrackModel);
-    bool rowMatches = false;
-
-    QRegularExpression filter = filterRegularExpression();
-    QListIterator<int> iter(filterColumns);
-
-    while (!rowMatches && iter.hasNext()) {
-        int i = iter.next();
-        QModelIndex index = itemModel->index(sourceRow, i, sourceParent);
-        QVariant data = itemModel->data(index);
-        if (data.canConvert<QString>()) {
-            QString strData = data.toString();
-            if (strData.contains(filter)) {
-                rowMatches = true;
+
+    for (const auto& token : std::as_const(tokens)) {
+        bool tokenMatch = false;
+        for (const auto column : std::as_const(filterColumns)) {
+            QModelIndex index = itemModel->index(sourceRow, column, sourceParent);
+            QString strData = itemModel->data(index).toString();
+            if (!strData.isEmpty()) {
+                QString tokNoQuotes = token;
+                tokNoQuotes.remove('\"');
+                if (strData.contains(tokNoQuotes, Qt::CaseInsensitive)) {
+                    tokenMatch = true;
+                    tokens.removeOne(token);
+                }
+            }
+            if (tokenMatch) {
+                break;
             }
         }
     }
-    return rowMatches;
+
+    if (tokens.length() > 0) {
+        return false;
+    }
+    return true;
 }
 
 QString ProxyTrackModel::getModelSetting(const QString& name) {

src/library/recording/dlgrecording.cpp

@@ -26,7 +26,7 @@ DlgRecording::DlgRecording(
                           parent->getTrackTableBackgroundColorOpacity(),
                           true)),
           m_browseModel(this, pLibrary->trackCollectionManager(), pRecordingManager),
-          m_proxyModel(&m_browseModel),
+          m_proxyModel(&m_browseModel, true),
           m_bytesRecordedStr("--"),
           m_durationRecordedStr("--:--"),
           m_pRecordingManager(pRecordingManager) {

src/library/recording/recordingfeature.cpp

@@ -71,6 +71,6 @@ void RecordingFeature::bindLibraryWidget(WLibrary* pLibraryWidget,
 void RecordingFeature::activate() {
     emit refreshBrowseModel();
     emit switchToView(kViewName);
-    emit disableSearch();
+    emit requestRestoreSearch();
     emit enableCoverArtDisplay(false);
 }