Add a small delay before processing the key input of search boxes

PR #20465. Closes #20025. Closes #20235.
qbittorrent · Feb 27, 2024 · 15697f9 · 15697f9
1 parent 46e8ee5
commit 15697f9
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 49 deletions.
diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp
@@ -33,6 +33,7 @@
 #include <functional>
 
 #include <QAction>
+#include <QByteArray>
 #include <QDateTime>
 #include <QDebug>
 #include <QDir>
@@ -41,6 +42,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QShortcut>
+#include <QSize>
 #include <QString>
 #include <QUrl>
 #include <QVector>

diff --git a/src/gui/addnewtorrentdialog.h b/src/gui/addnewtorrentdialog.h
@@ -38,13 +38,13 @@
 #include "base/path.h"
 #include "base/settingvalue.h"
 
+class LineEdit;
+
 namespace Ui
 {
     class AddNewTorrentDialog;
 }
 
-class LineEdit;
-
 class AddNewTorrentDialog final : public QDialog
 {
     Q_OBJECT

diff --git a/src/gui/lineedit.cpp b/src/gui/lineedit.cpp
@@ -29,20 +29,41 @@
 
 #include "lineedit.h"
 
+#include <chrono>
+
 #include <QAction>
 #include <QKeyEvent>
+#include <QTimer>
 
 #include "base/global.h"
 #include "uithememanager.h"
 
+using namespace std::chrono_literals;
+
+namespace
+{
+    const std::chrono::milliseconds FILTER_INPUT_DELAY {400};
+}
+
 LineEdit::LineEdit(QWidget *parent)
     : QLineEdit(parent)
+    , m_delayedTextChangedTimer {new QTimer(this)}
 {
     auto *action = new QAction(UIThemeManager::instance()->getIcon(u"edit-find"_s), QString(), this);
     addAction(action, QLineEdit::LeadingPosition);
 
     setClearButtonEnabled(true);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+    m_delayedTextChangedTimer->setSingleShot(true);
+    connect(m_delayedTextChangedTimer, &QTimer::timeout, this, [this]
+    {
+        emit textChanged(text());
+    });
+    connect(this, &QLineEdit::textChanged, this, [this]
+    {
+        m_delayedTextChangedTimer->start(FILTER_INPUT_DELAY);
+    });
 }
 
 void LineEdit::keyPressEvent(QKeyEvent *event)

diff --git a/src/gui/lineedit.h b/src/gui/lineedit.h
@@ -31,6 +31,9 @@
 
 #include <QLineEdit>
 
+class QKeyEvent;
+class QTimer;
+
 class LineEdit final : public QLineEdit
 {
     Q_OBJECT
@@ -39,6 +42,11 @@ class LineEdit final : public QLineEdit
 public:
     explicit LineEdit(QWidget *parent = nullptr);
 
+signals:
+    void textChanged(const QString &text);
+
 private:
     void keyPressEvent(QKeyEvent *event) override;
+
+    QTimer *m_delayedTextChangedTimer = nullptr;
 };
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -54,6 +54,7 @@
 #include <QShortcut>
 #include <QSplitter>
 #include <QStatusBar>
+#include <QString>
 #include <QTimer>
 
 #include "base/bittorrent/session.h"

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
@@ -42,6 +42,7 @@ class QCloseEvent;
 class QComboBox;
 class QFileSystemWatcher;
 class QSplitter;
+class QString;
 class QTabWidget;
 class QTimer;
 

diff --git a/src/gui/search/searchjobwidget.cpp b/src/gui/search/searchjobwidget.cpp
@@ -126,9 +126,9 @@ SearchJobWidget::SearchJobWidget(SearchHandler *searchHandler, IGUIApplication *
     m_lineEditSearchResultsFilter->setPlaceholderText(tr("Filter search results..."));
     m_lineEditSearchResultsFilter->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(m_lineEditSearchResultsFilter, &QWidget::customContextMenuRequested, this, &SearchJobWidget::showFilterContextMenu);
+    connect(m_lineEditSearchResultsFilter, &LineEdit::textChanged, this, &SearchJobWidget::filterSearchResults);
     m_ui->horizontalLayout->insertWidget(0, m_lineEditSearchResultsFilter);
 
-    connect(m_lineEditSearchResultsFilter, &LineEdit::textChanged, this, &SearchJobWidget::filterSearchResults);
     connect(m_ui->filterMode, qOverload<int>(&QComboBox::currentIndexChanged)
             , this, &SearchJobWidget::updateFilter);
     connect(m_ui->minSeeds, &QAbstractSpinBox::editingFinished, this, &SearchJobWidget::updateFilter);

diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js
@@ -695,6 +695,8 @@ window.addEventListener("DOMContentLoaded", function() {
                 $('error_div').set('html', '');
                 if (response) {
                     clearTimeout(torrentsFilterInputTimer);
+                    torrentsFilterInputTimer = -1;
+
                     let torrentsTableSelectedRows;
                     let update_categories = false;
                     let updateTags = false;
@@ -1449,18 +1451,14 @@ window.addEventListener("DOMContentLoaded", function() {
         $('torrentFilesFilterToolbar').addClass("invisible");
     };
 
-    let prevTorrentsFilterValue;
-    let torrentsFilterInputTimer = null;
     // listen for changes to torrentsFilterInput
-    $('torrentsFilterInput').addEvent('input', function() {
-        const value = $('torrentsFilterInput').get("value");
-        if (value !== prevTorrentsFilterValue) {
-            prevTorrentsFilterValue = value;
-            clearTimeout(torrentsFilterInputTimer);
-            torrentsFilterInputTimer = setTimeout(function() {
-                torrentsTable.updateTable(false);
-            }, 400);
-        }
+    let torrentsFilterInputTimer = -1;
+    $('torrentsFilterInput').addEvent('input', () => {
+        clearTimeout(torrentsFilterInputTimer);
+        torrentsFilterInputTimer = setTimeout(() => {
+            torrentsFilterInputTimer = -1;
+            torrentsTable.updateTable();
+        }, window.qBittorrent.Misc.FILTER_INPUT_DELAY);
     });
 
     $('transfersTabLink').addEvent('click', showTransfersTab);

diff --git a/src/webui/www/private/scripts/contextmenu.js b/src/webui/www/private/scripts/contextmenu.js
@@ -175,12 +175,14 @@ window.qBittorrent.ContextMenu = (function() {
 
                 const touchstartEvent = e;
                 this.touchstartTimer = setTimeout(function() {
+                    this.touchstartTimer = -1;
                     this.triggerMenu(touchstartEvent, elem);
                 }.bind(this), this.options.touchTimer);
             }.bind(this));
             elem.addEvent('touchend', function(e) {
                 e.preventDefault();
                 clearTimeout(this.touchstartTimer);
+                this.touchstartTimer = -1;
             }.bind(this));
         },
 

diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js
@@ -701,10 +701,7 @@ window.qBittorrent.DynamicTable = (function() {
             return null;
         },
 
-        updateTable: function(fullUpdate) {
-            if (fullUpdate === undefined)
-                fullUpdate = false;
-
+        updateTable: function(fullUpdate = false) {
             const rows = this.getFilteredAndSortedRows();
 
             for (let i = 0; i < this.selectedRows.length; ++i)

diff --git a/src/webui/www/private/scripts/misc.js b/src/webui/www/private/scripts/misc.js
@@ -47,6 +47,8 @@ window.qBittorrent.Misc = (function() {
             toFixedPointString: toFixedPointString,
             containsAllTerms: containsAllTerms,
             sleep: sleep,
+            // variables
+            FILTER_INPUT_DELAY: 400,
             MAX_ETA: 8640000
         };
     };

diff --git a/src/webui/www/private/scripts/prop-files.js b/src/webui/www/private/scripts/prop-files.js
@@ -366,6 +366,7 @@ window.qBittorrent.PropFiles = (function() {
             },
             onSuccess: function(files) {
                 clearTimeout(torrentFilesFilterInputTimer);
+                torrentFilesFilterInputTimer = -1;
 
                 if (files.length === 0) {
                     torrentFilesTable.clear();
@@ -640,26 +641,27 @@ window.qBittorrent.PropFiles = (function() {
     if (torrentFilesTable.getSortedColumn() === null)
         torrentFilesTable.setSortedColumn('name');
 
-    let prevTorrentFilesFilterValue;
-    let torrentFilesFilterInputTimer = null;
     // listen for changes to torrentFilesFilterInput
-    $('torrentFilesFilterInput').addEvent('input', function() {
+    let torrentFilesFilterInputTimer = -1;
+    $('torrentFilesFilterInput').addEvent('input', () => {
+        clearTimeout(torrentFilesFilterInputTimer);
+
         const value = $('torrentFilesFilterInput').get("value");
-        if (value !== prevTorrentFilesFilterValue) {
-            prevTorrentFilesFilterValue = value;
-            torrentFilesTable.setFilter(value);
-            clearTimeout(torrentFilesFilterInputTimer);
-            torrentFilesFilterInputTimer = setTimeout(function() {
-                if (current_hash === "")
-                    return;
-                torrentFilesTable.updateTable(false);
+        torrentFilesTable.setFilter(value);
 
-                if (value.trim() === "")
-                    collapseAllNodes();
-                else
-                    expandAllNodes();
-            }, 400);
-        }
+        torrentFilesFilterInputTimer = setTimeout(() => {
+            torrentFilesFilterInputTimer = -1;
+
+            if (current_hash === "")
+                return;
+
+            torrentFilesTable.updateTable();
+
+            if (value.trim() === "")
+                collapseAllNodes();
+            else
+                expandAllNodes();
+        }, window.qBittorrent.Misc.FILTER_INPUT_DELAY);
     });
 
     /**

diff --git a/src/webui/www/private/views/log.html b/src/webui/www/private/views/log.html
@@ -183,7 +183,7 @@
         };
 
         let customSyncLogDataInterval = null;
-        let logFilterTimer;
+        let logFilterTimer = -1;
         let inputtedFilterText = "";
         let selectBox;
         let selectedLogLevels = JSON.parse(LocalPreferences.get('qbt_selected_log_levels')) || ['1', '2', '4', '8'];
@@ -298,9 +298,11 @@
         const logFilterChanged = () => {
             clearTimeout(logFilterTimer);
             logFilterTimer = setTimeout((curTab) => {
+                logFilterTimer = -1;
+
                 tableInfo[curTab].instance.updateTable(false);
                 updateLabelCount(curTab);
-            }, 400, currentSelectedTab);
+            }, window.qBittorrent.Misc.FILTER_INPUT_DELAY, currentSelectedTab);
         };
 
         const setCurrentTab = (tab) => {
@@ -322,6 +324,7 @@
             }
 
             clearTimeout(logFilterTimer);
+            logFilterTimer = -1;
             load();
 
             if (tableInfo[currentSelectedTab].instance.filterText !== getFilterText()) {
@@ -378,6 +381,8 @@
 
                     if (response.length > 0) {
                         clearTimeout(logFilterTimer);
+                        logFilterTimer = -1;
+
                         for (let i = 0; i < response.length; ++i) {
                             let row;
                             if (curTab === 'main') {

diff --git a/src/webui/www/private/views/search.html b/src/webui/www/private/views/search.html
@@ -230,7 +230,6 @@
             max: 0.00,
             maxUnit: 3
         };
-        let prevNameFilterValue;
         let selectedCategory = "QBT_TR(All categories)QBT_TR[CONTEXT=SearchEngineWidget]";
         let selectedPlugin = "all";
         let prevSelectedPlugin;
@@ -255,18 +254,17 @@
             searchResultsTable.setup('searchResultsTableDiv', 'searchResultsTableFixedHeaderDiv', searchResultsTableContextMenu);
             getPlugins();
 
-            let searchInNameFilterTimer = null;
             // listen for changes to searchInNameFilter
-            $('searchInNameFilter').addEvent('input', function() {
-                const value = $('searchInNameFilter').get("value");
-                if (value !== prevNameFilterValue) {
-                    prevNameFilterValue = value;
-                    clearTimeout(searchInNameFilterTimer);
-                    searchInNameFilterTimer = setTimeout(function() {
-                        searchText.filterPattern = value;
-                        searchFilterChanged();
-                    }, 400);
-                }
+            let searchInNameFilterTimer = -1;
+            $('searchInNameFilter').addEvent('input', () => {
+                clearTimeout(searchInNameFilterTimer);
+                searchInNameFilterTimer = setTimeout(() => {
+                    searchInNameFilterTimer = -1;
+
+                    const value = $('searchInNameFilter').get("value");
+                    searchText.filterPattern = value;
+                    searchFilterChanged();
+                }, window.qBittorrent.Misc.FILTER_INPUT_DELAY);
             });
 
             new Keyboard({