squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-01 13:18:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14976 from Chocobo1/options

Browse Source 
Add `connection_speed` to advanced settings
This commit is contained in:
Chocobo1
2021-05-23 14:27:34 +08:00
committed by GitHub
parent 2e8e2b04a1 c64e433a69
commit 40f6201509
11 changed files with 128 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/webui/api/appcontroller.cpp
View File

@@ -313,6 +313,8 @@ void AppController::preferencesAction()
data["send_buffer_watermark"] = session->sendBufferWatermark();
data["send_buffer_low_watermark"] = session->sendBufferLowWatermark();
data["send_buffer_watermark_factor"] = session->sendBufferWatermarkFactor();
// Outgoing connections per second
data["connection_speed"] = session->connectionSpeed();
// Socket listen backlog size
data["socket_backlog_size"] = session->socketBacklogSize();
// Outgoing ports
@@ -776,6 +778,9 @@ void AppController::setPreferencesAction()
session->setSendBufferLowWatermark(it.value().toInt());
if (hasKey("send_buffer_watermark_factor"))
session->setSendBufferWatermarkFactor(it.value().toInt());
// Outgoing connections per second
if (hasKey("connection_speed"))
session->setConnectionSpeed(it.value().toInt());
// Socket listen backlog size
if (hasKey("socket_backlog_size"))
session->setSocketBacklogSize(it.value().toInt());

92
src/webui/api/serialize/serialize_torrent.h
View File

@@ -36,51 +36,51 @@ namespace BitTorrent
}
// Torrent keys
const char KEY_TORRENT_ID[] = "hash";
const char KEY_TORRENT_NAME[] = "name";
const char KEY_TORRENT_MAGNET_URI[] = "magnet_uri";
const char KEY_TORRENT_SIZE[] = "size";
const char KEY_TORRENT_PROGRESS[] = "progress";
const char KEY_TORRENT_DLSPEED[] = "dlspeed";
const char KEY_TORRENT_UPSPEED[] = "upspeed";
const char KEY_TORRENT_QUEUE_POSITION[] = "priority";
const char KEY_TORRENT_SEEDS[] = "num_seeds";
const char KEY_TORRENT_NUM_COMPLETE[] = "num_complete";
const char KEY_TORRENT_LEECHS[] = "num_leechs";
const char KEY_TORRENT_NUM_INCOMPLETE[] = "num_incomplete";
const char KEY_TORRENT_RATIO[] = "ratio";
const char KEY_TORRENT_ETA[] = "eta";
const char KEY_TORRENT_STATE[] = "state";
const char KEY_TORRENT_SEQUENTIAL_DOWNLOAD[] = "seq_dl";
const char KEY_TORRENT_FIRST_LAST_PIECE_PRIO[] = "f_l_piece_prio";
const char KEY_TORRENT_CATEGORY[] = "category";
const char KEY_TORRENT_TAGS[] = "tags";
const char KEY_TORRENT_SUPER_SEEDING[] = "super_seeding";
const char KEY_TORRENT_FORCE_START[] = "force_start";
const char KEY_TORRENT_SAVE_PATH[] = "save_path";
const char KEY_TORRENT_CONTENT_PATH[] = "content_path";
const char KEY_TORRENT_ADDED_ON[] = "added_on";
const char KEY_TORRENT_COMPLETION_ON[] = "completion_on";
const char KEY_TORRENT_TRACKER[] = "tracker";
const char KEY_TORRENT_TRACKERS_COUNT[] = "trackers_count";
const char KEY_TORRENT_DL_LIMIT[] = "dl_limit";
const char KEY_TORRENT_UP_LIMIT[] = "up_limit";
const char KEY_TORRENT_AMOUNT_DOWNLOADED[] = "downloaded";
const char KEY_TORRENT_AMOUNT_UPLOADED[] = "uploaded";
const char KEY_TORRENT_AMOUNT_DOWNLOADED_SESSION[] = "downloaded_session";
const char KEY_TORRENT_AMOUNT_UPLOADED_SESSION[] = "uploaded_session";
const char KEY_TORRENT_AMOUNT_LEFT[] = "amount_left";
const char KEY_TORRENT_AMOUNT_COMPLETED[] = "completed";
const char KEY_TORRENT_MAX_RATIO[] = "max_ratio";
const char KEY_TORRENT_MAX_SEEDING_TIME[] = "max_seeding_time";
const char KEY_TORRENT_RATIO_LIMIT[] = "ratio_limit";
const char KEY_TORRENT_SEEDING_TIME_LIMIT[] = "seeding_time_limit";
const char KEY_TORRENT_LAST_SEEN_COMPLETE_TIME[] = "seen_complete";
const char KEY_TORRENT_LAST_ACTIVITY_TIME[] = "last_activity";
const char KEY_TORRENT_TOTAL_SIZE[] = "total_size";
const char KEY_TORRENT_AUTO_TORRENT_MANAGEMENT[] = "auto_tmm";
const char KEY_TORRENT_TIME_ACTIVE[] = "time_active";
const char KEY_TORRENT_SEEDING_TIME[] = "seeding_time";
const char KEY_TORRENT_AVAILABILITY[] = "availability";
inline const char KEY_TORRENT_ID[] = "hash";
inline const char KEY_TORRENT_NAME[] = "name";
inline const char KEY_TORRENT_MAGNET_URI[] = "magnet_uri";
inline const char KEY_TORRENT_SIZE[] = "size";
inline const char KEY_TORRENT_PROGRESS[] = "progress";
inline const char KEY_TORRENT_DLSPEED[] = "dlspeed";
inline const char KEY_TORRENT_UPSPEED[] = "upspeed";
inline const char KEY_TORRENT_QUEUE_POSITION[] = "priority";
inline const char KEY_TORRENT_SEEDS[] = "num_seeds";
inline const char KEY_TORRENT_NUM_COMPLETE[] = "num_complete";
inline const char KEY_TORRENT_LEECHS[] = "num_leechs";
inline const char KEY_TORRENT_NUM_INCOMPLETE[] = "num_incomplete";
inline const char KEY_TORRENT_RATIO[] = "ratio";
inline const char KEY_TORRENT_ETA[] = "eta";
inline const char KEY_TORRENT_STATE[] = "state";
inline const char KEY_TORRENT_SEQUENTIAL_DOWNLOAD[] = "seq_dl";
inline const char KEY_TORRENT_FIRST_LAST_PIECE_PRIO[] = "f_l_piece_prio";
inline const char KEY_TORRENT_CATEGORY[] = "category";
inline const char KEY_TORRENT_TAGS[] = "tags";
inline const char KEY_TORRENT_SUPER_SEEDING[] = "super_seeding";
inline const char KEY_TORRENT_FORCE_START[] = "force_start";
inline const char KEY_TORRENT_SAVE_PATH[] = "save_path";
inline const char KEY_TORRENT_CONTENT_PATH[] = "content_path";
inline const char KEY_TORRENT_ADDED_ON[] = "added_on";
inline const char KEY_TORRENT_COMPLETION_ON[] = "completion_on";
inline const char KEY_TORRENT_TRACKER[] = "tracker";
inline const char KEY_TORRENT_TRACKERS_COUNT[] = "trackers_count";
inline const char KEY_TORRENT_DL_LIMIT[] = "dl_limit";
inline const char KEY_TORRENT_UP_LIMIT[] = "up_limit";
inline const char KEY_TORRENT_AMOUNT_DOWNLOADED[] = "downloaded";
inline const char KEY_TORRENT_AMOUNT_UPLOADED[] = "uploaded";
inline const char KEY_TORRENT_AMOUNT_DOWNLOADED_SESSION[] = "downloaded_session";
inline const char KEY_TORRENT_AMOUNT_UPLOADED_SESSION[] = "uploaded_session";
inline const char KEY_TORRENT_AMOUNT_LEFT[] = "amount_left";
inline const char KEY_TORRENT_AMOUNT_COMPLETED[] = "completed";
inline const char KEY_TORRENT_MAX_RATIO[] = "max_ratio";
inline const char KEY_TORRENT_MAX_SEEDING_TIME[] = "max_seeding_time";
inline const char KEY_TORRENT_RATIO_LIMIT[] = "ratio_limit";
inline const char KEY_TORRENT_SEEDING_TIME_LIMIT[] = "seeding_time_limit";
inline const char KEY_TORRENT_LAST_SEEN_COMPLETE_TIME[] = "seen_complete";
inline const char KEY_TORRENT_LAST_ACTIVITY_TIME[] = "last_activity";
inline const char KEY_TORRENT_TOTAL_SIZE[] = "total_size";
inline const char KEY_TORRENT_AUTO_TORRENT_MANAGEMENT[] = "auto_tmm";
inline const char KEY_TORRENT_TIME_ACTIVE[] = "time_active";
inline const char KEY_TORRENT_SEEDING_TIME[] = "seeding_time";
inline const char KEY_TORRENT_AVAILABILITY[] = "availability";
QVariantMap serialize(const BitTorrent::Torrent &torrent);

