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

Calculate eta for seed only torrents using ratio limits

Browse Source
This commit is contained in:
Nick Tiskov 2013-03-01 13:31:45 +04:00
parent 9c7807ded4
commit 34a88c83f0
2 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qtlibtorrent/torrentmodel.cpp
View File

@ -172,7 +172,7 @@ QVariant TorrentModelItem::data(int column, int role) const
return m_torrent.upload_payload_rate(); return m_torrent.upload_payload_rate();
case TR_ETA: { case TR_ETA: {
// XXX: Is this correct? // XXX: Is this correct?
if (m_torrent.is_seed() || m_torrent.is_paused() || m_torrent.is_queued()) return MAX_ETA; if (m_torrent.is_paused() || m_torrent.is_queued()) return MAX_ETA;
return QBtSession::instance()->getETA(m_torrent.hash()); return QBtSession::instance()->getETA(m_torrent.hash());
} }
case TR_RATIO: case TR_RATIO:

65
src/qtlibtorrent/torrentspeedmonitor.cpp
View File

@ -42,15 +42,15 @@ class SpeedSample {
public: public:
SpeedSample() {} SpeedSample() {}
void addSample(int s); void addSample(qint32 speedDL, qint32 speedUL);
qreal average() const; QPair<qreal, qreal> average() const;
void clear(); void clear();
private: private:
static const int max_samples = 30; static const int max_samples = 30;
private: private:
QList<int> m_speedSamples; QList<QPair<qint32, qint32> > m_speedSamples;
}; };
TorrentSpeedMonitor::TorrentSpeedMonitor(QBtSession* session) : TorrentSpeedMonitor::TorrentSpeedMonitor(QBtSession* session) :
@ -76,21 +76,31 @@ void TorrentSpeedMonitor::run()
} while(!m_abort); } while(!m_abort);
} }
void SpeedSample::addSample(int s) void SpeedSample::addSample(qint32 speedDL, qint32 speedUL)
{ {
m_speedSamples << s; m_speedSamples << qMakePair(speedDL, speedUL);
if (m_speedSamples.size() > max_samples) if (m_speedSamples.size() > max_samples)
m_speedSamples.removeFirst(); m_speedSamples.removeFirst();
} }
qreal SpeedSample::average() const QPair<qreal, qreal> SpeedSample::average() const
{ {
if (m_speedSamples.empty()) return 0; if (m_speedSamples.empty())
qlonglong sum = 0; return qMakePair(0., 0.);
foreach (int s, m_speedSamples) {
sum += s; qlonglong sumDL = 0, sumUL =0;
QPair<qint32, qint32> p;
foreach (p, m_speedSamples) {
sumDL += p.first;
sumUL += p.second;
} }
return sum/static_cast<float>(m_speedSamples.size());
qreal numSamples = m_speedSamples.size();
return qMakePair(
(sumDL/numSamples),
(sumUL/numSamples));
} }
void SpeedSample::clear() void SpeedSample::clear()
@ -113,10 +123,31 @@ 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)) return -1; if (h.is_paused() || !m_samples.contains(hash))
const qreal speed_average = m_samples.value(hash).average(); return -1;
if (speed_average == 0) return -1;
return (h.total_wanted() - h.total_done()) / speed_average; const QPair<qreal, qreal> speed_average = m_samples.value(hash).average();
if(h.is_seed()) {
if (speed_average.second == 0)
return -1;
bool _unused;
qreal max_ratio = m_session->getMaxRatioPerTorrent(hash, &_unused);
if (max_ratio < 0)
return -1;
libtorrent::size_type realDL = h.all_time_download();
if (realDL <= 0)
realDL = h.total_wanted();
return (realDL * max_ratio - h.all_time_upload()) / speed_average.second;
} else {
if (speed_average.first == 0)
return -1;
return (h.total_wanted() - h.total_done()) / speed_average.first;
}
} }
void TorrentSpeedMonitor::getSamples() void TorrentSpeedMonitor::getSamples()
@ -130,10 +161,10 @@ void TorrentSpeedMonitor::getSamples()
#if LIBTORRENT_VERSION_MINOR > 15 #if LIBTORRENT_VERSION_MINOR > 15
torrent_status st = it->status(0x0); torrent_status st = it->status(0x0);
if (!st.paused) if (!st.paused)
m_samples[misc::toQString(it->info_hash())].addSample(st.download_payload_rate); m_samples[misc::toQString(it->info_hash())].addSample(st.download_payload_rate, st.upload_payload_rate);
#else #else
if (!it->is_paused()) if (!it->is_paused())
m_samples[misc::toQString(it->info_hash())].addSample(it->status().download_payload_rate); m_samples[misc::toQString(it->info_hash())].addSample(it->status().download_payload_rate, it->status().upload_payload_rate);
#endif #endif
} catch(invalid_handle&) {} } catch(invalid_handle&) {}
} }