mirror of
https://github.com/qbittorrent/qBittorrent
synced 2025-08-20 21:33:27 -07:00
Revise Statistics class
This commit is contained in:
parent
8114c11d58
commit
0d46a108b8
2 changed files with 30 additions and 25 deletions
|
@ -28,30 +28,34 @@
|
||||||
|
|
||||||
#include "statistics.h"
|
#include "statistics.h"
|
||||||
|
|
||||||
#include <QDateTime>
|
#include <chrono>
|
||||||
|
|
||||||
|
#include <QTimer>
|
||||||
|
|
||||||
#include "base/global.h"
|
#include "base/global.h"
|
||||||
#include "base/bittorrent/session.h"
|
#include "base/bittorrent/session.h"
|
||||||
#include "base/bittorrent/sessionstatus.h"
|
#include "base/bittorrent/sessionstatus.h"
|
||||||
#include "base/profile.h"
|
#include "base/profile.h"
|
||||||
|
|
||||||
const qint64 SAVE_INTERVAL = 15 * 60; // seconds
|
using namespace std::chrono_literals;
|
||||||
|
|
||||||
using namespace BitTorrent;
|
using namespace BitTorrent;
|
||||||
|
|
||||||
|
const qint64 SAVE_INTERVAL = std::chrono::milliseconds(15min).count();
|
||||||
|
|
||||||
Statistics::Statistics(Session *session)
|
Statistics::Statistics(Session *session)
|
||||||
: QObject(session)
|
: QObject(session)
|
||||||
, m_session(session)
|
, m_session(session)
|
||||||
{
|
{
|
||||||
load();
|
load();
|
||||||
connect(&m_timer, &QTimer::timeout, this, &Statistics::gather);
|
m_lastUpdateTimer.start();
|
||||||
m_timer.start(60 * 1000);
|
|
||||||
|
auto *timer = new QTimer(this);
|
||||||
|
connect(timer, &QTimer::timeout, this, &Statistics::gather);
|
||||||
|
timer->start(60s);
|
||||||
}
|
}
|
||||||
|
|
||||||
Statistics::~Statistics()
|
Statistics::~Statistics()
|
||||||
{
|
{
|
||||||
if (m_dirty)
|
|
||||||
m_lastWrite = 0;
|
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,23 +83,25 @@ void Statistics::gather()
|
||||||
m_dirty = true;
|
m_dirty = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (m_lastUpdateTimer.hasExpired(SAVE_INTERVAL))
|
||||||
save();
|
save();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Statistics::save() const
|
void Statistics::save() const
|
||||||
{
|
{
|
||||||
const qint64 now = QDateTime::currentSecsSinceEpoch();
|
if (!m_dirty)
|
||||||
|
|
||||||
if (!m_dirty || ((now - m_lastWrite) < SAVE_INTERVAL))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
SettingsPtr s = Profile::instance()->applicationSettings(u"qBittorrent-data"_qs);
|
const QVariantHash stats =
|
||||||
QVariantHash v;
|
{
|
||||||
v.insert(u"AlltimeDL"_qs, (m_alltimeDL + m_sessionDL));
|
{u"AlltimeDL"_qs, (m_alltimeDL + m_sessionDL)},
|
||||||
v.insert(u"AlltimeUL"_qs, (m_alltimeUL + m_sessionUL));
|
{u"AlltimeUL"_qs, (m_alltimeUL + m_sessionUL)}
|
||||||
s->setValue(u"Stats/AllStats"_qs, v);
|
};
|
||||||
|
SettingsPtr settings = Profile::instance()->applicationSettings(u"qBittorrent-data"_qs);
|
||||||
|
settings->setValue(u"Stats/AllStats"_qs, stats);
|
||||||
|
|
||||||
|
m_lastUpdateTimer.start();
|
||||||
m_dirty = false;
|
m_dirty = false;
|
||||||
m_lastWrite = now;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Statistics::load()
|
void Statistics::load()
|
||||||
|
@ -103,6 +109,6 @@ void Statistics::load()
|
||||||
const SettingsPtr s = Profile::instance()->applicationSettings(u"qBittorrent-data"_qs);
|
const SettingsPtr s = Profile::instance()->applicationSettings(u"qBittorrent-data"_qs);
|
||||||
const QVariantHash v = s->value(u"Stats/AllStats"_qs).toHash();
|
const QVariantHash v = s->value(u"Stats/AllStats"_qs).toHash();
|
||||||
|
|
||||||
m_alltimeDL = v[u"AlltimeDL"_qs].toULongLong();
|
m_alltimeDL = v[u"AlltimeDL"_qs].toLongLong();
|
||||||
m_alltimeUL = v[u"AlltimeUL"_qs].toULongLong();
|
m_alltimeUL = v[u"AlltimeUL"_qs].toLongLong();
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,8 +28,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <QElapsedTimer>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QTimer>
|
|
||||||
|
|
||||||
namespace BitTorrent
|
namespace BitTorrent
|
||||||
{
|
{
|
||||||
|
@ -55,13 +55,12 @@ private:
|
||||||
void save() const;
|
void save() const;
|
||||||
void load();
|
void load();
|
||||||
|
|
||||||
BitTorrent::Session *m_session;
|
BitTorrent::Session *m_session = nullptr;
|
||||||
|
mutable QElapsedTimer m_lastUpdateTimer;
|
||||||
|
mutable bool m_dirty = false;
|
||||||
|
|
||||||
qint64 m_alltimeUL = 0;
|
qint64 m_alltimeUL = 0;
|
||||||
qint64 m_alltimeDL = 0;
|
qint64 m_alltimeDL = 0;
|
||||||
qint64 m_sessionUL = 0;
|
qint64 m_sessionUL = 0;
|
||||||
qint64 m_sessionDL = 0;
|
qint64 m_sessionDL = 0;
|
||||||
mutable qint64 m_lastWrite = 0;
|
|
||||||
mutable bool m_dirty = false;
|
|
||||||
|
|
||||||
QTimer m_timer;
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue