Browse Source

Add suggest_mode knob

adaptive-webui-19844
Chocobo1 7 years ago
parent
commit
55a1628a5e
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 16
      src/base/bittorrent/session.cpp
  2. 3
      src/base/bittorrent/session.h
  3. 6
      src/gui/advancedsettings.cpp
  4. 3
      src/gui/advancedsettings.h

16
src/base/bittorrent/session.cpp

@ -264,6 +264,7 @@ Session::Session(QObject *parent)
, m_diskCacheTTL(BITTORRENT_SESSION_KEY("DiskCacheTTL"), 60) , m_diskCacheTTL(BITTORRENT_SESSION_KEY("DiskCacheTTL"), 60)
, m_useOSCache(BITTORRENT_SESSION_KEY("UseOSCache"), true) , m_useOSCache(BITTORRENT_SESSION_KEY("UseOSCache"), true)
, m_guidedReadCacheEnabled(BITTORRENT_SESSION_KEY("GuidedReadCache"), true) , m_guidedReadCacheEnabled(BITTORRENT_SESSION_KEY("GuidedReadCache"), true)
, m_isSuggestMode(BITTORRENT_SESSION_KEY("SuggestMode"), false)
, m_isAnonymousModeEnabled(BITTORRENT_SESSION_KEY("AnonymousModeEnabled"), false) , m_isAnonymousModeEnabled(BITTORRENT_SESSION_KEY("AnonymousModeEnabled"), false)
, m_isQueueingEnabled(BITTORRENT_SESSION_KEY("QueueingSystemEnabled"), true) , m_isQueueingEnabled(BITTORRENT_SESSION_KEY("QueueingSystemEnabled"), true)
, m_maxActiveDownloads(BITTORRENT_SESSION_KEY("MaxActiveDownloads"), 3, lowerLimited(-1)) , m_maxActiveDownloads(BITTORRENT_SESSION_KEY("MaxActiveDownloads"), 3, lowerLimited(-1))
@ -1260,6 +1261,7 @@ void Session::configure(libtorrent::settings_pack &settingsPack)
settingsPack.set_int(libt::settings_pack::disk_io_read_mode, mode); settingsPack.set_int(libt::settings_pack::disk_io_read_mode, mode);
settingsPack.set_int(libt::settings_pack::disk_io_write_mode, mode); settingsPack.set_int(libt::settings_pack::disk_io_write_mode, mode);
settingsPack.set_bool(libt::settings_pack::guided_read_cache, isGuidedReadCacheEnabled()); settingsPack.set_bool(libt::settings_pack::guided_read_cache, isGuidedReadCacheEnabled());
settingsPack.set_bool(libt::settings_pack::suggest_mode, isSuggestModeEnabled());
settingsPack.set_bool(libt::settings_pack::anonymous_mode, isAnonymousModeEnabled()); settingsPack.set_bool(libt::settings_pack::anonymous_mode, isAnonymousModeEnabled());
@ -1496,6 +1498,7 @@ void Session::configure(libtorrent::session_settings &sessionSettings)
sessionSettings.disk_io_read_mode = mode; sessionSettings.disk_io_read_mode = mode;
sessionSettings.disk_io_write_mode = mode; sessionSettings.disk_io_write_mode = mode;
sessionSettings.guided_read_cache = isGuidedReadCacheEnabled(); sessionSettings.guided_read_cache = isGuidedReadCacheEnabled();
sessionSettings.suggest_mode = isSuggestModeEnabled();
sessionSettings.anonymous_mode = isAnonymousModeEnabled(); sessionSettings.anonymous_mode = isAnonymousModeEnabled();
@ -2926,6 +2929,19 @@ void Session::setGuidedReadCacheEnabled(bool enabled)
configureDeferred(); configureDeferred();
} }
bool Session::isSuggestModeEnabled() const
{
return m_isSuggestMode;
}
void Session::setSuggestMode(bool mode)
{
if (mode == m_isSuggestMode) return;
m_isSuggestMode = mode;
configureDeferred();
}
bool Session::isAnonymousModeEnabled() const bool Session::isAnonymousModeEnabled() const
{ {
return m_isAnonymousModeEnabled; return m_isAnonymousModeEnabled;

3
src/base/bittorrent/session.h

@ -339,6 +339,8 @@ namespace BitTorrent
void setUseOSCache(bool use); void setUseOSCache(bool use);
bool isGuidedReadCacheEnabled() const; bool isGuidedReadCacheEnabled() const;
void setGuidedReadCacheEnabled(bool enabled); void setGuidedReadCacheEnabled(bool enabled);
bool isSuggestModeEnabled() const;
void setSuggestMode(bool mode);
bool isAnonymousModeEnabled() const; bool isAnonymousModeEnabled() const;
void setAnonymousModeEnabled(bool enabled); void setAnonymousModeEnabled(bool enabled);
bool isQueueingSystemEnabled() const; bool isQueueingSystemEnabled() const;
@ -586,6 +588,7 @@ namespace BitTorrent
CachedSettingValue<int> m_diskCacheTTL; CachedSettingValue<int> m_diskCacheTTL;
CachedSettingValue<bool> m_useOSCache; CachedSettingValue<bool> m_useOSCache;
CachedSettingValue<bool> m_guidedReadCacheEnabled; CachedSettingValue<bool> m_guidedReadCacheEnabled;
CachedSettingValue<bool> m_isSuggestMode;
CachedSettingValue<bool> m_isAnonymousModeEnabled; CachedSettingValue<bool> m_isAnonymousModeEnabled;
CachedSettingValue<bool> m_isQueueingEnabled; CachedSettingValue<bool> m_isQueueingEnabled;
CachedSettingValue<int> m_maxActiveDownloads; CachedSettingValue<int> m_maxActiveDownloads;

6
src/gui/advancedsettings.cpp

@ -79,6 +79,7 @@ enum AdvSettingsRows
DISK_CACHE_TTL, DISK_CACHE_TTL,
OS_CACHE, OS_CACHE,
GUIDED_READ_CACHE, GUIDED_READ_CACHE,
SUGGEST_MODE,
// ports // ports
MAX_HALF_OPEN, MAX_HALF_OPEN,
OUTGOING_PORT_MIN, OUTGOING_PORT_MIN,
@ -134,6 +135,8 @@ void AdvancedSettings::saveAdvancedSettings()
session->setUseOSCache(cb_os_cache.isChecked()); session->setUseOSCache(cb_os_cache.isChecked());
// Guided read cache // Guided read cache
session->setGuidedReadCacheEnabled(cbGuidedReadCache.isChecked()); session->setGuidedReadCacheEnabled(cbGuidedReadCache.isChecked());
// Suggest mode
session->setSuggestMode(cbSuggestMode.isChecked());
// Save resume data interval // Save resume data interval
session->setSaveResumeDataInterval(spin_save_resume_data_interval.value()); session->setSaveResumeDataInterval(spin_save_resume_data_interval.value());
// Outgoing ports // Outgoing ports
@ -297,6 +300,9 @@ void AdvancedSettings::loadAdvancedSettings()
// Guided read cache // Guided read cache
cbGuidedReadCache.setChecked(session->isGuidedReadCacheEnabled()); cbGuidedReadCache.setChecked(session->isGuidedReadCacheEnabled());
addRow(GUIDED_READ_CACHE, tr("Guided read cache"), &cbGuidedReadCache); addRow(GUIDED_READ_CACHE, tr("Guided read cache"), &cbGuidedReadCache);
// Suggest mode
cbSuggestMode.setChecked(session->isSuggestModeEnabled());
addRow(SUGGEST_MODE, tr("Send upload piece suggestions"), &cbSuggestMode);
// Save resume data interval // Save resume data interval
spin_save_resume_data_interval.setMinimum(1); spin_save_resume_data_interval.setMinimum(1);
spin_save_resume_data_interval.setMaximum(1440); spin_save_resume_data_interval.setMaximum(1440);

3
src/gui/advancedsettings.h

@ -78,7 +78,8 @@ private:
QSpinBox spin_cache, spin_save_resume_data_interval, outgoing_ports_min, outgoing_ports_max, spin_list_refresh, spin_maxhalfopen, spin_tracker_port, spin_cache_ttl; QSpinBox spin_cache, spin_save_resume_data_interval, outgoing_ports_min, outgoing_ports_max, spin_list_refresh, spin_maxhalfopen, spin_tracker_port, spin_cache_ttl;
QCheckBox cb_os_cache, cb_recheck_completed, cb_resolve_countries, cb_resolve_hosts, cb_super_seeding, QCheckBox cb_os_cache, cb_recheck_completed, cb_resolve_countries, cb_resolve_hosts, cb_super_seeding,
cb_program_notifications, cb_torrent_added_notifications, cb_tracker_favicon, cb_tracker_status, cb_program_notifications, cb_torrent_added_notifications, cb_tracker_favicon, cb_tracker_status,
cb_confirm_torrent_recheck, cb_confirm_remove_all_tags, cb_listen_ipv6, cb_announce_all_trackers, cbGuidedReadCache, cbMultiConnectionsPerIp; cb_confirm_torrent_recheck, cb_confirm_remove_all_tags, cb_listen_ipv6, cb_announce_all_trackers, cbGuidedReadCache, cbMultiConnectionsPerIp,
cbSuggestMode;
QComboBox combo_iface, combo_iface_address, comboUtpMixedMode, comboChokingAlgorithm, comboSeedChokingAlgorithm; QComboBox combo_iface, combo_iface_address, comboUtpMixedMode, comboChokingAlgorithm, comboSeedChokingAlgorithm;
QLineEdit txtAnnounceIP; QLineEdit txtAnnounceIP;

Loading…
Cancel
Save