Skip to content

Commit

Permalink
Reorder code to match UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@sledgehammer999
sledgehammer999 committed Sep 28, 2024
1 parent 18d6731 commit 42aa890
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
42 changes: 21 additions & 21 deletions src/webui/api/appcontroller.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,16 @@ void AppController::preferencesAction()
data[u"resolve_peer_countries"_s] = pref->resolvePeerCountries();
// Reannounce to all trackers when ip/port changed
data[u"reannounce_when_address_changed"_s] = session->isReannounceWhenAddressChangedEnabled();
// Embedded tracker
data[u"enable_embedded_tracker"_s] = session->isTrackerEnabled();
data[u"embedded_tracker_port"_s] = pref->getTrackerPort();
data[u"embedded_tracker_port_forwarding"_s] = pref->isTrackerPortForwardingEnabled();
// Mark-of-the-Web
data[u"mark_of_the_web"_s] = pref->isMarkOfTheWebEnabled();
// Ignore SSL errors
data[u"ignore_ssl_errors"_s] = pref->isIgnoreSSLErrors();
// Python executable path
data[u"python_executable_path"_s] = pref->getPythonExecutablePath().toString();

// libtorrent preferences
// Bdecode depth limit
Expand Down Expand Up @@ -442,14 +450,6 @@ void AppController::preferencesAction()
data[u"ssrf_mitigation"_s] = session->isSSRFMitigationEnabled();
// Disallow connection to peers on privileged ports
data[u"block_peers_on_privileged_ports"_s] = session->blockPeersOnPrivilegedPorts();
// Embedded tracker
data[u"enable_embedded_tracker"_s] = session->isTrackerEnabled();
data[u"embedded_tracker_port"_s] = pref->getTrackerPort();
data[u"embedded_tracker_port_forwarding"_s] = pref->isTrackerPortForwardingEnabled();
// Mark-of-the-Web
data[u"mark_of_the_web"_s] = pref->isMarkOfTheWebEnabled();
// Python executable path
data[u"python_executable_path"_s] = pref->getPythonExecutablePath().toString();
// Choking algorithm
data[u"upload_slots_behavior"_s] = static_cast<int>(session->chokingAlgorithm());
// Seed choking algorithm
Expand Down Expand Up @@ -994,9 +994,22 @@ void AppController::setPreferencesAction()
// Reannounce to all trackers when ip/port changed
if (hasKey(u"reannounce_when_address_changed"_s))
session->setReannounceWhenAddressChangedEnabled(it.value().toBool());
// Embedded tracker
if (hasKey(u"embedded_tracker_port"_s))
pref->setTrackerPort(it.value().toInt());
if (hasKey(u"embedded_tracker_port_forwarding"_s))
pref->setTrackerPortForwardingEnabled(it.value().toBool());
if (hasKey(u"enable_embedded_tracker"_s))
session->setTrackerEnabled(it.value().toBool());
// Mark-of-the-Web
if (hasKey(u"mark_of_the_web"_s))
pref->setMarkOfTheWebEnabled(it.value().toBool());
// Ignore SLL errors
if (hasKey(u"ignore_ssl_errors"_s))
pref->setIgnoreSSLErrors(it.value().toBool());
// Python executable path
if (hasKey(u"python_executable_path"_s))
pref->setPythonExecutablePath(Path(it.value().toString()));

// libtorrent preferences
// Bdecode depth limit
Expand Down Expand Up @@ -1091,19 +1104,6 @@ void AppController::setPreferencesAction()
// Disallow connection to peers on privileged ports
if (hasKey(u"block_peers_on_privileged_ports"_s))
session->setBlockPeersOnPrivilegedPorts(it.value().toBool());
// Embedded tracker
if (hasKey(u"embedded_tracker_port"_s))
pref->setTrackerPort(it.value().toInt());
if (hasKey(u"embedded_tracker_port_forwarding"_s))
pref->setTrackerPortForwardingEnabled(it.value().toBool());
if (hasKey(u"enable_embedded_tracker"_s))
session->setTrackerEnabled(it.value().toBool());
// Mark-of-the-Web
if (hasKey(u"mark_of_the_web"_s))
pref->setMarkOfTheWebEnabled(it.value().toBool());
// Python executable path
if (hasKey(u"python_executable_path"_s))
pref->setPythonExecutablePath(Path(it.value().toString()));
// Choking algorithm
if (hasKey(u"upload_slots_behavior"_s))
session->setChokingAlgorithm(static_cast<BitTorrent::ChokingAlgorithm>(it.value().toInt()));
Expand Down
20 changes: 10 additions & 10 deletions src/webui/www/private/views/preferences.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2477,7 +2477,12 @@
$("refreshInterval").value = pref.refresh_interval;
$("resolvePeerCountries").checked = pref.resolve_peer_countries;
$("reannounceWhenAddressChanged").checked = pref.reannounce_when_address_changed;
$("enableEmbeddedTracker").checked = pref.enable_embedded_tracker;
$("embeddedTrackerPort").value = pref.embedded_tracker_port;
$("embeddedTrackerPortForwarding").checked = pref.embedded_tracker_port_forwarding;
$("markOfTheWeb").checked = pref.mark_of_the_web;
$("ignoreSSLErrors").checked = pref.ignore_ssl_errors;
$("pythonExecutablePath").value = pref.python_executable_path;
// libtorrent section
$("bdecodeDepthLimit").value = pref.bdecode_depth_limit;
$("bdecodeTokenLimit").value = pref.bdecode_token_limit;
Expand Down Expand Up @@ -2511,11 +2516,6 @@
$("validateHTTPSTrackerCertificate").checked = pref.validate_https_tracker_certificate;
$("mitigateSSRF").checked = pref.ssrf_mitigation;
$("blockPeersOnPrivilegedPorts").checked = pref.block_peers_on_privileged_ports;
$("enableEmbeddedTracker").checked = pref.enable_embedded_tracker;
$("embeddedTrackerPort").value = pref.embedded_tracker_port;
$("embeddedTrackerPortForwarding").checked = pref.embedded_tracker_port_forwarding;
$("markOfTheWeb").checked = pref.mark_of_the_web;
$("pythonExecutablePath").value = pref.python_executable_path;
$("uploadSlotsBehavior").value = pref.upload_slots_behavior;
$("uploadChokingAlgorithm").value = pref.upload_choking_algorithm;
$("announceAllTrackers").checked = pref.announce_to_all_trackers;
Expand Down Expand Up @@ -2934,7 +2934,12 @@
settings["refresh_interval"] = Number($("refreshInterval").value);
settings["resolve_peer_countries"] = $("resolvePeerCountries").checked;
settings["reannounce_when_address_changed"] = $("reannounceWhenAddressChanged").checked;
settings["enable_embedded_tracker"] = $("enableEmbeddedTracker").checked;
settings["embedded_tracker_port"] = Number($("embeddedTrackerPort").value);
settings["embedded_tracker_port_forwarding"] = $("embeddedTrackerPortForwarding").checked;
settings["mark_of_the_web"] = $("markOfTheWeb").checked;
settings["ignore_ssl_errors"] = $("ignoreSSLErrors").checked;
settings["python_executable_path"] = $("pythonExecutablePath").value;

// libtorrent section
settings["bdecode_depth_limit"] = Number($("bdecodeDepthLimit").value);
Expand Down Expand Up @@ -2969,11 +2974,6 @@
settings["validate_https_tracker_certificate"] = $("validateHTTPSTrackerCertificate").checked;
settings["ssrf_mitigation"] = $("mitigateSSRF").checked;
settings["block_peers_on_privileged_ports"] = $("blockPeersOnPrivilegedPorts").checked;
settings["enable_embedded_tracker"] = $("enableEmbeddedTracker").checked;
settings["embedded_tracker_port"] = Number($("embeddedTrackerPort").value);
settings["embedded_tracker_port_forwarding"] = $("embeddedTrackerPortForwarding").checked;
settings["mark_of_the_web"] = $("markOfTheWeb").checked;
settings["python_executable_path"] = $("pythonExecutablePath").value;
settings["upload_slots_behavior"] = Number($("uploadSlotsBehavior").value);
settings["upload_choking_algorithm"] = Number($("uploadChokingAlgorithm").value);
settings["announce_to_all_trackers"] = $("announceAllTrackers").checked;
Expand Down

0 comments on commit 42aa890

Please sign in to comment.