From e4f7d607e1e28be7ad0bc4699a9264143f696bb8 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 6 Feb 2021 11:09:17 +0800 Subject: [PATCH 1/5] Show proper string when torrent availability is not available --- src/gui/transferlistmodel.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index b665634cf..1c6508412 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -244,8 +244,11 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons const auto availabilityString = [hideValues](const qreal value) -> QString { - return (hideValues && (value <= 0)) - ? QString {} : Utils::String::fromDouble(value, 3); + if (hideValues && (value == 0)) + return {}; + return (value >= 0) + ? Utils::String::fromDouble(value, 3) + : tr("N/A"); }; const auto unitString = [hideValues](const qint64 value, const bool isSpeedUnit = false) -> QString From 6a45919b259fc91a16927bec15b4f5eea8992fe1 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 6 Feb 2021 11:25:17 +0800 Subject: [PATCH 2/5] Clean up coding style --- src/base/bittorrent/torrent.cpp | 8 +++----- src/gui/transferlistmodel.cpp | 12 ++++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/base/bittorrent/torrent.cpp b/src/base/bittorrent/torrent.cpp index e0dcb9ca0..d7e52ff8d 100644 --- a/src/base/bittorrent/torrent.cpp +++ b/src/base/bittorrent/torrent.cpp @@ -29,8 +29,6 @@ #include "torrent.h" -#include - #include namespace BitTorrent @@ -42,13 +40,13 @@ namespace BitTorrent // Torrent - const qreal Torrent::USE_GLOBAL_RATIO = -2.; - const qreal Torrent::NO_RATIO_LIMIT = -1.; + const qreal Torrent::USE_GLOBAL_RATIO = -2; + const qreal Torrent::NO_RATIO_LIMIT = -1; const int Torrent::USE_GLOBAL_SEEDING_TIME = -2; const int Torrent::NO_SEEDING_TIME_LIMIT = -1; - const qreal Torrent::MAX_RATIO = 9999.; + const qreal Torrent::MAX_RATIO = 9999; const int Torrent::MAX_SEEDING_TIME = 525600; bool Torrent::isResumed() const diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index 1c6508412..5f8b6a3f0 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -239,7 +239,7 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons bool hideValues = false; if (m_hideZeroValuesMode == HideZeroValuesMode::Always) hideValues = true; - else if (m_hideZeroValuesMode != HideZeroValuesMode::Never) + else if (m_hideZeroValuesMode == HideZeroValuesMode::Paused) hideValues = (torrent->state() == BitTorrent::TorrentState::PausedDownloading); const auto availabilityString = [hideValues](const qreal value) -> QString @@ -269,9 +269,9 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons const auto amountString = [hideValues](const qint64 value, const qint64 total) -> QString { - return (hideValues && (value == 0) && (total == 0)) - ? QString {} - : QString::number(value) + " (" + QString::number(total) + ')'; + if (hideValues && (value == 0) && (total == 0)) + return {}; + return QString::fromLatin1("%1 (%2)").arg(QString::number(value), QString::number(total)); }; const auto ratioString = [hideValues](const qreal value) -> QString @@ -285,13 +285,13 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons const auto queuePositionString = [](const qint64 value) -> QString { - return (value > 0) ? QString::number(value) : "*"; + return (value > 0) ? QString::number(value) : QLatin1String("*"); }; const auto lastActivityString = [hideValues](qint64 value) -> QString { if (hideValues && ((value < 0) || (value >= MAX_ETA))) - return QString {}; + return {}; // Show '< 1m ago' when elapsed time is 0 if (value == 0) From afa2fc0ba9df098065cbe93dc3b896a724efc13b Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 6 Feb 2021 11:45:35 +0800 Subject: [PATCH 3/5] Apply "Hide zero values" to "Time Active" column --- src/gui/transferlistmodel.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index 5f8b6a3f0..7dcccd1fe 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -302,10 +302,14 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons : Utils::Misc::userFriendlyDuration(value); }; - const auto timeElapsedString = [](const qint64 elapsedTime, const qint64 seedingTime) -> QString + const auto timeElapsedString = [hideValues](const qint64 elapsedTime, const qint64 seedingTime) -> QString { if (seedingTime <= 0) + { + if (hideValues && (elapsedTime == 0)) + return {}; return Utils::Misc::userFriendlyDuration(elapsedTime); + } return tr("%1 (seeded for %2)", "e.g. 4m39s (seeded for 3m10s)") .arg(Utils::Misc::userFriendlyDuration(elapsedTime) From 2aeb8b93904d59c849ffb8754393fb56ba435530 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 6 Feb 2021 11:49:04 +0800 Subject: [PATCH 4/5] Apply "Hide infinity values" to "Down/Up Limit" columns --- src/gui/transferlistmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index 7dcccd1fe..ec1e6c3ff 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -259,7 +259,7 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons const auto limitString = [hideValues](const qint64 value) -> QString { - if (hideValues && (value == 0)) + if (hideValues && (value <= 0)) return {}; return (value > 0) From 0d550c9bce8af377c25427a0803dcdd4b43bd59b Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 6 Feb 2021 11:59:37 +0800 Subject: [PATCH 5/5] Apply "Hide infinity values" to ETA column --- src/gui/transferlistmodel.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index ec1e6c3ff..716d0d34e 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -274,6 +274,13 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons return QString::fromLatin1("%1 (%2)").arg(QString::number(value), QString::number(total)); }; + const auto etaString = [hideValues](const qlonglong value) -> QString + { + if (hideValues && (value >= MAX_ETA)) + return {}; + return Utils::Misc::userFriendlyDuration(value, MAX_ETA); + }; + const auto ratioString = [hideValues](const qreal value) -> QString { if (hideValues && (value <= 0)) @@ -358,7 +365,7 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons case TR_UPSPEED: return unitString(torrent->uploadPayloadRate(), true); case TR_ETA: - return Utils::Misc::userFriendlyDuration(torrent->eta(), MAX_ETA); + return etaString(torrent->eta()); case TR_RATIO: return ratioString(torrent->realRatio()); case TR_RATIO_LIMIT: