WebUI: use native API for accessing query string

PR #22141.
qbittorrent · Jan 12, 2025 · c622d50 · c622d50
1 parent 11991e6
commit c622d50
Show file tree

Hide file tree

Showing 28 changed files with 294 additions and 205 deletions.
diff --git a/src/webui/www/private/addpeers.html b/src/webui/www/private/addpeers.html
@@ -22,8 +22,8 @@
                 }
             });
 
-            const hash = new URI().getData("hash");
-            if (!hash)
+            const hash = new URLSearchParams(window.location.search).get("hash");
+            if (hash === null)
                 return;
 
             $("peers").focus();

diff --git a/src/webui/www/private/addtrackers.html b/src/webui/www/private/addtrackers.html
@@ -30,7 +30,7 @@
                 fetch("api/v2/torrents/addTrackers", {
                         method: "POST",
                         body: new URLSearchParams({
-                            hash: new URI().getData("hash"),
+                            hash: new URLSearchParams(window.location.search).get("hash"),
                             urls: $("trackersUrls").value
                         })
                     })

diff --git a/src/webui/www/private/addwebseeds.html b/src/webui/www/private/addwebseeds.html
@@ -29,7 +29,7 @@
                 fetch("api/v2/torrents/addWebSeeds", {
                         method: "POST",
                         body: new URLSearchParams({
-                            hash: new URI().getData("hash"),
+                            hash: new URLSearchParams(window.location.search).get("hash"),
                             urls: $("urls").value.split("\n").map(w => encodeURIComponent(w.trim())).filter(w => (w.length > 0)).join("|")
                         })
                     })

diff --git a/src/webui/www/private/confirmfeeddeletion.html b/src/webui/www/private/confirmfeeddeletion.html
@@ -13,7 +13,6 @@
         "use strict";
 
         window.addEventListener("DOMContentLoaded", () => {
-            const paths = new URI().getData("paths").split("|");
             $("cancelBtn").focus();
             $("cancelBtn").addEventListener("click", (e) => {
                 e.preventDefault();
@@ -25,7 +24,8 @@
                 e.stopPropagation();
 
                 let completionCount = 0;
-                paths.forEach((path) => {
+                const paths = new URLSearchParams(window.location.search).get("paths").split("|");
+                for (const path of paths) {
                     fetch("api/v2/rss/removeItem", {
                             method: "POST",
                             body: new URLSearchParams({
@@ -42,7 +42,7 @@
                                 window.parent.qBittorrent.Client.closeFrameWindow(window);
                             }
                         });
-                });
+                }
             });
         });
     </script>

diff --git a/src/webui/www/private/confirmruleclear.html b/src/webui/www/private/confirmruleclear.html
@@ -13,8 +13,6 @@
         "use strict";
 
         window.addEventListener("DOMContentLoaded", () => {
-            const rules = new URI().getData("rules").split("|");
-
             $("cancelBtn").focus();
             $("cancelBtn").addEventListener("click", (e) => {
                 e.preventDefault();
@@ -26,15 +24,16 @@
                 e.stopPropagation();
 
                 let completionCount = 0;
-                rules.forEach((rule) => {
+                const rules = new URLSearchParams(window.location.search).get("rules").split("|");
+                for (const rule of rules) {
                     window.parent.qBittorrent.RssDownloader.modifyRuleState(decodeURIComponent(rule), "previouslyMatchedEpisodes", [], () => {
                         ++completionCount;
                         if (completionCount === rules.length) {
                             window.parent.qBittorrent.RssDownloader.updateRulesList();
                             window.parent.qBittorrent.Client.closeFrameWindow(window);
                         }
                     });
-                });
+                }
             });
         });
     </script>

diff --git a/src/webui/www/private/confirmruledeletion.html b/src/webui/www/private/confirmruledeletion.html
@@ -13,8 +13,6 @@
         "use strict";
 
         window.addEventListener("DOMContentLoaded", () => {
-            const rules = new URI().getData("rules").split("|");
-
             $("cancelBtn").focus();
             $("cancelBtn").addEventListener("click", (e) => {
                 e.preventDefault();
@@ -26,7 +24,8 @@
                 e.stopPropagation();
 
                 let completionCount = 0;
-                rules.forEach((rule) => {
+                const rules = new URLSearchParams(window.location.search).get("rules").split("|");
+                for (const rule of rules) {
                     fetch("api/v2/rss/removeRule", {
                             method: "POST",
                             body: new URLSearchParams({
@@ -43,7 +42,7 @@
                                 window.parent.qBittorrent.Client.closeFrameWindow(window);
                             }
                         });
-                });
+                }
             });
         });
     </script>

diff --git a/src/webui/www/private/confirmtrackerdeletion.html b/src/webui/www/private/confirmtrackerdeletion.html
@@ -13,9 +13,10 @@
         "use strict";
 
         window.addEventListener("DOMContentLoaded", () => {
-            const host = new URI().getData("host");
-            const urls = new URI().getData("urls");
-            $("confirmDeleteTrackerText").textContent = "QBT_TR(Are you sure you want to remove tracker %1 from all torrents?)QBT_TR[CONTEXT=TrackersFilterWidget]".replace("%1", `"${host}"`);
+            const searchParams = new URLSearchParams(window.location.search);
+            const host = searchParams.get("host");
+
+            $("confirmDeleteTrackerText").textContent = "QBT_TR(Are you sure you want to remove tracker %1 from all torrents?)QBT_TR[CONTEXT=TrackersFilterWidget]".replace("%1", host);
 
             $("cancelBtn").focus();
             $("cancelBtn").addEventListener("click", (e) => {
@@ -29,7 +30,7 @@
                         method: "POST",
                         body: new URLSearchParams({
                             hash: "*",
-                            urls: urls
+                            urls: searchParams.get("urls")
                         })
                     })
                     .then((response) => {

diff --git a/src/webui/www/private/download.html b/src/webui/www/private/download.html
@@ -163,13 +163,10 @@ <h2><label for="urls">QBT_TR(Add torrent links)QBT_TR[CONTEXT=AddNewTorrentDialo
     <script>
         "use strict";
 
-        const encodedUrls = new URI().getData("urls");
-        if (encodedUrls) {
-            const urls = encodedUrls.split("|").map((url) => {
-                return decodeURIComponent(url);
-            });
-
-            if (urls.length)
+        const encodedUrls = new URLSearchParams(window.location.search).get("urls");
+        if (encodedUrls !== null) {
+            const urls = encodedUrls.split("|").map(decodeURIComponent);
+            if (urls.length > 0)
                 $("urls").value = urls.join("\n");
         }
 

diff --git a/src/webui/www/private/downloadlimit.html b/src/webui/www/private/downloadlimit.html
@@ -46,7 +46,7 @@
             }
         });
 
-        const hashes = new URI().getData("hashes").split("|");
+        const hashes = new URLSearchParams(window.location.search).get("hashes").split("|");
         const setDlLimit = () => {
             const limit = Number($("dllimitUpdatevalue").value) * 1024;
             if (hashes[0] === "global") {

diff --git a/src/webui/www/private/editfeedurl.html b/src/webui/www/private/editfeedurl.html
@@ -27,7 +27,8 @@
                 }
             });
 
-            const currentUrl = new URI().getData("url");
+            const searchParams = new URLSearchParams(window.location.search);
+            const currentUrl = searchParams.get("url");
 
             $("url").value = currentUrl;
             $("url").focus();
@@ -54,7 +55,7 @@
                 fetch("api/v2/rss/setFeedURL", {
                         method: "POST",
                         body: new URLSearchParams({
-                            path: new URI().getData("path"),
+                            path: searchParams.get("path"),
                             url: newUrl
                         })
                     })

diff --git a/src/webui/www/private/edittracker.html b/src/webui/www/private/edittracker.html
@@ -26,8 +26,9 @@
                 }
             });
 
-            const currentUrl = new URI().getData("url");
-            if (!currentUrl)
+            const searchParams = new URLSearchParams(window.location.search);
+            const currentUrl = searchParams.get("url");
+            if (currentUrl === null)
                 return;
 
             $("trackerUrl").value = currentUrl;
@@ -40,7 +41,7 @@
                 fetch("api/v2/torrents/editTracker", {
                         method: "POST",
                         body: new URLSearchParams({
-                            hash: new URI().getData("hash"),
+                            hash: searchParams.get("hash"),
                             origUrl: currentUrl,
                             newUrl: $("trackerUrl").value
                         })

diff --git a/src/webui/www/private/editwebseed.html b/src/webui/www/private/editwebseed.html
@@ -26,7 +26,8 @@
                 }
             });
 
