Add regex toggle for WEBUI torrent filtering

qbittorrent · Mar 17, 2024 · 8560fb2 · 8560fb2
1 parent d7aaf80
commit 8560fb2
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 5 deletions.
diff --git a/src/webui/www/private/css/style.css b/src/webui/www/private/css/style.css
@@ -409,6 +409,37 @@ a.propButton img {
     padding: 4px 4px 4px 25px;
 }
 
+#torrentsFilterRegexBox {
+    display:none;
+}
+
+#torrentsFilterRegexBox + label {
+    display:inline-block;
+    height: 26px;
+    width: 26px;
+    margin-bottom: -9px;
+    background-image: url("../images/regex.svg");
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 1.5em;
+    border: 1px solid var(--color-border-default);
+    border-radius: 4px;
+}
+
+#torrentsFilterRegexBox:checked + label {
+    display:inline-block;
+    height: 26px;
+    width: 26px;
+    margin-bottom: -9px;
+    background-image: url("../images/regex.svg");
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 1.5em;
+    background-color: var(--color-background-default);
+    border: 1px solid var(--color-accent-blue);
+    border-radius: 4px;
+}
+
 #torrentFilesFilterToolbar {
     float: right;
     margin-right: 30px;

diff --git a/src/webui/www/private/images/regex.svg b/src/webui/www/private/images/regex.svg
diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html
@@ -130,6 +130,8 @@ <h1 class="applicationTitle">qBittorrent Web User Interface <span class="version
                 </div>
                 <div id="torrentsFilterToolbar">
                     <input type="text" id="torrentsFilterInput" placeholder="QBT_TR(Filter torrent list...)QBT_TR[CONTEXT=MainWindow]" autocorrect="off" autocapitalize="none" />
+                    <input type="checkbox" id="torrentsFilterRegexBox">
+                    <label for="torrentsFilterRegexBox">
                 </div>
             </div>
         </div>

diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js
@@ -1460,6 +1460,13 @@ window.addEventListener("DOMContentLoaded", function() {
             torrentsTable.updateTable();
         }, window.qBittorrent.Misc.FILTER_INPUT_DELAY);
     });
+    $('torrentsFilterRegexBox').addEvent('change', () => {
+        clearTimeout(torrentsFilterInputTimer);
+        torrentsFilterInputTimer = setTimeout(() => {
+            torrentsFilterInputTimer = -1;
+            torrentsTable.updateTable();
+        }, window.qBittorrent.Misc.FILTER_INPUT_DELAY);
+    });
 
     $('transfersTabLink').addEvent('click', showTransfersTab);
     $('searchTabLink').addEvent('click', showSearchTab);

diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js
@@ -1437,10 +1437,16 @@ window.qBittorrent.DynamicTable = (function() {
                 }
             }
 
-            if ((filterTerms !== undefined) && (filterTerms !== null)
-                && (filterTerms.length > 0) && !window.qBittorrent.Misc.containsAllTerms(name, filterTerms))
-                return false;
-
+            if ((filterTerms !== undefined) && (filterTerms !== null)) {
+                if (Array.isArray(filterTerms)) {
+                    if ((filterTerms.length > 0) && !window.qBittorrent.Misc.containsAllTerms(name, filterTerms))
+                        return false;
+                }
+                else { // regex search
+                    if (!filterTerms.test(name))
+                        return false;
+                }
+            }
             return true;
         },
 
@@ -1471,8 +1477,15 @@ window.qBittorrent.DynamicTable = (function() {
             const filteredRows = [];
 
             const rows = this.rows.getValues();
+            const torrentsFilterRegex = $('torrentsFilterRegexBox').checked;
             const filterText = $('torrentsFilterInput').value.trim().toLowerCase();
-            const filterTerms = (filterText.length > 0) ? filterText.split(" ") : null;
+            let filterTerms;
+            if (torrentsFilterRegex) {
+                filterTerms = (filterText.length > 0) ? new RegExp(filterText) : null;
+            }
+            else {
+                filterTerms = (filterText.length > 0) ? filterText.split(" ") : null;
+            }
 
             for (let i = 0; i < rows.length; ++i) {
                 if (this.applyFilter(rows[i], selected_filter, selected_category, selectedTag, selectedTracker, filterTerms)) {

diff --git a/src/webui/www/webui.qrc b/src/webui/www/webui.qrc
@@ -358,6 +358,7 @@
         <file>private/images/torrent-start.svg</file>
         <file>private/images/torrent-stop.svg</file>
         <file>private/images/trackers.svg</file>
+        <file>private/images/regex.svg</file>
         <file>private/images/upload.svg</file>
         <file>private/images/view-categories.svg</file>
         <file>private/images/view-refresh.svg</file>