Browse Source

Allow save resume interval to be disabled

Also raise the allowable upper limit
adaptive-webui-19844
Chocobo1 6 years ago
parent
commit
d61435e4bf
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 29
      src/base/bittorrent/session.cpp
  2. 18
      src/gui/advancedsettings.cpp
  3. 1
      src/gui/advancedsettings.h

29
src/base/bittorrent/session.cpp

@ -510,11 +510,6 @@ Session::Session(QObject *parent)
connect(m_refreshTimer, &QTimer::timeout, this, &Session::refresh); connect(m_refreshTimer, &QTimer::timeout, this, &Session::refresh);
m_refreshTimer->start(); m_refreshTimer->start();
// Regular saving of fastresume data
m_resumeDataTimer = new QTimer(this);
m_resumeDataTimer->setInterval(saveResumeDataInterval() * 60 * 1000);
connect(m_resumeDataTimer, &QTimer::timeout, this, [this]() { generateResumeData(); });
m_statistics = new Statistics(this); m_statistics = new Statistics(this);
updateSeedingLimitTimer(); updateSeedingLimitTimer();
@ -536,7 +531,15 @@ Session::Session(QObject *parent)
m_resumeDataSavingManager->moveToThread(m_ioThread); m_resumeDataSavingManager->moveToThread(m_ioThread);
connect(m_ioThread, &QThread::finished, m_resumeDataSavingManager, &QObject::deleteLater); connect(m_ioThread, &QThread::finished, m_resumeDataSavingManager, &QObject::deleteLater);
m_ioThread->start(); m_ioThread->start();
m_resumeDataTimer->start();
// Regular saving of fastresume data
m_resumeDataTimer = new QTimer(this);
connect(m_resumeDataTimer, &QTimer::timeout, this, [this]() { generateResumeData(); });
const uint saveInterval = saveResumeDataInterval();
if (saveInterval > 0) {
m_resumeDataTimer->setInterval(saveInterval * 60 * 1000);
m_resumeDataTimer->start();
}
// initialize PortForwarder instance // initialize PortForwarder instance
Net::PortForwarder::initInstance(m_nativeSession); Net::PortForwarder::initInstance(m_nativeSession);
@ -2704,11 +2707,19 @@ uint Session::saveResumeDataInterval() const
return m_saveResumeDataInterval; return m_saveResumeDataInterval;
} }
void Session::setSaveResumeDataInterval(uint value) void Session::setSaveResumeDataInterval(const uint value)
{ {
if (value != saveResumeDataInterval()) { if (value == m_saveResumeDataInterval)
m_saveResumeDataInterval = value; return;
m_saveResumeDataInterval = value;
if (value > 0) {
m_resumeDataTimer->setInterval(value * 60 * 1000); m_resumeDataTimer->setInterval(value * 60 * 1000);
m_resumeDataTimer->start();
}
else {
m_resumeDataTimer->stop();
} }
} }

18
src/gui/advancedsettings.cpp

@ -28,6 +28,8 @@
#include "advancedsettings.h" #include "advancedsettings.h"
#include <limits>
#include <QFont> #include <QFont>
#include <QHeaderView> #include <QHeaderView>
#include <QHostAddress> #include <QHostAddress>
@ -129,6 +131,8 @@ AdvancedSettings::AdvancedSettings(QWidget *parent)
, this, &AdvancedSettings::updateCacheSpinSuffix); , this, &AdvancedSettings::updateCacheSpinSuffix);
connect(&comboBoxInterface, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged) connect(&comboBoxInterface, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged)
, this, &AdvancedSettings::updateInterfaceAddressCombo); , this, &AdvancedSettings::updateInterfaceAddressCombo);
connect(&spinBoxSaveResumeDataInterval, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged)
, this, &AdvancedSettings::updateSaveResumeDataIntervalSuffix);
// Load settings // Load settings
loadAdvancedSettings(); loadAdvancedSettings();
resizeColumnToContents(0); resizeColumnToContents(0);
@ -241,6 +245,14 @@ void AdvancedSettings::updateCacheSpinSuffix(int value)
spinBoxCache.setSuffix(tr(" MiB")); spinBoxCache.setSuffix(tr(" MiB"));
} }
void AdvancedSettings::updateSaveResumeDataIntervalSuffix(const int value)
{
if (value > 0)
spinBoxSaveResumeDataInterval.setSuffix(tr(" min", " minutes"));
else
spinBoxSaveResumeDataInterval.setSuffix(tr(" (disabled)"));
}
void AdvancedSettings::updateInterfaceAddressCombo() void AdvancedSettings::updateInterfaceAddressCombo()
{ {
// Try to get the currently selected interface name // Try to get the currently selected interface name
@ -346,10 +358,10 @@ void AdvancedSettings::loadAdvancedSettings()
spinBoxSendBufferWatermarkFactor.setValue(session->sendBufferWatermarkFactor()); spinBoxSendBufferWatermarkFactor.setValue(session->sendBufferWatermarkFactor());
addRow(SEND_BUF_WATERMARK_FACTOR, tr("Send buffer watermark factor"), &spinBoxSendBufferWatermarkFactor); addRow(SEND_BUF_WATERMARK_FACTOR, tr("Send buffer watermark factor"), &spinBoxSendBufferWatermarkFactor);
// Save resume data interval // Save resume data interval
spinBoxSaveResumeDataInterval.setMinimum(1); spinBoxSaveResumeDataInterval.setMinimum(0);
spinBoxSaveResumeDataInterval.setMaximum(1440); spinBoxSaveResumeDataInterval.setMaximum(std::numeric_limits<int>::max());
spinBoxSaveResumeDataInterval.setValue(session->saveResumeDataInterval()); spinBoxSaveResumeDataInterval.setValue(session->saveResumeDataInterval());
spinBoxSaveResumeDataInterval.setSuffix(tr(" m", " minutes")); updateSaveResumeDataIntervalSuffix(spinBoxSaveResumeDataInterval.value());
addRow(SAVE_RESUME_DATA_INTERVAL, tr("Save resume data interval", "How often the fastresume file is saved."), &spinBoxSaveResumeDataInterval); addRow(SAVE_RESUME_DATA_INTERVAL, tr("Save resume data interval", "How often the fastresume file is saved."), &spinBoxSaveResumeDataInterval);
// Outgoing port Min // Outgoing port Min
spinBoxOutgoingPortsMin.setMinimum(0); spinBoxOutgoingPortsMin.setMinimum(0);

1
src/gui/advancedsettings.h

@ -51,6 +51,7 @@ signals:
private slots: private slots:
void updateCacheSpinSuffix(int value); void updateCacheSpinSuffix(int value);
void updateSaveResumeDataIntervalSuffix(int value);
void updateInterfaceAddressCombo(); void updateInterfaceAddressCombo();
private: private:

Loading…
Cancel
Save