mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 18:56:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12021 from Chocobo1/trackerentry

Browse source 
Simplify TrackerEntry::status() logic
This commit is contained in:
Mike Tzou 2020-02-18 02:22:05 +08:00 committed by GitHub
commit bf6a88b3d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/base/bittorrent/trackerentry.cpp
View file

@ -52,24 +52,6 @@ QString TrackerEntry::url() const
return QString::fromStdString(nativeEntry().url); return QString::fromStdString(nativeEntry().url);
} }
bool TrackerEntry::isWorking() const
{
// lt::announce_entry::is_working() returns
// true when the tracker hasn't been tried yet.
#if (LIBTORRENT_VERSION_NUM < 10200)
return nativeEntry().verified && nativeEntry().is_working();
#else
if (!nativeEntry().verified)
return false;
const auto &endpoints = nativeEntry().endpoints;
return std::any_of(endpoints.begin(), endpoints.end()
, [](const lt::announce_endpoint &endpoint)
{
return endpoint.is_working();
});
#endif
}
int TrackerEntry::tier() const int TrackerEntry::tier() const
{ {
return nativeEntry().tier; return nativeEntry().tier;
@ -77,35 +59,36 @@ int TrackerEntry::tier() const
TrackerEntry::Status TrackerEntry::status() const TrackerEntry::Status TrackerEntry::status() const
{ {
if (isWorking())
return Working;
#if (LIBTORRENT_VERSION_NUM < 10200) #if (LIBTORRENT_VERSION_NUM < 10200)
if ((nativeEntry().fails == 0) && nativeEntry().updating) if (nativeEntry().fails > 0)
return NotWorking;
if (nativeEntry().updating)
return Updating; return Updating;
if (nativeEntry().fails == 0)
return NotContacted;
#else #else
const auto &endpoints = nativeEntry().endpoints; const auto &endpoints = nativeEntry().endpoints;
const bool allFailed = std::all_of(endpoints.begin(), endpoints.end()
const bool allFailed = !endpoints.empty() && std::all_of(endpoints.begin(), endpoints.end()
, [](const lt::announce_endpoint &endpoint) , [](const lt::announce_endpoint &endpoint)
{ {
return (endpoint.fails > 0); return (endpoint.fails > 0);
}); });
const bool updating = std::any_of(endpoints.begin(), endpoints.end() if (allFailed)
return NotWorking;
const bool isUpdating = std::any_of(endpoints.begin(), endpoints.end()
, [](const lt::announce_endpoint &endpoint) , [](const lt::announce_endpoint &endpoint)
{ {
return endpoint.updating; return endpoint.updating;
}); });
if (isUpdating)
if (!allFailed && updating)
return Updating; return Updating;
if (!allFailed)
return NotContacted;
#endif #endif
return NotWorking; if (!nativeEntry().verified)
return NotContacted;
return Working;
} }
void TrackerEntry::setTier(const int value) void TrackerEntry::setTier(const int value)

1
src/base/bittorrent/trackerentry.h
View file

@ -55,7 +55,6 @@ namespace BitTorrent
TrackerEntry &operator=(const TrackerEntry &other) = default; TrackerEntry &operator=(const TrackerEntry &other) = default;
QString url() const; QString url() const;
bool isWorking() const;
Status status() const; Status status() const;
int tier() const; int tier() const;