d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Migrate everything to use the new Preferences class and not access directly the qbittorrent.ini file.(webui)

adaptive-webui-19844
sledgehammer999 11 years ago
parent
d8d95d2195
commit
15d3df380c
3 changed files with 147 additions and 145 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/webui/httpconnection.cpp
  2. 14
      src/webui/httpserver.cpp
  3. 271
      src/webui/prefjson.cpp

7
src/webui/httpconnection.cpp
Unescape View File

@ -38,6 +38,7 @@
#include "prefjson.h" #include "prefjson.h"
#include "qbtsession.h" #include "qbtsession.h"
#include "misc.h" #include "misc.h"
#include "fs_utils.h"
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
#include "iconprovider.h" #include "iconprovider.h"
#endif #endif
@ -155,7 +156,7 @@ void HttpConnection::translateDocument(QString& data) {
int i = 0; int i = 0;
bool found = true; bool found = true;
const QString locale = Preferences().getLocale(); const QString locale = Preferences::instance()->getLocale();
bool isTranslationNeeded = !locale.startsWith("en") || locale.startsWith("en_AU") || locale.startsWith("en_GB"); bool isTranslationNeeded = !locale.startsWith("en") || locale.startsWith("en_AU") || locale.startsWith("en_GB");
while(i < data.size() && found) { while(i < data.size() && found) {
@ -575,14 +576,14 @@ void HttpConnection::respondCommand(const QString& command) {
qlonglong limit = m_parser.post("limit").toLongLong(); qlonglong limit = m_parser.post("limit").toLongLong();
if (limit == 0) limit = -1; if (limit == 0) limit = -1;
QBtSession::instance()->setUploadRateLimit(limit); QBtSession::instance()->setUploadRateLimit(limit);
Preferences().setGlobalUploadLimit(limit/1024.); Preferences::instance()->setGlobalUploadLimit(limit/1024.);
return; return;
} }
if (command == "setGlobalDlLimit") { if (command == "setGlobalDlLimit") {
qlonglong limit = m_parser.post("limit").toLongLong(); qlonglong limit = m_parser.post("limit").toLongLong();
if (limit == 0) limit = -1; if (limit == 0) limit = -1;
QBtSession::instance()->setDownloadRateLimit(limit); QBtSession::instance()->setDownloadRateLimit(limit);
Preferences().setGlobalDownloadLimit(limit/1024.); Preferences::instance()->setGlobalDownloadLimit(limit/1024.);
return; return;
} }
if (command == "pause") { if (command == "pause") {

14
src/webui/httpserver.cpp
Unescape View File

@ -91,18 +91,18 @@ void HttpServer::resetNbFailedAttemptsForIp(const QString& ip) {
HttpServer::HttpServer(QObject* parent) : QTcpServer(parent) HttpServer::HttpServer(QObject* parent) : QTcpServer(parent)
{ {
const Preferences pref; const Preferences* const pref = Preferences::instance();
m_username = pref.getWebUiUsername().toUtf8(); m_username = pref->getWebUiUsername().toUtf8();
m_passwordSha1 = pref.getWebUiPassword().toUtf8(); m_passwordSha1 = pref->getWebUiPassword().toUtf8();
m_localAuthEnabled = pref.isWebUiLocalAuthEnabled(); m_localAuthEnabled = pref->isWebUiLocalAuthEnabled();
// HTTPS-related // HTTPS-related
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
m_https = pref.isWebUiHttpsEnabled(); m_https = pref->isWebUiHttpsEnabled();
if (m_https) { if (m_https) {
m_certificate = QSslCertificate(pref.getWebUiHttpsCertificate()); m_certificate = QSslCertificate(pref->getWebUiHttpsCertificate());
m_key = QSslKey(pref.getWebUiHttpsKey(), QSsl::Rsa); m_key = QSslKey(pref->getWebUiHttpsKey(), QSsl::Rsa);
} }
#endif #endif

271
src/webui/prefjson.cpp
Unescape View File

@ -32,6 +32,7 @@
#include "preferences.h" #include "preferences.h"
#include "qbtsession.h" #include "qbtsession.h"
#include "scannedfoldersmodel.h" #include "scannedfoldersmodel.h"
#include "fs_utils.h"
#include <libtorrent/version.hpp> #include <libtorrent/version.hpp>
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
@ -47,94 +48,94 @@ prefjson::prefjson()
QByteArray prefjson::getPreferences() QByteArray prefjson::getPreferences()
{ {
const Preferences pref; const Preferences* const pref = Preferences::instance();
QVariantMap data; QVariantMap data;
// UI // UI
data["locale"] = pref.getLocale(); data["locale"] = pref->getLocale();
// Downloads // Downloads
data["save_path"] = fsutils::toNativePath(pref.getSavePath()); data["save_path"] = fsutils::toNativePath(pref->getSavePath());
data["temp_path_enabled"] = pref.isTempPathEnabled(); data["temp_path_enabled"] = pref->isTempPathEnabled();
data["temp_path"] = fsutils::toNativePath(pref.getTempPath()); data["temp_path"] = fsutils::toNativePath(pref->getTempPath());
QVariantList l; QVariantList l;
foreach (const QString& s, pref.getScanDirs()) { foreach (const QString& s, pref->getScanDirs()) {
l << fsutils::toNativePath(s); l << fsutils::toNativePath(s);
} }
data["scan_dirs"] = l; data["scan_dirs"] = l;
QVariantList var_list; QVariantList var_list;
foreach (bool b, pref.getDownloadInScanDirs()) { foreach (bool b, pref->getDownloadInScanDirs()) {
var_list << b; var_list << b;
} }
data["download_in_scan_dirs"] = var_list; data["download_in_scan_dirs"] = var_list;
data["export_dir_enabled"] = pref.isTorrentExportEnabled(); data["export_dir_enabled"] = pref->isTorrentExportEnabled();
data["export_dir"] = fsutils::toNativePath(pref.getTorrentExportDir()); data["export_dir"] = fsutils::toNativePath(pref->getTorrentExportDir());
data["mail_notification_enabled"] = pref.isMailNotificationEnabled(); data["mail_notification_enabled"] = pref->isMailNotificationEnabled();
data["mail_notification_email"] = pref.getMailNotificationEmail(); data["mail_notification_email"] = pref->getMailNotificationEmail();
data["mail_notification_smtp"] = pref.getMailNotificationSMTP(); data["mail_notification_smtp"] = pref->getMailNotificationSMTP();
data["mail_notification_ssl_enabled"] = pref.getMailNotificationSMTPSSL(); data["mail_notification_ssl_enabled"] = pref->getMailNotificationSMTPSSL();
data["mail_notification_auth_enabled"] = pref.getMailNotificationSMTPAuth(); data["mail_notification_auth_enabled"] = pref->getMailNotificationSMTPAuth();
data["mail_notification_username"] = pref.getMailNotificationSMTPUsername(); data["mail_notification_username"] = pref->getMailNotificationSMTPUsername();
data["mail_notification_password"] = pref.getMailNotificationSMTPPassword(); data["mail_notification_password"] = pref->getMailNotificationSMTPPassword();
data["autorun_enabled"] = pref.isAutoRunEnabled(); data["autorun_enabled"] = pref->isAutoRunEnabled();
data["autorun_program"] = fsutils::toNativePath(pref.getAutoRunProgram()); data["autorun_program"] = fsutils::toNativePath(pref->getAutoRunProgram());
data["preallocate_all"] = pref.preAllocateAllFiles(); data["preallocate_all"] = pref->preAllocateAllFiles();
data["queueing_enabled"] = pref.isQueueingSystemEnabled(); data["queueing_enabled"] = pref->isQueueingSystemEnabled();
data["max_active_downloads"] = pref.getMaxActiveDownloads(); data["max_active_downloads"] = pref->getMaxActiveDownloads();
data["max_active_torrents"] = pref.getMaxActiveTorrents(); data["max_active_torrents"] = pref->getMaxActiveTorrents();
data["max_active_uploads"] = pref.getMaxActiveUploads(); data["max_active_uploads"] = pref->getMaxActiveUploads();
data["dont_count_slow_torrents"] = pref.ignoreSlowTorrentsForQueueing(); data["dont_count_slow_torrents"] = pref->ignoreSlowTorrentsForQueueing();
data["incomplete_files_ext"] = pref.useIncompleteFilesExtension(); data["incomplete_files_ext"] = pref->useIncompleteFilesExtension();
// Connection // Connection
data["listen_port"] = pref.getSessionPort(); data["listen_port"] = pref->getSessionPort();
data["upnp"] = pref.isUPnPEnabled(); data["upnp"] = pref->isUPnPEnabled();
data["dl_limit"] = pref.getGlobalDownloadLimit(); data["dl_limit"] = pref->getGlobalDownloadLimit();
data["up_limit"] = pref.getGlobalUploadLimit(); data["up_limit"] = pref->getGlobalUploadLimit();
data["max_connec"] = pref.getMaxConnecs(); data["max_connec"] = pref->getMaxConnecs();
data["max_connec_per_torrent"] = pref.getMaxConnecsPerTorrent(); data["max_connec_per_torrent"] = pref->getMaxConnecsPerTorrent();
data["max_uploads_per_torrent"] = pref.getMaxUploadsPerTorrent(); data["max_uploads_per_torrent"] = pref->getMaxUploadsPerTorrent();
data["enable_utp"] = pref.isuTPEnabled(); data["enable_utp"] = pref->isuTPEnabled();
data["limit_utp_rate"] = pref.isuTPRateLimited(); data["limit_utp_rate"] = pref->isuTPRateLimited();
data["limit_tcp_overhead"] = pref.includeOverheadInLimits(); data["limit_tcp_overhead"] = pref->includeOverheadInLimits();
data["alt_dl_limit"] = pref.getAltGlobalDownloadLimit(); data["alt_dl_limit"] = pref->getAltGlobalDownloadLimit();
data["alt_up_limit"] = pref.getAltGlobalUploadLimit(); data["alt_up_limit"] = pref->getAltGlobalUploadLimit();
data["scheduler_enabled"] = pref.isSchedulerEnabled(); data["scheduler_enabled"] = pref->isSchedulerEnabled();
const QTime start_time = pref.getSchedulerStartTime(); const QTime start_time = pref->getSchedulerStartTime();
data["schedule_from_hour"] = start_time.hour(); data["schedule_from_hour"] = start_time.hour();
data["schedule_from_min"] = start_time.minute(); data["schedule_from_min"] = start_time.minute();
const QTime end_time = pref.getSchedulerEndTime(); const QTime end_time = pref->getSchedulerEndTime();
data["schedule_to_hour"] = end_time.hour(); data["schedule_to_hour"] = end_time.hour();
data["schedule_to_min"] = end_time.minute(); data["schedule_to_min"] = end_time.minute();
data["scheduler_days"] = pref.getSchedulerDays(); data["scheduler_days"] = pref->getSchedulerDays();
// Bittorrent // Bittorrent
data["dht"] = pref.isDHTEnabled(); data["dht"] = pref->isDHTEnabled();
data["pex"] = pref.isPeXEnabled(); data["pex"] = pref->isPeXEnabled();
data["lsd"] = pref.isLSDEnabled(); data["lsd"] = pref->isLSDEnabled();
data["encryption"] = pref.getEncryptionSetting(); data["encryption"] = pref->getEncryptionSetting();
data["anonymous_mode"] = pref.isAnonymousModeEnabled(); data["anonymous_mode"] = pref->isAnonymousModeEnabled();
// Proxy // Proxy
data["proxy_type"] = pref.getProxyType(); data["proxy_type"] = pref->getProxyType();
data["proxy_ip"] = pref.getProxyIp(); data["proxy_ip"] = pref->getProxyIp();
data["proxy_port"] = pref.getProxyPort(); data["proxy_port"] = pref->getProxyPort();
data["proxy_peer_connections"] = pref.proxyPeerConnections(); data["proxy_peer_connections"] = pref->proxyPeerConnections();
data["proxy_auth_enabled"] = pref.isProxyAuthEnabled(); data["proxy_auth_enabled"] = pref->isProxyAuthEnabled();
data["proxy_username"] = pref.getProxyUsername(); data["proxy_username"] = pref->getProxyUsername();
data["proxy_password"] = pref.getProxyPassword(); data["proxy_password"] = pref->getProxyPassword();
// IP Filter // IP Filter
data["ip_filter_enabled"] = pref.isFilteringEnabled(); data["ip_filter_enabled"] = pref->isFilteringEnabled();
data["ip_filter_path"] = fsutils::toNativePath(pref.getFilter()); data["ip_filter_path"] = fsutils::toNativePath(pref->getFilter());
// Web UI // Web UI
data["web_ui_port"] = pref.getWebUiPort(); data["web_ui_port"] = pref->getWebUiPort();
data["web_ui_username"] = pref.getWebUiUsername(); data["web_ui_username"] = pref->getWebUiUsername();
data["web_ui_password"] = pref.getWebUiPassword(); data["web_ui_password"] = pref->getWebUiPassword();
data["bypass_local_auth"] = !pref.isWebUiLocalAuthEnabled(); data["bypass_local_auth"] = !pref->isWebUiLocalAuthEnabled();
data["use_https"] = pref.isWebUiHttpsEnabled(); data["use_https"] = pref->isWebUiHttpsEnabled();
data["ssl_key"] = QString::fromLatin1(pref.getWebUiHttpsKey()); data["ssl_key"] = QString::fromLatin1(pref->getWebUiHttpsKey());
data["ssl_cert"] = QString::fromLatin1(pref.getWebUiHttpsCertificate()); data["ssl_cert"] = QString::fromLatin1(pref->getWebUiHttpsCertificate());
// DynDns // DynDns
data["dyndns_enabled"] = pref.isDynDNSEnabled(); data["dyndns_enabled"] = pref->isDynDNSEnabled();
data["dyndns_service"] = pref.getDynDNSService(); data["dyndns_service"] = pref->getDynDNSService();
data["dyndns_username"] = pref.getDynDNSUsername(); data["dyndns_username"] = pref->getDynDNSUsername();
data["dyndns_password"] = pref.getDynDNSPassword(); data["dyndns_password"] = pref->getDynDNSPassword();
data["dyndns_domain"] = pref.getDynDomainName(); data["dyndns_domain"] = pref->getDynDomainName();
return json::toJson(data); return json::toJson(data);
} }
@ -144,10 +145,10 @@ void prefjson::setPreferences(const QString& json)
const QVariantMap m = json::fromJson(json).toMap(); const QVariantMap m = json::fromJson(json).toMap();
// UI // UI
Preferences pref; Preferences* const pref = Preferences::instance();
if (m.contains("locale")) { if (m.contains("locale")) {
QString locale = m["locale"].toString(); QString locale = m["locale"].toString();
if (pref.getLocale() != locale) { if (pref->getLocale() != locale) {
QTranslator *translator = new QTranslator; QTranslator *translator = new QTranslator;
if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) { if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) {
qDebug("%s locale recognized, using translation.", qPrintable(locale)); qDebug("%s locale recognized, using translation.", qPrintable(locale));
@ -156,27 +157,27 @@ void prefjson::setPreferences(const QString& json)
} }
qApp->installTranslator(translator); qApp->installTranslator(translator);
pref.setLocale(locale); pref->setLocale(locale);
} }
} }
// Downloads // Downloads
if (m.contains("save_path")) if (m.contains("save_path"))
pref.setSavePath(m["save_path"].toString()); pref->setSavePath(m["save_path"].toString());
if (m.contains("temp_path_enabled")) if (m.contains("temp_path_enabled"))
pref.setTempPathEnabled(m["temp_path_enabled"].toBool()); pref->setTempPathEnabled(m["temp_path_enabled"].toBool());
if (m.contains("temp_path")) if (m.contains("temp_path"))
pref.setTempPath(m["temp_path"].toString()); pref->setTempPath(m["temp_path"].toString());
if (m.contains("scan_dirs") && m.contains("download_in_scan_dirs")) { if (m.contains("scan_dirs") && m.contains("download_in_scan_dirs")) {
QVariantList download_at_path_tmp = m["download_in_scan_dirs"].toList(); QVariantList download_at_path_tmp = m["download_in_scan_dirs"].toList();
QList<bool> download_at_path; QList<bool> download_at_path;
foreach (QVariant var, download_at_path_tmp) { foreach (QVariant var, download_at_path_tmp) {
download_at_path << var.toBool(); download_at_path << var.toBool();
} }
QStringList old_folders = pref.getScanDirs(); QStringList old_folders = pref->getScanDirs();
QStringList new_folders = m["scan_dirs"].toStringList(); QStringList new_folders = m["scan_dirs"].toStringList();
if (download_at_path.size() == new_folders.size()) { if (download_at_path.size() == new_folders.size()) {
pref.setScanDirs(new_folders); pref->setScanDirs(new_folders);
pref.setDownloadInScanDirs(download_at_path); pref->setDownloadInScanDirs(download_at_path);
foreach (const QString &old_folder, old_folders) { foreach (const QString &old_folder, old_folders) {
// Update deleted folders // Update deleted folders
if (!new_folders.contains(old_folder)) { if (!new_folders.contains(old_folder)) {
@ -195,142 +196,142 @@ void prefjson::setPreferences(const QString& json)
} }
} }
if (m.contains("export_dir")) if (m.contains("export_dir"))
pref.setTorrentExportDir(m["export_dir"].toString()); pref->setTorrentExportDir(m["export_dir"].toString());
if (m.contains("mail_notification_enabled")) if (m.contains("mail_notification_enabled"))
pref.setMailNotificationEnabled(m["mail_notification_enabled"].toBool()); pref->setMailNotificationEnabled(m["mail_notification_enabled"].toBool());
if (m.contains("mail_notification_email")) if (m.contains("mail_notification_email"))
pref.setMailNotificationEmail(m["mail_notification_email"].toString()); pref->setMailNotificationEmail(m["mail_notification_email"].toString());
if (m.contains("mail_notification_smtp")) if (m.contains("mail_notification_smtp"))
pref.setMailNotificationSMTP(m["mail_notification_smtp"].toString()); pref->setMailNotificationSMTP(m["mail_notification_smtp"].toString());
if (m.contains("mail_notification_ssl_enabled")) if (m.contains("mail_notification_ssl_enabled"))
pref.setMailNotificationSMTPSSL(m["mail_notification_ssl_enabled"].toBool()); pref->setMailNotificationSMTPSSL(m["mail_notification_ssl_enabled"].toBool());
if (m.contains("mail_notification_auth_enabled")) if (m.contains("mail_notification_auth_enabled"))
pref.setMailNotificationSMTPAuth(m["mail_notification_auth_enabled"].toBool()); pref->setMailNotificationSMTPAuth(m["mail_notification_auth_enabled"].toBool());
if (m.contains("mail_notification_username")) if (m.contains("mail_notification_username"))
pref.setMailNotificationSMTPUsername(m["mail_notification_username"].toString()); pref->setMailNotificationSMTPUsername(m["mail_notification_username"].toString());
if (m.contains("mail_notification_password")) if (m.contains("mail_notification_password"))
pref.setMailNotificationSMTPPassword(m["mail_notification_password"].toString()); pref->setMailNotificationSMTPPassword(m["mail_notification_password"].toString());
if (m.contains("autorun_enabled")) if (m.contains("autorun_enabled"))
pref.setAutoRunEnabled(m["autorun_enabled"].toBool()); pref->setAutoRunEnabled(m["autorun_enabled"].toBool());
if (m.contains("autorun_program")) if (m.contains("autorun_program"))
pref.setAutoRunProgram(m["autorun_program"].toString()); pref->setAutoRunProgram(m["autorun_program"].toString());
if (m.contains("preallocate_all")) if (m.contains("preallocate_all"))
pref.preAllocateAllFiles(m["preallocate_all"].toBool()); pref->preAllocateAllFiles(m["preallocate_all"].toBool());
if (m.contains("queueing_enabled")) if (m.contains("queueing_enabled"))
pref.setQueueingSystemEnabled(m["queueing_enabled"].toBool()); pref->setQueueingSystemEnabled(m["queueing_enabled"].toBool());
if (m.contains("max_active_downloads")) if (m.contains("max_active_downloads"))
pref.setMaxActiveDownloads(m["max_active_downloads"].toInt()); pref->setMaxActiveDownloads(m["max_active_downloads"].toInt());
if (m.contains("max_active_torrents")) if (m.contains("max_active_torrents"))
pref.setMaxActiveTorrents(m["max_active_torrents"].toInt()); pref->setMaxActiveTorrents(m["max_active_torrents"].toInt());
if (m.contains("max_active_uploads")) if (m.contains("max_active_uploads"))
pref.setMaxActiveUploads(m["max_active_uploads"].toInt()); pref->setMaxActiveUploads(m["max_active_uploads"].toInt());
if (m.contains("dont_count_slow_torrents")) if (m.contains("dont_count_slow_torrents"))
pref.setIgnoreSlowTorrentsForQueueing(m["dont_count_slow_torrents"].toBool()); pref->setIgnoreSlowTorrentsForQueueing(m["dont_count_slow_torrents"].toBool());
if (m.contains("incomplete_files_ext")) if (m.contains("incomplete_files_ext"))
pref.useIncompleteFilesExtension(m["incomplete_files_ext"].toBool()); pref->useIncompleteFilesExtension(m["incomplete_files_ext"].toBool());
// Connection // Connection
if (m.contains("listen_port")) if (m.contains("listen_port"))
pref.setSessionPort(m["listen_port"].toInt()); pref->setSessionPort(m["listen_port"].toInt());
if (m.contains("upnp")) if (m.contains("upnp"))
pref.setUPnPEnabled(m["upnp"].toBool()); pref->setUPnPEnabled(m["upnp"].toBool());
if (m.contains("dl_limit")) if (m.contains("dl_limit"))
pref.setGlobalDownloadLimit(m["dl_limit"].toInt()); pref->setGlobalDownloadLimit(m["dl_limit"].toInt());
if (m.contains("up_limit")) if (m.contains("up_limit"))
pref.setGlobalUploadLimit(m["up_limit"].toInt()); pref->setGlobalUploadLimit(m["up_limit"].toInt());
if (m.contains("max_connec")) if (m.contains("max_connec"))
pref.setMaxConnecs(m["max_connec"].toInt()); pref->setMaxConnecs(m["max_connec"].toInt());
if (m.contains("max_connec_per_torrent")) if (m.contains("max_connec_per_torrent"))
pref.setMaxConnecsPerTorrent(m["max_connec_per_torrent"].toInt()); pref->setMaxConnecsPerTorrent(m["max_connec_per_torrent"].toInt());
if (m.contains("max_uploads_per_torrent")) if (m.contains("max_uploads_per_torrent"))
pref.setMaxUploadsPerTorrent(m["max_uploads_per_torrent"].toInt()); pref->setMaxUploadsPerTorrent(m["max_uploads_per_torrent"].toInt());
if (m.contains("enable_utp")) if (m.contains("enable_utp"))
pref.setuTPEnabled(m["enable_utp"].toBool()); pref->setuTPEnabled(m["enable_utp"].toBool());
if (m.contains("limit_utp_rate")) if (m.contains("limit_utp_rate"))
pref.setuTPRateLimited(m["limit_utp_rate"].toBool()); pref->setuTPRateLimited(m["limit_utp_rate"].toBool());
if (m.contains("limit_tcp_overhead")) if (m.contains("limit_tcp_overhead"))
pref.includeOverheadInLimits(m["limit_tcp_overhead"].toBool()); pref->includeOverheadInLimits(m["limit_tcp_overhead"].toBool());
if (m.contains("alt_dl_limit")) if (m.contains("alt_dl_limit"))
pref.setAltGlobalDownloadLimit(m["alt_dl_limit"].toInt()); pref->setAltGlobalDownloadLimit(m["alt_dl_limit"].toInt());
if (m.contains("alt_up_limit")) if (m.contains("alt_up_limit"))
pref.setAltGlobalUploadLimit(m["alt_up_limit"].toInt()); pref->setAltGlobalUploadLimit(m["alt_up_limit"].toInt());
if (m.contains("scheduler_enabled")) if (m.contains("scheduler_enabled"))
pref.setSchedulerEnabled(m["scheduler_enabled"].toBool()); pref->setSchedulerEnabled(m["scheduler_enabled"].toBool());
if (m.contains("schedule_from_hour") && m.contains("schedule_from_min")) { if (m.contains("schedule_from_hour") && m.contains("schedule_from_min")) {
pref.setSchedulerStartTime(QTime(m["schedule_from_hour"].toInt(), pref->setSchedulerStartTime(QTime(m["schedule_from_hour"].toInt(),
m["schedule_from_min"].toInt())); m["schedule_from_min"].toInt()));
} }
if (m.contains("schedule_to_hour") && m.contains("schedule_to_min")) { if (m.contains("schedule_to_hour") && m.contains("schedule_to_min")) {
pref.setSchedulerEndTime(QTime(m["schedule_to_hour"].toInt(), pref->setSchedulerEndTime(QTime(m["schedule_to_hour"].toInt(),
m["schedule_to_min"].toInt())); m["schedule_to_min"].toInt()));
} }
if (m.contains("scheduler_days")) if (m.contains("scheduler_days"))
pref.setSchedulerDays(scheduler_days(m["scheduler_days"].toInt())); pref->setSchedulerDays(scheduler_days(m["scheduler_days"].toInt()));
// Bittorrent // Bittorrent
if (m.contains("dht")) if (m.contains("dht"))
pref.setDHTEnabled(m["dht"].toBool()); pref->setDHTEnabled(m["dht"].toBool());
if (m.contains("pex")) if (m.contains("pex"))
pref.setPeXEnabled(m["pex"].toBool()); pref->setPeXEnabled(m["pex"].toBool());
qDebug("Pex support: %d", (int)m["pex"].toBool()); qDebug("Pex support: %d", (int)m["pex"].toBool());
if (m.contains("lsd")) if (m.contains("lsd"))
pref.setLSDEnabled(m["lsd"].toBool()); pref->setLSDEnabled(m["lsd"].toBool());
if (m.contains("encryption")) if (m.contains("encryption"))
pref.setEncryptionSetting(m["encryption"].toInt()); pref->setEncryptionSetting(m["encryption"].toInt());
if (m.contains("anonymous_mode")) if (m.contains("anonymous_mode"))
pref.enableAnonymousMode(m["anonymous_mode"].toBool()); pref->enableAnonymousMode(m["anonymous_mode"].toBool());
// Proxy // Proxy
if (m.contains("proxy_type")) if (m.contains("proxy_type"))
pref.setProxyType(m["proxy_type"].toInt()); pref->setProxyType(m["proxy_type"].toInt());
if (m.contains("proxy_ip")) if (m.contains("proxy_ip"))
pref.setProxyIp(m["proxy_ip"].toString()); pref->setProxyIp(m["proxy_ip"].toString());
if (m.contains("proxy_port")) if (m.contains("proxy_port"))
pref.setProxyPort(m["proxy_port"].toUInt()); pref->setProxyPort(m["proxy_port"].toUInt());
if (m.contains("proxy_peer_connections")) if (m.contains("proxy_peer_connections"))
pref.setProxyPeerConnections(m["proxy_peer_connections"].toBool()); pref->setProxyPeerConnections(m["proxy_peer_connections"].toBool());
if (m.contains("proxy_auth_enabled")) if (m.contains("proxy_auth_enabled"))
pref.setProxyAuthEnabled(m["proxy_auth_enabled"].toBool()); pref->setProxyAuthEnabled(m["proxy_auth_enabled"].toBool());
if (m.contains("proxy_username")) if (m.contains("proxy_username"))
pref.setProxyUsername(m["proxy_username"].toString()); pref->setProxyUsername(m["proxy_username"].toString());
if (m.contains("proxy_password")) if (m.contains("proxy_password"))
pref.setProxyPassword(m["proxy_password"].toString()); pref->setProxyPassword(m["proxy_password"].toString());
// IP Filter // IP Filter
if (m.contains("ip_filter_enabled")) if (m.contains("ip_filter_enabled"))
pref.setFilteringEnabled(m["ip_filter_enabled"].toBool()); pref->setFilteringEnabled(m["ip_filter_enabled"].toBool());
if (m.contains("ip_filter_path")) if (m.contains("ip_filter_path"))
pref.setFilter(m["ip_filter_path"].toString()); pref->setFilter(m["ip_filter_path"].toString());
// Web UI // Web UI
if (m.contains("web_ui_port")) if (m.contains("web_ui_port"))
pref.setWebUiPort(m["web_ui_port"].toUInt()); pref->setWebUiPort(m["web_ui_port"].toUInt());
if (m.contains("web_ui_username")) if (m.contains("web_ui_username"))
pref.setWebUiUsername(m["web_ui_username"].toString()); pref->setWebUiUsername(m["web_ui_username"].toString());
if (m.contains("web_ui_password")) if (m.contains("web_ui_password"))
pref.setWebUiPassword(m["web_ui_password"].toString()); pref->setWebUiPassword(m["web_ui_password"].toString());
if (m.contains("bypass_local_auth")) if (m.contains("bypass_local_auth"))
pref.setWebUiLocalAuthEnabled(!m["bypass_local_auth"].toBool()); pref->setWebUiLocalAuthEnabled(!m["bypass_local_auth"].toBool());
if (m.contains("use_https")) if (m.contains("use_https"))
pref.setWebUiHttpsEnabled(m["use_https"].toBool()); pref->setWebUiHttpsEnabled(m["use_https"].toBool());
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
if (m.contains("ssl_key")) { if (m.contains("ssl_key")) {
QByteArray raw_key = m["ssl_key"].toString().toLatin1(); QByteArray raw_key = m["ssl_key"].toString().toLatin1();
if (!QSslKey(raw_key, QSsl::Rsa).isNull()) if (!QSslKey(raw_key, QSsl::Rsa).isNull())
pref.setWebUiHttpsKey(raw_key); pref->setWebUiHttpsKey(raw_key);
} }
if (m.contains("ssl_cert")) { if (m.contains("ssl_cert")) {
QByteArray raw_cert = m["ssl_cert"].toString().toLatin1(); QByteArray raw_cert = m["ssl_cert"].toString().toLatin1();
if (!QSslCertificate(raw_cert).isNull()) if (!QSslCertificate(raw_cert).isNull())
pref.setWebUiHttpsCertificate(raw_cert); pref->setWebUiHttpsCertificate(raw_cert);
} }
#endif #endif
// Dyndns // Dyndns
if (m.contains("dyndns_enabled")) if (m.contains("dyndns_enabled"))
pref.setDynDNSEnabled(m["dyndns_enabled"].toBool()); pref->setDynDNSEnabled(m["dyndns_enabled"].toBool());
if (m.contains("dyndns_service")) if (m.contains("dyndns_service"))
pref.setDynDNSService(m["dyndns_service"].toInt()); pref->setDynDNSService(m["dyndns_service"].toInt());
if (m.contains("dyndns_username")) if (m.contains("dyndns_username"))
pref.setDynDNSUsername(m["dyndns_username"].toString()); pref->setDynDNSUsername(m["dyndns_username"].toString());
if (m.contains("dyndns_password")) if (m.contains("dyndns_password"))
pref.setDynDNSPassword(m["dyndns_password"].toString()); pref->setDynDNSPassword(m["dyndns_password"].toString());
if (m.contains("dyndns_domain")) if (m.contains("dyndns_domain"))
pref.setDynDomainName(m["dyndns_domain"].toString()); pref->setDynDomainName(m["dyndns_domain"].toString());
// Reload preferences // Reload preferences
QBtSession::instance()->configureSession(); QBtSession::instance()->configureSession();
} }

Write Preview
Loading…
Cancel
Save