From e96f2d7be091612776afffe209a8741f5eb00638 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 8 Oct 2021 20:27:47 +0800 Subject: [PATCH 1/3] Simplify comparison From https://doc.qt.io/qt-5/qdatetime.html#operator-eq-eq: >Since 5.14, all invalid datetimes are equal to one another and differ from all other datetimes. --- src/gui/transferlistsortmodel.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gui/transferlistsortmodel.cpp b/src/gui/transferlistsortmodel.cpp index fcf9e31fd..2f442d13a 100644 --- a/src/gui/transferlistsortmodel.cpp +++ b/src/gui/transferlistsortmodel.cpp @@ -51,10 +51,8 @@ namespace const bool isLeftValid = left.isValid(); const bool isRightValid = right.isValid(); - if (isLeftValid && isRightValid) + if (isLeftValid == isRightValid) return threeWayCompare(left, right); - if (!isLeftValid && !isRightValid) - return 0; return isLeftValid ? -1 : 1; } From 5c9655abc33be3be8d6a1e24faacfaa9174b5777 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 9 Oct 2021 02:20:27 +0800 Subject: [PATCH 2/3] WebAPI: Use specific number to represent non-existing values Closes #15545. --- src/webui/api/torrentscontroller.cpp | 6 +++--- src/webui/www/private/scripts/prop-trackers.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/webui/api/torrentscontroller.cpp b/src/webui/api/torrentscontroller.cpp index 14e1c14dc..aadaacdc4 100644 --- a/src/webui/api/torrentscontroller.cpp +++ b/src/webui/api/torrentscontroller.cpp @@ -176,7 +176,7 @@ namespace const QJsonObject dht { {KEY_TRACKER_URL, "** [DHT] **"}, - {KEY_TRACKER_TIER, ""}, + {KEY_TRACKER_TIER, -1}, {KEY_TRACKER_MSG, (isTorrentPrivate ? privateMsg : "")}, {KEY_TRACKER_STATUS, ((BitTorrent::Session::instance()->isDHTEnabled() && !isTorrentPrivate) ? working : disabled)}, {KEY_TRACKER_PEERS_COUNT, 0}, @@ -188,7 +188,7 @@ namespace const QJsonObject pex { {KEY_TRACKER_URL, "** [PeX] **"}, - {KEY_TRACKER_TIER, ""}, + {KEY_TRACKER_TIER, -1}, {KEY_TRACKER_MSG, (isTorrentPrivate ? privateMsg : "")}, {KEY_TRACKER_STATUS, ((BitTorrent::Session::instance()->isPeXEnabled() && !isTorrentPrivate) ? working : disabled)}, {KEY_TRACKER_PEERS_COUNT, 0}, @@ -200,7 +200,7 @@ namespace const QJsonObject lsd { {KEY_TRACKER_URL, "** [LSD] **"}, - {KEY_TRACKER_TIER, ""}, + {KEY_TRACKER_TIER, -1}, {KEY_TRACKER_MSG, (isTorrentPrivate ? privateMsg : "")}, {KEY_TRACKER_STATUS, ((BitTorrent::Session::instance()->isLSDEnabled() && !isTorrentPrivate) ? working : disabled)}, {KEY_TRACKER_PEERS_COUNT, 0}, diff --git a/src/webui/www/private/scripts/prop-trackers.js b/src/webui/www/private/scripts/prop-trackers.js index 985449c04..718d170ba 100644 --- a/src/webui/www/private/scripts/prop-trackers.js +++ b/src/webui/www/private/scripts/prop-trackers.js @@ -97,7 +97,7 @@ window.qBittorrent.PropTrackers = (function() { const row = { rowId: tracker.url, - tier: tracker.tier, + tier: (tracker.tier >= 0) ? tracker.tier : "", url: tracker.url, status: status, peers: tracker.num_peers, From 89ca0c537d44e4708d7138fe5fda4891b802b10e Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 10 Oct 2021 01:52:13 +0800 Subject: [PATCH 3/3] Fix filename extension --- .github/{pull_request_template.yml => PULL_REQUEST_TEMPLATE.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{pull_request_template.yml => PULL_REQUEST_TEMPLATE.md} (100%) diff --git a/.github/pull_request_template.yml b/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from .github/pull_request_template.yml rename to .github/PULL_REQUEST_TEMPLATE.md