From 6864e13e6f0817567d9441028458f80d374c2afc Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 19 Apr 2021 11:24:07 +0800 Subject: [PATCH] Show "last activity" value under all circumstances --- src/gui/transferlistmodel.cpp | 4 ++-- src/webui/api/serialize/serialize_torrent.cpp | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index b2f40690f..debe04e7b 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -403,7 +403,7 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons case TR_SEEN_COMPLETE_DATE: return QLocale().toString(torrent->lastSeenComplete().toLocalTime(), QLocale::ShortFormat); case TR_LAST_ACTIVITY: - return lastActivityString((torrent->isPaused() || torrent->isChecking()) ? -1 : torrent->timeSinceActivity()); + return lastActivityString(torrent->timeSinceActivity()); case TR_AVAILABILITY: return availabilityString(torrent->distributedCopies()); case TR_TOTAL_SIZE: @@ -474,7 +474,7 @@ QVariant TransferListModel::internalValue(const BitTorrent::Torrent *torrent, co case TR_SEEN_COMPLETE_DATE: return torrent->lastSeenComplete(); case TR_LAST_ACTIVITY: - return (torrent->isPaused() || torrent->isChecking()) ? -1 : torrent->timeSinceActivity(); + return torrent->timeSinceActivity(); case TR_AVAILABILITY: return torrent->distributedCopies(); case TR_TOTAL_SIZE: diff --git a/src/webui/api/serialize/serialize_torrent.cpp b/src/webui/api/serialize/serialize_torrent.cpp index 9b4479429..bd356050e 100644 --- a/src/webui/api/serialize/serialize_torrent.cpp +++ b/src/webui/api/serialize/serialize_torrent.cpp @@ -95,13 +95,6 @@ QVariantMap serialize(const BitTorrent::Torrent &torrent) return (ratio > BitTorrent::Torrent::MAX_RATIO) ? -1 : ratio; }; - const auto adjustLastActivity = [&torrent](const qlonglong value) -> qlonglong - { - return (torrent.isPaused() || torrent.isChecking()) - ? 0 - : (QDateTime::currentDateTime().toSecsSinceEpoch() - value); - }; - return { // TODO: Add fields for real SHA1 and SHA256 hashes {KEY_TORRENT_ID, QString(torrent.id().toString())}, @@ -149,7 +142,7 @@ QVariantMap serialize(const BitTorrent::Torrent &torrent) {KEY_TORRENT_AUTO_TORRENT_MANAGEMENT, torrent.isAutoTMMEnabled()}, {KEY_TORRENT_TIME_ACTIVE, torrent.activeTime()}, {KEY_TORRENT_SEEDING_TIME, torrent.seedingTime()}, - {KEY_TORRENT_LAST_ACTIVITY_TIME, adjustLastActivity(torrent.timeSinceActivity())}, + {KEY_TORRENT_LAST_ACTIVITY_TIME, (QDateTime::currentDateTime().toSecsSinceEpoch() - torrent.timeSinceActivity())}, {KEY_TORRENT_AVAILABILITY, torrent.distributedCopies()}, {KEY_TORRENT_TOTAL_SIZE, torrent.totalSize()}