d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14351 from Chocobo1/avail

Browse Source 
Show proper string when torrent availability is not available
This commit is contained in:
Mike Tzou 2021-02-08 12:12:22 +08:00 committed by GitHub
commit e6033c952e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/base/bittorrent/torrent.cpp
View File

@ -29,8 +29,6 @@
#include "torrent.h" #include "torrent.h"
#include <type_traits>
#include <QHash> #include <QHash>
namespace BitTorrent namespace BitTorrent
@ -42,13 +40,13 @@ namespace BitTorrent
// Torrent // Torrent
const qreal Torrent::USE_GLOBAL_RATIO = -2.; const qreal Torrent::USE_GLOBAL_RATIO = -2;
const qreal Torrent::NO_RATIO_LIMIT = -1.; const qreal Torrent::NO_RATIO_LIMIT = -1;
const int Torrent::USE_GLOBAL_SEEDING_TIME = -2; const int Torrent::USE_GLOBAL_SEEDING_TIME = -2;
const int Torrent::NO_SEEDING_TIME_LIMIT = -1; 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; const int Torrent::MAX_SEEDING_TIME = 525600;
bool Torrent::isResumed() const bool Torrent::isResumed() const

36
src/gui/transferlistmodel.cpp
View File

@ -239,13 +239,16 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
bool hideValues = false; bool hideValues = false;
if (m_hideZeroValuesMode == HideZeroValuesMode::Always) if (m_hideZeroValuesMode == HideZeroValuesMode::Always)
hideValues = true; hideValues = true;
else if (m_hideZeroValuesMode != HideZeroValuesMode::Never) else if (m_hideZeroValuesMode == HideZeroValuesMode::Paused)
hideValues = (torrent->state() == BitTorrent::TorrentState::PausedDownloading); hideValues = (torrent->state() == BitTorrent::TorrentState::PausedDownloading);
const auto availabilityString = [hideValues](const qreal value) -> QString const auto availabilityString = [hideValues](const qreal value) -> QString
{ {
return (hideValues && (value <= 0)) if (hideValues && (value == 0))
? QString {} : Utils::String::fromDouble(value, 3); return {};
return (value >= 0)
? Utils::String::fromDouble(value, 3)
: tr("N/A");
}; };
const auto unitString = [hideValues](const qint64 value, const bool isSpeedUnit = false) -> QString const auto unitString = [hideValues](const qint64 value, const bool isSpeedUnit = false) -> QString
@ -256,7 +259,7 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
const auto limitString = [hideValues](const qint64 value) -> QString const auto limitString = [hideValues](const qint64 value) -> QString
{ {
if (hideValues && (value == 0)) if (hideValues && (value <= 0))
return {}; return {};
return (value > 0) return (value > 0)
@ -266,9 +269,16 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
const auto amountString = [hideValues](const qint64 value, const qint64 total) -> QString const auto amountString = [hideValues](const qint64 value, const qint64 total) -> QString
{ {
return (hideValues && (value == 0) && (total == 0)) if (hideValues && (value == 0) && (total == 0))
? QString {} return {};
: QString::number(value) + " (" + QString::number(total) + ')'; 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 const auto ratioString = [hideValues](const qreal value) -> QString
@ -282,13 +292,13 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
const auto queuePositionString = [](const qint64 value) -> QString 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 const auto lastActivityString = [hideValues](qint64 value) -> QString
{ {
if (hideValues && ((value < 0) || (value >= MAX_ETA))) if (hideValues && ((value < 0) || (value >= MAX_ETA)))
return QString {}; return {};
// Show '< 1m ago' when elapsed time is 0 // Show '< 1m ago' when elapsed time is 0
if (value == 0) if (value == 0)
@ -299,10 +309,14 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
: Utils::Misc::userFriendlyDuration(value); : 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 (seedingTime <= 0)
{
if (hideValues && (elapsedTime == 0))
return {};
return Utils::Misc::userFriendlyDuration(elapsedTime); return Utils::Misc::userFriendlyDuration(elapsedTime);
}
return tr("%1 (seeded for %2)", "e.g. 4m39s (seeded for 3m10s)") return tr("%1 (seeded for %2)", "e.g. 4m39s (seeded for 3m10s)")
.arg(Utils::Misc::userFriendlyDuration(elapsedTime) .arg(Utils::Misc::userFriendlyDuration(elapsedTime)
@ -351,7 +365,7 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
case TR_UPSPEED: case TR_UPSPEED:
return unitString(torrent->uploadPayloadRate(), true); return unitString(torrent->uploadPayloadRate(), true);
case TR_ETA: case TR_ETA:
return Utils::Misc::userFriendlyDuration(torrent->eta(), MAX_ETA); return etaString(torrent->eta());
case TR_RATIO: case TR_RATIO:
return ratioString(torrent->realRatio()); return ratioString(torrent->realRatio());
case TR_RATIO_LIMIT: case TR_RATIO_LIMIT: