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

Merge 1974d62c7a into 6c1cee5f79

This commit is contained in:
Cœur 2024-05-08 02:21:59 +00:00 committed by GitHub
parent 6c1cee5f79 1974d62c7a
commit ddca9fd9fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libtransmission/torrent.cc
View File

@ -446,7 +446,7 @@ void tr_torrent::stop_if_seed_limit_reached()
session->onRatioLimitHit(this);
}
/* if we're seeding and reach our inactivity limit, stop the torrent */
else if (auto const secs_left = idle_seconds_left(tr_time()); secs_left && *secs_left == 0U)
else if (auto const secs_left = idle_seconds_left(tr_time()); secs_left && *secs_left <= 0U)
{
tr_logAddInfoTor(this, _("Seeding idle limit reached; pausing torrent"));
@ -1281,7 +1281,7 @@ bool tr_torrentCanManualUpdate(tr_torrent const* tor)
tr_stat tr_torrent::stats() const
{
static auto constexpr IsStalled = [](tr_torrent const* const tor, std::optional<size_t> idle_secs)
static auto constexpr IsStalled = [](tr_torrent const* const tor, std::optional<time_t> idle_secs)
{
return tor->session->queueStalledEnabled() && idle_secs > tor->session->queueStalledMinutes() * 60U;
};
@ -1299,7 +1299,7 @@ tr_stat tr_torrent::stats() const
stats.activity = activity;
stats.error = this->error().error_type();
stats.queuePosition = queue_position();
stats.idleSecs = idle_seconds ? static_cast<time_t>(*idle_seconds) : -1;
stats.idleSecs = idle_seconds ? *idle_seconds : -1;
stats.isStalled = IsStalled(this, idle_seconds);
stats.errorString = this->error().errmsg().c_str();

8
libtransmission/torrent.h
View File

@ -818,7 +818,7 @@ struct tr_torrent
return idle_limit_minutes_;
}
[[nodiscard]] constexpr std::optional<size_t> idle_seconds(time_t now) const noexcept
[[nodiscard]] constexpr std::optional<time_t> idle_seconds(time_t now) const noexcept
{
auto const activity = this->activity();
@ -827,7 +827,7 @@ struct tr_torrent
if (auto const latest = std::max(date_started_, date_active_); latest != 0)
{
TR_ASSERT(now >= latest);
return now - latest;
return std::max(now - latest, time_t{ 0 });
}
}
@ -1126,7 +1126,7 @@ private:
return {};
}
[[nodiscard]] constexpr std::optional<size_t> idle_seconds_left(time_t now) const noexcept
[[nodiscard]] constexpr std::optional<time_t> idle_seconds_left(time_t now) const noexcept
{
auto const idle_limit_minutes = effective_idle_limit_minutes();
if (!idle_limit_minutes)
@ -1140,7 +1140,7 @@ private:
return {};
}
auto const idle_limit_seconds = size_t{ *idle_limit_minutes } * 60U;
auto const idle_limit_seconds = time_t{ *idle_limit_minutes } * 60U;
return idle_limit_seconds > *idle_seconds ? idle_limit_seconds - *idle_seconds : 0U;
}