d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-25 22:14:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15549 from Chocobo1/api

Browse Source 
WebAPI: Use specific number to represent non-existing values
This commit is contained in:
Chocobo1 2021-10-11 12:38:38 +08:00 committed by GitHub
commit 70a11a12b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.github/pull_request_template.yml → .github/PULL_REQUEST_TEMPLATE.md vendored
View File

4
src/gui/transferlistsortmodel.cpp
View File

@ -51,10 +51,8 @@ namespace
const bool isLeftValid = left.isValid(); const bool isLeftValid = left.isValid();
const bool isRightValid = right.isValid(); const bool isRightValid = right.isValid();
if (isLeftValid && isRightValid) if (isLeftValid == isRightValid)
return threeWayCompare(left, right); return threeWayCompare(left, right);
if (!isLeftValid && !isRightValid)
return 0;
return isLeftValid ? -1 : 1; return isLeftValid ? -1 : 1;
} }

6
src/webui/api/torrentscontroller.cpp
View File

@ -176,7 +176,7 @@ namespace
const QJsonObject dht const QJsonObject dht
{ {
{KEY_TRACKER_URL, "** [DHT] **"}, {KEY_TRACKER_URL, "** [DHT] **"},
{KEY_TRACKER_TIER, ""}, {KEY_TRACKER_TIER, -1},
{KEY_TRACKER_MSG, (isTorrentPrivate ? privateMsg : "")}, {KEY_TRACKER_MSG, (isTorrentPrivate ? privateMsg : "")},
{KEY_TRACKER_STATUS, ((BitTorrent::Session::instance()->isDHTEnabled() && !isTorrentPrivate) ? working : disabled)}, {KEY_TRACKER_STATUS, ((BitTorrent::Session::instance()->isDHTEnabled() && !isTorrentPrivate) ? working : disabled)},
{KEY_TRACKER_PEERS_COUNT, 0}, {KEY_TRACKER_PEERS_COUNT, 0},
@ -188,7 +188,7 @@ namespace
const QJsonObject pex const QJsonObject pex
{ {
{KEY_TRACKER_URL, "** [PeX] **"}, {KEY_TRACKER_URL, "** [PeX] **"},
{KEY_TRACKER_TIER, ""}, {KEY_TRACKER_TIER, -1},
{KEY_TRACKER_MSG, (isTorrentPrivate ? privateMsg : "")}, {KEY_TRACKER_MSG, (isTorrentPrivate ? privateMsg : "")},
{KEY_TRACKER_STATUS, ((BitTorrent::Session::instance()->isPeXEnabled() && !isTorrentPrivate) ? working : disabled)}, {KEY_TRACKER_STATUS, ((BitTorrent::Session::instance()->isPeXEnabled() && !isTorrentPrivate) ? working : disabled)},
{KEY_TRACKER_PEERS_COUNT, 0}, {KEY_TRACKER_PEERS_COUNT, 0},
@ -200,7 +200,7 @@ namespace
const QJsonObject lsd const QJsonObject lsd
{ {
{KEY_TRACKER_URL, "** [LSD] **"}, {KEY_TRACKER_URL, "** [LSD] **"},
{KEY_TRACKER_TIER, ""}, {KEY_TRACKER_TIER, -1},
{KEY_TRACKER_MSG, (isTorrentPrivate ? privateMsg : "")}, {KEY_TRACKER_MSG, (isTorrentPrivate ? privateMsg : "")},
{KEY_TRACKER_STATUS, ((BitTorrent::Session::instance()->isLSDEnabled() && !isTorrentPrivate) ? working : disabled)}, {KEY_TRACKER_STATUS, ((BitTorrent::Session::instance()->isLSDEnabled() && !isTorrentPrivate) ? working : disabled)},
{KEY_TRACKER_PEERS_COUNT, 0}, {KEY_TRACKER_PEERS_COUNT, 0},

2
src/webui/www/private/scripts/prop-trackers.js
View File

@ -97,7 +97,7 @@ window.qBittorrent.PropTrackers = (function() {
const row = { const row = {
rowId: tracker.url, rowId: tracker.url,
tier: tracker.tier, tier: (tracker.tier >= 0) ? tracker.tier : "",
url: tracker.url, url: tracker.url,
status: status, status: status,
peers: tracker.num_peers, peers: tracker.num_peers,