mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

chore: inline short Formatter utils (#3792)

This commit is contained in:
Charles Kerr 2022-09-08 20:17:29 -05:00 committed by GitHub
parent 9280bf3475
commit afa043c788
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
qt/Formatter.cc
View File

@ -91,89 +91,32 @@ QString Formatter::sizeToString(int64_t bytes) const
return Formatter::sizeToString(static_cast<uint64_t>(bytes));
}
QString Formatter::speedToString(Speed const& speed) const
{
return QString::fromStdString(tr_formatter_speed_KBps(speed.getKBps()));
}
QString Formatter::uploadSpeedToString(Speed const& upload_speed) const
{
static QChar constexpr UploadSymbol(0x25B4);
return tr("%1 %2").arg(speedToString(upload_speed)).arg(UploadSymbol);
}
QString Formatter::downloadSpeedToString(Speed const& download_speed) const
{
static QChar constexpr DownloadSymbol(0x25BE);
return tr("%1 %2").arg(speedToString(download_speed)).arg(DownloadSymbol);
}
QString Formatter::percentToString(double x) const
{
return QString::fromStdString(tr_strpercent(x));
}
QString Formatter::ratioToString(double ratio) const
{
return QString::fromStdString(tr_strratio(ratio, "\xE2\x88\x9E"));
}
QString Formatter::timeToString(int seconds) const
{
seconds = std::max(seconds, 0);
auto const days = seconds / 86400;
auto const hours = (seconds % 86400) / 3600;
auto const minutes = (seconds % 3600) / 60;
seconds %= 60;
auto const d = tr("%Ln day(s)", nullptr, days);
auto const h = tr("%Ln hour(s)", nullptr, hours);
auto const m = tr("%Ln minute(s)", nullptr, minutes);
auto const s = tr("%Ln second(s)", nullptr, seconds);
QString str;
if (days != 0)
if (seconds < 60)
{
if (days >= 4 || hours == 0)
{
str = d;
}
else
{
str = tr("%1, %2").arg(d).arg(h);
}
}
else if (hours != 0)
{
if (hours >= 4 || minutes == 0)
{
str = h;
}
else
{
str = tr("%1, %2").arg(h).arg(m);
}
}
else if (minutes != 0)
{
if (minutes >= 4 || seconds == 0)
{
str = m;
}
else
{
str = tr("%1, %2").arg(m).arg(s);
}
}
else
{
str = s;
return tr("%Ln second(s)", nullptr, seconds);
}
return str;
auto const minutes = seconds / 60;
if (minutes < 60)
{
return tr("%Ln minute(s)", nullptr, minutes);
}
auto const hours = minutes / 60;
if (hours < 24)
{
return tr("%Ln hour(s)", nullptr, hours);
}
auto const days = hours / 24;
return tr("%Ln day(s)", nullptr, days);
}
/***

52
qt/Formatter.h
View File

@ -11,7 +11,9 @@
#include <QCoreApplication> // Q_DECLARE_TR_FUNCTIONS
#include <QString>
class Speed;
#include "libtransmission/utils.h"
#include "Speed.h"
class Formatter
{
@ -42,18 +44,44 @@ public:
static constexpr int SizeBase = 1000;
static constexpr int MemBase = 1024;
static Formatter& get();
[[nodiscard]] static Formatter& get();
QString memToString(int64_t bytes) const;
QString sizeToString(int64_t bytes) const;
QString sizeToString(uint64_t bytes) const;
QString speedToString(Speed const& speed) const;
QString percentToString(double x) const;
QString ratioToString(double ratio) const;
QString timeToString(int seconds) const;
QString uploadSpeedToString(Speed const& up) const;
QString downloadSpeedToString(Speed const& down) const;
QString unitStr(Type t, Size s) const;
[[nodiscard]] QString memToString(int64_t bytes) const;
[[nodiscard]] QString sizeToString(int64_t bytes) const;
[[nodiscard]] QString sizeToString(uint64_t bytes) const;
[[nodiscard]] QString timeToString(int seconds) const;
[[nodiscard]] QString unitStr(Type t, Size s) const;
[[nodiscard]] auto speedToString(Speed const& speed) const
{
return QString::fromStdString(tr_formatter_speed_KBps(speed.getKBps()));
}
[[nodiscard]] auto uploadSpeedToString(Speed const& upload_speed) const
{
static auto constexpr UploadSymbol = QChar{ 0x25B4 };
return tr("%1 %2").arg(speedToString(upload_speed)).arg(UploadSymbol);
}
[[nodiscard]] auto downloadSpeedToString(Speed const& download_speed) const
{
static auto constexpr DownloadSymbol = QChar{ 0x25BE };
return tr("%1 %2").arg(speedToString(download_speed)).arg(DownloadSymbol);
}
[[nodiscard]] auto percentToString(double x) const
{
return QString::fromStdString(tr_strpercent(x));
}
[[nodiscard]] auto ratioToString(double ratio) const
{
static auto constexpr InfinitySymbol = "\xE2\x88\x9E";
return QString::fromStdString(tr_strratio(ratio, InfinitySymbol));
}
protected:
Formatter();