-            const origUrl = new URI().getData("url");
+            const searchParams = new URLSearchParams(window.location.search);
+            const origUrl = searchParams.get("url");
             $("url").value = decodeURIComponent(origUrl);
             $("url").focus();
 
@@ -36,7 +37,7 @@
                 fetch("api/v2/torrents/editWebSeed", {
                         method: "POST",
                         body: new URLSearchParams({
-                            hash: new URI().getData("hash"),
+                            hash: searchParams.get("hash"),
                             origUrl: origUrl,
                             newUrl: encodeURIComponent($("url").value.trim())
                         })

diff --git a/src/webui/www/private/newcategory.html b/src/webui/www/private/newcategory.html
@@ -28,10 +28,11 @@
                 }
             });
 
-            const uriAction = window.qBittorrent.Misc.safeTrim(new URI().getData("action"));
-            const uriHashes = window.qBittorrent.Misc.safeTrim(new URI().getData("hashes"));
-            const uriCategoryName = window.qBittorrent.Misc.safeTrim(new URI().getData("categoryName"));
-            const uriSavePath = window.qBittorrent.Misc.safeTrim(new URI().getData("savePath"));
+            const searchParams = new URLSearchParams(window.location.search);
+            const uriAction = window.qBittorrent.Misc.safeTrim(searchParams.get("action"));
+            const uriHashes = window.qBittorrent.Misc.safeTrim(searchParams.get("hashes"));
+            const uriCategoryName = window.qBittorrent.Misc.safeTrim(searchParams.get("categoryName"));
+            const uriSavePath = window.qBittorrent.Misc.safeTrim(searchParams.get("savePath"));
 
             if (uriAction === "edit") {
                 if (!uriCategoryName)

diff --git a/src/webui/www/private/newfeed.html b/src/webui/www/private/newfeed.html
@@ -28,7 +28,6 @@
             });
 
             $("feedURL").focus();
-            const path = new URI().getData("path");
             $("submitButton").addEventListener("click", (e) => {
                 e.preventDefault();
                 e.stopPropagation();
@@ -42,11 +41,12 @@
 
                 $("submitButton").disabled = true;
 
+                const path = new URLSearchParams(window.location.search).get("path");
                 fetch("api/v2/rss/addFeed", {
                         method: "POST",
                         body: new URLSearchParams({
                             url: feedURL,
-                            path: path ? (path + "\\" + feedURL) : ""
+                            path: (((path !== null) && (path.length > 0)) ? `${path}\\${feedURL}` : "")
                         })
                     })
                     .then(async (response) => {

diff --git a/src/webui/www/private/newfolder.html b/src/webui/www/private/newfolder.html
@@ -29,7 +29,6 @@
             });
 
             $("folderName").focus();
-            const path = new URI().getData("path");
             $("submitButton").addEventListener("click", (e) => {
                 e.preventDefault();
                 e.stopPropagation();
@@ -43,10 +42,11 @@
 
                 $("submitButton").disabled = true;
 
+                const path = new URLSearchParams(window.location.search).get("path");
                 fetch("api/v2/rss/addFolder", {
                         method: "POST",
                         body: new URLSearchParams({
-                            path: path ? (path + "\\" + folderName) : folderName
+                            path: (((path !== null) && (path.length > 0)) ? `${path}\\${folderName}` : folderName)
                         })
                     })
                     .then(async (response) => {

diff --git a/src/webui/www/private/newtag.html b/src/webui/www/private/newtag.html
@@ -27,8 +27,8 @@
                 }
             });
 
-            const uriAction = window.qBittorrent.Misc.safeTrim(new URI().getData("action"));
-            const uriHashes = window.qBittorrent.Misc.safeTrim(new URI().getData("hashes"));
+            const searchParams = new URLSearchParams(window.location.search);
+            const uriAction = window.qBittorrent.Misc.safeTrim(searchParams.get("action"));
 
             if (uriAction === "create")
                 $("legendText").textContent = "QBT_TR(Tag:)QBT_TR[CONTEXT=TagFilterWidget]";
@@ -52,8 +52,9 @@
                 };
 
                 switch (uriAction) {
-                    case "set":
-                        if (uriHashes === "")
+                    case "set": {
+                        const uriHashes = window.qBittorrent.Misc.safeTrim(searchParams.get("hashes"));
+                        if ((uriHashes === null) || (uriHashes.length <= 0))
                             return;
 
                         fetch("api/v2/torrents/addTags", {
@@ -70,6 +71,7 @@
                                 window.parent.qBittorrent.Client.closeFrameWindow(window);
                             });
                         break;
+                    }
 
                     case "create":
                         if (!verifyTagName(tagName))

diff --git a/src/webui/www/private/rename.html b/src/webui/www/private/rename.html
@@ -27,9 +27,10 @@
                 }
             });
 