3
src/webui/webapplication.cpp
View File

@@ -62,7 +62,8 @@
#include "api/torrentscontroller.h"
#include "api/transfercontroller.h"
constexpr int MAX_ALLOWED_FILESIZE = 10 * 1024 * 1024;
const int MAX_ALLOWED_FILESIZE = 10 * 1024 * 1024;
const char C_SID[] = "SID"; // name of session id cookie
const QString PATH_PREFIX_ICONS {QStringLiteral("/icons/")};
const QString WWW_FOLDER {QStringLiteral(":/www")};

4
src/webui/webapplication.h
View File

@@ -43,13 +43,11 @@
#include "base/utils/net.h"
#include "base/utils/version.h"
constexpr Utils::Version<int, 3, 2> API_VERSION {2, 8, 2};
inline const Utils::Version<int, 3, 2> API_VERSION {2, 8, 3};
class APIController;
class WebApplication;
constexpr char C_SID[] = "SID"; // name of session id cookie
class WebSession final : public ISession
{
public:

10
src/webui/www/private/views/preferences.html
View File

@@ -1055,6 +1055,14 @@
<input type="text" id="sendBufferWatermarkFactor" style="width: 15em;" />&nbsp;&nbsp;%
</td>
</tr>
<tr>
<td>
<label for="connectionSpeed">QBT_TR(Outgoing connections per second:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#connection_speed" target="_blank">(?)</a></label>
</td>
<td>
<input type="text" id="connectionSpeed" style="width: 15em;" />
</td>
</tr>
<tr>
<td>
<label for="socketBacklogSize">QBT_TR(Socket backlog size:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#listen_queue_size" target="_blank">(?)</a></label>
@@ -1905,6 +1913,7 @@
$('sendBufferWatermark').setProperty('value', pref.send_buffer_watermark);
$('sendBufferLowWatermark').setProperty('value', pref.send_buffer_low_watermark);
$('sendBufferWatermarkFactor').setProperty('value', pref.send_buffer_watermark_factor);
$('connectionSpeed').setProperty('value', pref.connection_speed);
$('socketBacklogSize').setProperty('value', pref.socket_backlog_size);
$('outgoingPortsMin').setProperty('value', pref.outgoing_ports_min);
$('outgoingPortsMax').setProperty('value', pref.outgoing_ports_max);
@@ -2295,6 +2304,7 @@
settings.set('send_buffer_watermark', $('sendBufferWatermark').getProperty('value'));
settings.set('send_buffer_low_watermark', $('sendBufferLowWatermark').getProperty('value'));
settings.set('send_buffer_watermark_factor', $('sendBufferWatermarkFactor').getProperty('value'));
settings.set('connection_speed', $('connectionSpeed').getProperty('value'));
settings.set('socket_backlog_size', $('socketBacklogSize').getProperty('value'));
settings.set('outgoing_ports_min', $('outgoingPortsMin').getProperty('value'));
settings.set('outgoing_ports_max', $('outgoingPortsMax').getProperty('value'));