Backport changes to v4.6.x branch

.gitignore

@@ -1,3 +1,4 @@
+.vscode/
 src/gui/geoip/GeoIP.dat
 src/gui/geoip/GeoIP.dat.gz
 src/qbittorrent

dist/windows/installer-translations/french.nsi

@@ -3,9 +3,9 @@
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_FRENCH} "qBittorrent (requis)"
 ;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_FRENCH} "Créer un Raccourci sur le Bureau"
+LangString inst_desktop ${LANG_FRENCH} "Créer un raccourci sur le Bureau"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_FRENCH} "Créer un Raccourci dans le Menu Démarrer"
+LangString inst_startmenu ${LANG_FRENCH} "Créer un raccourci dans le Menu Démarrer"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
 LangString inst_startup ${LANG_FRENCH} "Démarrer qBittorrent au démarrage de Windows"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
@@ -57,6 +57,6 @@ LangString remove_cache ${LANG_FRENCH} "Supprimer les torrents et données en ca
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
 LangString uninst_warning ${LANG_FRENCH} "qBittorrent est en cours d'exécution. Fermez l'application avant de la désinstaller."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_FRENCH} "Ne peut pas supprimer l'association du .torrent. Elle est associée avec :"
+LangString uninst_tor_warn ${LANG_FRENCH} "Impossible de supprimer l'association .torrent. Elle est associée avec :"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_FRENCH} "Ne peut pas supprimer l'association du magnet. Elle est associée avec :"
+LangString uninst_mag_warn ${LANG_FRENCH} "Impossible de supprimer l'association magnet. Elle est associée avec :"

dist/windows/installer-translations/hungarian.nsi

@@ -31,7 +31,7 @@ LangString inst_requires_64bit ${LANG_HUNGARIAN} "A telepítő csak 64-bites Win
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_HUNGARIAN} "A qBittorrent ezen verziójához minimum Windows 7 szükséges."
 ;LangString inst_requires_win10 ${LANG_ENGLISH} "This installer requires at least Windows 10 (1809) / Windows Server 2019."
-LangString inst_requires_win10 ${LANG_HUNGARIAN}  "This installer requires at least Windows 10 (1809) / Windows Server 2019."
+LangString inst_requires_win10 ${LANG_HUNGARIAN}  "A telepítéshez minimum Windows 10 (1809) / Windows Server 2019 szükséges."
 ;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
 LangString inst_uninstall_link_description ${LANG_HUNGARIAN} "qBittorrent eltávolítása"
 

src/app/application.cpp

@@ -264,11 +264,8 @@ Application::Application(int &argc, char **argv)
     Logger::initInstance();
 
     const auto portableProfilePath = Path(QCoreApplication::applicationDirPath()) / DEFAULT_PORTABLE_MODE_PROFILE_DIR;
-    const bool portableModeEnabled = m_commandLineArgs.profileDir.isEmpty() && portableProfilePath.exists();
-
-    const Path profileDir = portableModeEnabled
-        ? portableProfilePath
-        : m_commandLineArgs.profileDir;
+    const bool portableModeEnabled = m_commandLineArgs.profileDir.isEmpty() && Utils::Fs::isDir(portableProfilePath);
+    const Path profileDir = portableModeEnabled ? portableProfilePath : m_commandLineArgs.profileDir;
     Profile::initInstance(profileDir, m_commandLineArgs.configurationName,
                         (m_commandLineArgs.relativeFastresumePaths || portableModeEnabled));
 

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 <QPushButton>
 #include <QScreen>
 #include <QShortcut>
+#include <QSize>
 #include <QString>
 #include <QUrl>
 #include <QVector>

src/gui/addnewtorrentdialog.h

@@ -39,6 +39,9 @@
 #include "base/path.h"
 #include "base/settingvalue.h"
 
+class LineEdit;
+class TorrentFileGuard;
+
 namespace BitTorrent
 {
     class InfoHash;
@@ -54,9 +57,6 @@ namespace Ui
     class AddNewTorrentDialog;
 }
 
-class LineEdit;
-class TorrentFileGuard;
-
 class AddNewTorrentDialog final : public QDialog
 {
     Q_OBJECT

src/gui/desktopintegration.cpp

@@ -31,6 +31,7 @@
 
 #include <chrono>
 
+#include <QtGlobal>
 #include <QMenu>
 #include <QTimer>
 
@@ -300,11 +301,11 @@ QIcon DesktopIntegration::getSystrayIcon() const
         icon = UIThemeManager::instance()->getIcon(u"qbittorrent-tray-light"_s);
         break;
     }
-#if ((QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && defined(Q_OS_UNIX) && !defined(Q_OS_MACOS))
+#ifdef Q_OS_UNIX
     // Workaround for invisible tray icon in KDE, https://bugreports.qt.io/browse/QTBUG-53550
-    return {icon.pixmap(32)};
-#else
-    return icon;
+    if (qEnvironmentVariable("XDG_CURRENT_DESKTOP").compare(u"KDE", Qt::CaseInsensitive) == 0)
+        return icon.pixmap(32);
 #endif
+    return icon;
 }
 #endif // Q_OS_MACOS

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)

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;
 };

src/gui/mainwindow.cpp

@@ -57,6 +57,7 @@
 #include <QShortcut>
 #include <QSplitter>
 #include <QStatusBar>
+#include <QString>
 #include <QtGlobal>
 #include <QTimer>
 

src/gui/mainwindow.h

@@ -42,6 +42,7 @@ class QCloseEvent;
 class QComboBox;
 class QFileSystemWatcher;
 class QSplitter;
+class QString;
 class QTabWidget;
 class QTimer;
 

src/gui/search/searchjobwidget.cpp

@@ -128,9 +128,9 @@ SearchJobWidget::SearchJobWidget(SearchHandler *searchHandler, QWidget *parent)
     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);

src/src.pro

@@ -7,7 +7,7 @@ win32: include(../winconf.pri)
 macx: include(../macxconf.pri)
 unix:!macx: include(../unixconf.pri)
 
-QT += network sql xml
+QT += core-private network sql xml
 
 macx|*-clang*: QMAKE_CXXFLAGS_WARN_ON += -Wno-range-loop-analysis
 

src/webui/www/private/scripts/client.js

@@ -658,6 +658,8 @@ window.addEvent('load', function() {
                 $('error_div').set('html', '');
                 if (response) {
                     clearTimeout(torrentsFilterInputTimer);
+                    torrentsFilterInputTimer = -1;
+
                     let torrentsTableSelectedRows;
                     let update_categories = false;
                     let updateTags = false;
@@ -1357,18 +1359,14 @@ window.addEvent('load', 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);

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));
         },
 

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)

src/webui/www/private/scripts/misc.js

@@ -46,6 +46,8 @@ window.qBittorrent.Misc = (function() {
             toFixedPointString: toFixedPointString,
             containsAllTerms: containsAllTerms,
             sleep: sleep,
+            // variables
+            FILTER_INPUT_DELAY: 400,
             MAX_ETA: 8640000
         };
     };

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);
     });
 
     /**

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'];
@@ -297,9 +297,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) => {
@@ -321,6 +323,7 @@
             }
 
             clearTimeout(logFilterTimer);
+            logFilterTimer = -1;
             load();
 
             if (tableInfo[currentSelectedTab].instance.filterText !== getFilterText()) {
@@ -377,6 +380,8 @@
 
                     if (response.length > 0) {
                         clearTimeout(logFilterTimer);
+                        logFilterTimer = -1;
+
                         for (let i = 0; i < response.length; ++i) {
                             let row;
                             if (curTab === 'main') {