From 3d59cb9199d2a78bf5c067a50b4371ca5752f3be Mon Sep 17 00:00:00 2001
From: "Stiliyan Tonev (Bark)" <stiliyan21@gmail.com>
Date: Tue, 20 May 2025 11:26:03 +0300
Subject: [PATCH] refact: Move unconditional logic outside of if.

---
 src/webui/api/torrentscontroller.cpp | 50 ++++++++++++++++------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/webui/api/torrentscontroller.cpp b/src/webui/api/torrentscontroller.cpp
index 98c01c3a2..35b6f8bc1 100644
--- a/src/webui/api/torrentscontroller.cpp
+++ b/src/webui/api/torrentscontroller.cpp
@@ -1120,6 +1120,19 @@ void TorrentsController::addTrackersAction()
     QList<BitTorrent::Torrent *> torrents;
     const QList<BitTorrent::TrackerEntry> entries = BitTorrent::parseTrackerEntries(params()[u"urls"_s]);
 
+    const QStringList idStrings = hashParam.split(u'|', Qt::SkipEmptyParts);
+    for (const QString &hash : idStrings)
+    {
+        if (hash == u"*"_s)
+            continue;
+        const auto id = BitTorrent::TorrentID::fromString(hash);
+        BitTorrent::Torrent *const torrent = BitTorrent::Session::instance()->getTorrent(id);
+        if (!torrent)
+            throw APIError(APIErrorType::NotFound);
+
+        torrents.append(torrent);
+    }
+
     if (hashParam == u"*"_s)
     {
         // add this tracker to all torrents
@@ -1127,17 +1140,7 @@ void TorrentsController::addTrackersAction()
     }
     else if (hashParam.contains(u'|'))
     {
-        // add this tracker to all torrents in the list
-        const QStringList idStrings = hashParam.split(u'|', Qt::SkipEmptyParts);
-        for (const QString &hash : idStrings)
-        {
-            const auto id = BitTorrent::TorrentID::fromString(hash);
-            BitTorrent::Torrent *const torrent = BitTorrent::Session::instance()->getTorrent(id);
-            if (!torrent)
-                throw APIError(APIErrorType::NotFound);
-
-            torrents.append(torrent);
-        }
+        // We have this, so that we wont enter the `else` and break it.
     }
     else
     {
@@ -1223,6 +1226,19 @@ void TorrentsController::removeTrackersAction()
 
     QList<BitTorrent::Torrent *> torrents;
 
+    const QStringList idStrings = hashParam.split(u'|', Qt::SkipEmptyParts);
+    for (const QString &hash : idStrings)
+    {
+        if (hash == u"*"_s)
+            continue;
+        const auto id = BitTorrent::TorrentID::fromString(hash);
+        BitTorrent::Torrent *const torrent = BitTorrent::Session::instance()->getTorrent(id);
+        if (!torrent)
+            throw APIError(APIErrorType::NotFound);
+
+        torrents.append(torrent);
+    }
+
     if (hashParam == u"*"_s)
     {
         // remove trackers from all torrents
@@ -1230,17 +1246,7 @@ void TorrentsController::removeTrackersAction()
     }
     else if (hashParam.contains(u'|'))
     {
-        // remove trackers from all torrents in the list
-        const QStringList idStrings = hashParam.split(u'|', Qt::SkipEmptyParts);
-        for (const QString &hash : idStrings)
-        {
-            const auto id = BitTorrent::TorrentID::fromString(hash);
-            BitTorrent::Torrent *const torrent = BitTorrent::Session::instance()->getTorrent(id);
-            if (!torrent)
-                throw APIError(APIErrorType::NotFound);
-
-            torrents.append(torrent);
-        }
+        // Don't want to enter `else` with a `hashParam` not an id
     }
     else
     {