From cdad0dc7d32308c84153e6e4d7e2ef227b8a91d3 Mon Sep 17 00:00:00 2001
From: Thomas Piccirello <thomas@piccirello.com>
Date: Sun, 22 Jul 2018 20:33:17 -0400
Subject: [PATCH 1/2] Add WebUI Force Reannounce option

---
 src/webui/api/torrentscontroller.cpp        |  8 ++++++++
 src/webui/api/torrentscontroller.h          |  1 +
 src/webui/www/private/index.html            |  1 +
 src/webui/www/private/scripts/mocha-init.js | 14 ++++++++++++++
 src/webui/www/private/transferlist.html     |  3 +++
 5 files changed, 27 insertions(+)

diff --git a/src/webui/api/torrentscontroller.cpp b/src/webui/api/torrentscontroller.cpp
index 12ddcddfb..3446fb8e1 100644
--- a/src/webui/api/torrentscontroller.cpp
+++ b/src/webui/api/torrentscontroller.cpp
@@ -795,6 +795,14 @@ void TorrentsController::recheckAction()
     applyToTorrents(hashes, [](BitTorrent::TorrentHandle *torrent) { torrent->forceRecheck(); });
 }
 
+void TorrentsController::reannounceAction()
+{
+    checkParams({"hashes"});
+
+    const QStringList hashes {params()["hashes"].split('|')};
+    applyToTorrents(hashes, [](BitTorrent::TorrentHandle *torrent) { torrent->forceReannounce(); });
+}
+
 void TorrentsController::setCategoryAction()
 {
     checkParams({"hashes", "category"});
diff --git a/src/webui/api/torrentscontroller.h b/src/webui/api/torrentscontroller.h
index 03d870f93..0abaa30a3 100644
--- a/src/webui/api/torrentscontroller.h
+++ b/src/webui/api/torrentscontroller.h
@@ -49,6 +49,7 @@ private slots:
     void resumeAction();
     void pauseAction();
     void recheckAction();
+    void reannounceAction();
     void renameAction();
     void setCategoryAction();
     void createCategoryAction();
diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html
index ee31e38ba..3497b5882 100644
--- a/src/webui/www/private/index.html
+++ b/src/webui/www/private/index.html
@@ -127,6 +127,7 @@
         <li class="separator"><a href="#SequentialDownload"><img src="theme/checked" alt="QBT_TR(Download in sequential order)QBT_TR[CONTEXT=TransferListWidget]"/> QBT_TR(Download in sequential order)QBT_TR[CONTEXT=TransferListWidget]</a></li>
         <li><a href="#FirstLastPiecePrio"><img src="theme/checked" alt="QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget]"/> QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget]</a></li>
         <li class="separator"><a href="#ForceRecheck"><img src="theme/document-edit-verify" alt="QBT_TR(Force recheck)QBT_TR[CONTEXT=TransferListWidget]"/>  QBT_TR(Force recheck)QBT_TR[CONTEXT=TransferListWidget]</a></li>
+        <li><a href="#ForceReannounce"><img src="theme/document-edit-verify" alt="QBT_TR(Force reannounce)QBT_TR[CONTEXT=TransferListWidget]"/>  QBT_TR(Force reannounce)QBT_TR[CONTEXT=TransferListWidget]</a></li>
         <li id="queueingMenuItems" class="separator">
             <a href="#priority" class="arrow-right"><span style="display: inline-block; width:16px"></span> QBT_TR(Priority)QBT_TR[CONTEXT=TransferListWidget]</a>
             <ul>
diff --git a/src/webui/www/private/scripts/mocha-init.js b/src/webui/www/private/scripts/mocha-init.js
index 76cd50f6f..b1cdc811e 100644
--- a/src/webui/www/private/scripts/mocha-init.js
+++ b/src/webui/www/private/scripts/mocha-init.js
@@ -400,6 +400,20 @@ initializeWindows = function() {
         }
     };
 
+    reannounceFN = function() {
+        var hashes = torrentsTable.selectedRowsIds();
+        if (hashes.length) {
+            new Request({
+                url: 'api/v2/torrents/reannounce',
+                method: 'post',
+                data: {
+                    hashes: hashes.join("|"),
+                }
+            }).send();
+            updateMainData();
+        }
+    };
+
     setLocationFN = function() {
         var hashes = torrentsTable.selectedRowsIds();
         if (hashes.length) {
diff --git a/src/webui/www/private/transferlist.html b/src/webui/www/private/transferlist.html
index ca864f81a..dffd7c472 100644
--- a/src/webui/www/private/transferlist.html
+++ b/src/webui/www/private/transferlist.html
@@ -78,6 +78,9 @@
             ForceRecheck: function(element, ref) {
                 recheckFN();
             },
+            ForceReannounce: function(element, ref) {
+                reannounceFN();
+            },
 
             SuperSeeding: function(element, ref) {
                 setSuperSeedingFN(!ref.getItemChecked('SuperSeeding'));

From 13075e50993b405b5b162d1e359a0879b3c4f75e Mon Sep 17 00:00:00 2001
From: Thomas Piccirello <thomas@piccirello.com>
Date: Sun, 22 Jul 2018 20:33:39 -0400
Subject: [PATCH 2/2] Send all rechecks in one request

---
 src/webui/www/private/scripts/mocha-init.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/webui/www/private/scripts/mocha-init.js b/src/webui/www/private/scripts/mocha-init.js
index b1cdc811e..49a5f893d 100644
--- a/src/webui/www/private/scripts/mocha-init.js
+++ b/src/webui/www/private/scripts/mocha-init.js
@@ -387,15 +387,13 @@ initializeWindows = function() {
     recheckFN = function() {
         var hashes = torrentsTable.selectedRowsIds();
         if (hashes.length) {
-            hashes.each(function(hash, index) {
-                new Request({
-                    url: 'api/v2/torrents/recheck',
-                    method: 'post',
-                    data: {
-                        hashes: hash
-                    }
-                }).send();
-            });
+            new Request({
+                url: 'api/v2/torrents/recheck',
+                method: 'post',
+                data: {
+                    hashes: hashes.join("|"),
+                }
+            }).send();
             updateMainData();
         }
     };