mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-28 13:28:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14815 from Chocobo1/activity

Browse source 
Show "last activity" value under all circumstances
This commit is contained in:
Chocobo1 2021-04-21 11:44:44 +08:00 committed by GitHub
commit 68e3bcbcda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/transferlistmodel.cpp
View file

@ -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:

9
src/webui/api/serialize/serialize_torrent.cpp
View file

@ -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()}