-            const name = new URI().getData("name");
+            const searchParams = new URLSearchParams(window.location.search);
+            const name = searchParams.get("name");
             // set text field to current value
-            if (name)
+            if (name !== null)
                 $("rename").value = name;
 
             $("rename").focus();
@@ -42,8 +43,8 @@
                 if ((name === null) || (name === ""))
                     return;
 
-                const hash = new URI().getData("hash");
-                if (hash) {
+                const hash = searchParams.get("hash");
+                if (hash !== null) {
                     fetch("api/v2/torrents/rename", {
                             method: "POST",
                             body: new URLSearchParams({

diff --git a/src/webui/www/private/rename_feed.html b/src/webui/www/private/rename_feed.html
@@ -27,7 +27,7 @@
                 }
             });
 
-            const oldPath = new URI().getData("oldPath");
+            const oldPath = new URLSearchParams(window.location.search).get("oldPath");
 
             $("rename").value = oldPath;
             $("rename").focus();

diff --git a/src/webui/www/private/rename_file.html b/src/webui/www/private/rename_file.html
@@ -28,9 +28,10 @@
                 }
             });
 
-            const hash = new URI().getData("hash");
-            const oldPath = new URI().getData("path");
-            const isFolder = ((new URI().getData("isFolder")) === "true");
+            const searchParams = new URLSearchParams(window.location.search);
+            const hash = searchParams.get("hash");
+            const oldPath = searchParams.get("path");
+            const isFolder = ((searchParams.get("isFolder")) === "true");
 
             const oldName = window.qBittorrent.Filesystem.fileName(oldPath);
             $("rename").value = oldName;

diff --git a/src/webui/www/private/rename_rule.html b/src/webui/www/private/rename_rule.html
@@ -27,7 +27,7 @@
                 }
             });
 
-            const oldName = new URI().getData("rule");
+            const oldName = new URLSearchParams(window.location.search).get("rule");
 
             $("rename").value = oldName;
             $("rename").focus();

diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js
@@ -1656,7 +1656,7 @@ window.addEventListener("DOMContentLoaded", () => {
                     icon: "images/qbittorrent-tray.svg",
                     title: "QBT_TR(Upload local torrent)QBT_TR[CONTEXT=HttpServer]",
                     loadMethod: "iframe",
-                    contentURL: new URI("upload.html").toString(),
+                    contentURL: "upload.html",
                     addClass: "windowFrame", // fixes iframe scrolling on iOS Safari
                     scrollbars: true,
                     maximizable: false,
@@ -1693,13 +1693,16 @@ window.addEventListener("DOMContentLoaded", () => {
                     return;
 
                 const id = "downloadPage";
-                const contentURI = new URI("download.html").setData("urls", urls.map(encodeURIComponent).join("|"));
+                const contentURL = new URL("download.html", window.location);
+                contentURL.search = new URLSearchParams({
+                    urls: urls.map(encodeURIComponent).join("|")
+                });
                 new MochaUI.Window({
                     id: id,
                     icon: "images/qbittorrent-tray.svg",
                     title: "QBT_TR(Download from URLs)QBT_TR[CONTEXT=downloadFromURL]",
                     loadMethod: "iframe",
-                    contentURL: contentURI.toString(),
+                    contentURL: contentURL.toString(),
                     addClass: "windowFrame", // fixes iframe scrolling on iOS Safari
                     scrollbars: true,
                     maximizable: false,