d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Cosmetic fix for eta sorting in torrent list: 'infinity' must always come last

Browse Source
This commit is contained in:
Nick Tiskov 2013-03-01 14:41:46 +04:00
parent 34a88c83f0
commit 0c0c7459f1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qtlibtorrent/torrentspeedmonitor.cpp
View File

@ -124,18 +124,18 @@ qlonglong TorrentSpeedMonitor::getETA(const QString &hash) const
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
QTorrentHandle h = m_session->getTorrentHandle(hash); QTorrentHandle h = m_session->getTorrentHandle(hash);
if (h.is_paused() || !m_samples.contains(hash)) if (h.is_paused() || !m_samples.contains(hash))
return -1; return MAX_ETA;
const QPair<qreal, qreal> speed_average = m_samples.value(hash).average(); const QPair<qreal, qreal> speed_average = m_samples.value(hash).average();
if(h.is_seed()) { if(h.is_seed()) {
if (speed_average.second == 0) if (speed_average.second == 0)
return -1; return MAX_ETA;
bool _unused; bool _unused;
qreal max_ratio = m_session->getMaxRatioPerTorrent(hash, &_unused); qreal max_ratio = m_session->getMaxRatioPerTorrent(hash, &_unused);
if (max_ratio < 0) if (max_ratio < 0)
return -1; return MAX_ETA;
libtorrent::size_type realDL = h.all_time_download(); libtorrent::size_type realDL = h.all_time_download();
if (realDL <= 0) if (realDL <= 0)
@ -144,7 +144,7 @@ qlonglong TorrentSpeedMonitor::getETA(const QString &hash) const
return (realDL * max_ratio - h.all_time_upload()) / speed_average.second; return (realDL * max_ratio - h.all_time_upload()) / speed_average.second;
} else { } else {
if (speed_average.first == 0) if (speed_average.first == 0)
return -1; return MAX_ETA;
return (h.total_wanted() - h.total_done()) / speed_average.first; return (h.total_wanted() - h.total_done()) / speed_average.first;
} }