github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 21:33:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

seconds since epoch

Browse source
This commit is contained in:
tehcneko 2025-08-04 19:43:12 +08:00
commit ccf9d6fc41
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/webui/api/torrentscontroller.cpp
View file

@ -276,9 +276,10 @@ namespace
QJsonArray getTrackers(const BitTorrent::Torrent *const torrent) QJsonArray getTrackers(const BitTorrent::Torrent *const torrent)
{ {
const auto toSeconds = [](const std::chrono::nanoseconds &duration) -> qint64 const auto toSecondsSinceEpoch = [](const std::chrono::nanoseconds &duration) -> qint64
{ {
return std::max<qint64>(0, std::chrono::duration_cast<std::chrono::seconds>(duration).count()); const auto time = std::chrono::system_clock::now() + duration;
return std::chrono::duration_cast<std::chrono::seconds>(time.time_since_epoch()).count();
}; };
const auto now = BitTorrent::AnnounceTimePoint::clock::now(); const auto now = BitTorrent::AnnounceTimePoint::clock::now();
@ -301,8 +302,8 @@ namespace
{KEY_TRACKER_SEEDS_COUNT, endpoint.numSeeds}, {KEY_TRACKER_SEEDS_COUNT, endpoint.numSeeds},
{KEY_TRACKER_LEECHES_COUNT, endpoint.numLeeches}, {KEY_TRACKER_LEECHES_COUNT, endpoint.numLeeches},
{KEY_TRACKER_DOWNLOADED_COUNT, endpoint.numDownloaded}, {KEY_TRACKER_DOWNLOADED_COUNT, endpoint.numDownloaded},
{KEY_TRACKER_NEXT_ANNOUNCE, toSeconds(endpoint.nextAnnounceTime - now)}, {KEY_TRACKER_NEXT_ANNOUNCE, toSecondsSinceEpoch(endpoint.nextAnnounceTime - now)},
{KEY_TRACKER_MIN_ANNOUNCE, toSeconds(endpoint.minAnnounceTime - now)} {KEY_TRACKER_MIN_ANNOUNCE, toSecondsSinceEpoch(endpoint.minAnnounceTime - now)}
}; };
} }
@ -317,8 +318,8 @@ namespace
{KEY_TRACKER_SEEDS_COUNT, tracker.numSeeds}, {KEY_TRACKER_SEEDS_COUNT, tracker.numSeeds},
{KEY_TRACKER_LEECHES_COUNT, tracker.numLeeches}, {KEY_TRACKER_LEECHES_COUNT, tracker.numLeeches},
{KEY_TRACKER_DOWNLOADED_COUNT, tracker.numDownloaded}, {KEY_TRACKER_DOWNLOADED_COUNT, tracker.numDownloaded},
{KEY_TRACKER_NEXT_ANNOUNCE, toSeconds(tracker.nextAnnounceTime - now)}, {KEY_TRACKER_NEXT_ANNOUNCE, toSecondsSinceEpoch(tracker.nextAnnounceTime - now)},
{KEY_TRACKER_MIN_ANNOUNCE, toSeconds(tracker.minAnnounceTime - now)}, {KEY_TRACKER_MIN_ANNOUNCE, toSecondsSinceEpoch(tracker.minAnnounceTime - now)},
{KEY_TRACKER_ENDPOINTS, endpointsList} {KEY_TRACKER_ENDPOINTS, endpointsList}
}; };
} }

3
src/webui/www/private/scripts/dynamicTable.js
View file

@ -2257,7 +2257,8 @@ window.qBittorrent.DynamicTable ??= (() => {
}; };
const friendlyDuration = function(td, row) { const friendlyDuration = function(td, row) {
const duration = window.qBittorrent.Misc.friendlyDuration(this.getRowValue(row) ?? 0, window.qBittorrent.Misc.MAX_ETA); const value = this.getRowValue(row) ?? 0;
const duration = window.qBittorrent.Misc.friendlyDuration(Math.max(value - (new Date() / 1000), 0), window.qBittorrent.Misc.MAX_ETA);
td.textContent = duration; td.textContent = duration;
td.title = duration; td.title = duration;
}; };