Merge pull request #1072 from vktr/feature/connections-limit

Add setting for connections limit
picotorrent · Dec 19, 2020 · 72c28c2 · 72c28c2
2 parents b464b62 + eb38f8d
commit 72c28c2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 0 deletions.
diff --git a/lang/en-US.json b/lang/en-US.json
@@ -215,5 +215,6 @@
     "tier": "Tier",
     "some_torrents_already_in_session": "Some of the torrents are already added and will be skipped",
     "all_torrents_already_in_session": "All torrents are already added and will be skipped",
+    "connections": "Connections",
     "view_help": "View &Help"
 }
diff --git a/res/dbmigrations/20201219222232_insert_connections_limit.sql b/res/dbmigrations/20201219222232_insert_connections_limit.sql
@@ -0,0 +1,2 @@
+INSERT INTO setting (key, value, default_value)
+VALUES ('libtorrent.connections_limit', NULL, '200');
diff --git a/src/picotorrent/bittorrent/session.cpp b/src/picotorrent/bittorrent/session.cpp
@@ -148,6 +148,7 @@ static lt::settings_pack getSettingsPack(std::shared_ptr<pt::Core::Configuration
     settings.set_int(lt::settings_pack::active_lsd_limit, cfg->Get<int>("libtorrent.active_lsd_limit").value());
     settings.set_int(lt::settings_pack::active_seeds, cfg->Get<int>("libtorrent.active_seeds").value());
     settings.set_int(lt::settings_pack::active_tracker_limit, cfg->Get<int>("libtorrent.active_tracker_limit").value());
+    settings.set_int(lt::settings_pack::connections_limit, cfg->Get<int>("libtorrent.connections_limit").value());
 
     // Tracker things
     settings.set_bool(lt::settings_pack::announce_to_all_tiers, cfg->Get<bool>("libtorrent.announce_to_all_tiers").value());

diff --git a/src/picotorrent/resources.rc b/src/picotorrent/resources.rc
@@ -27,6 +27,7 @@ ICO_TERMINAL ICON "..\\..\\res\\terminal.ico"
 20201015200912_insert_console_settings          DBMIGRATION "..\\..\\res\\dbmigrations\\20201015200912_insert_console_settings.sql"
 20201027213145_insert_overview_columns          DBMIGRATION "..\\..\\res\\dbmigrations\\20201027213145_insert_overview_columns.sql"
 20201107234213_setup_filters                    DBMIGRATION "..\\..\\res\\dbmigrations\\20201107234213_setup_filters.sql"
+20201219222232_insert_connections_limit         DBMIGRATION "..\\..\\res\\dbmigrations\\20201219222232_insert_connections_limit.sql"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION        VER_FILE_VERSION

diff --git a/src/picotorrent/ui/dialogs/preferencesdownloadspage.cpp b/src/picotorrent/ui/dialogs/preferencesdownloadspage.cpp
@@ -92,13 +92,19 @@ PreferencesDownloadsPage::PreferencesDownloadsPage(wxWindow* parent, std::shared
     m_activeSeedsLimit->SetValidator(wxTextValidator(wxFILTER_DIGITS));
     m_activeSeedsLimit->SetValue(std::to_string(m_cfg->Get<int>("libtorrent.active_seeds").value()));
 
+    m_connectionsLimit = new wxTextCtrl(limitsSizer->GetStaticBox(), wxID_ANY);
+    m_connectionsLimit->SetValidator(wxTextValidator(wxFILTER_DIGITS));
+    m_connectionsLimit->SetValue(std::to_string(m_cfg->Get<int>("libtorrent.connections_limit").value()));
+
     activeLimitsGrid->AddGrowableCol(0, 1);
     activeLimitsGrid->Add(new wxStaticText(limitsSizer->GetStaticBox(), wxID_ANY, i18n("total_active")));
     activeLimitsGrid->Add(m_activeLimit, 0, wxALIGN_RIGHT);
     activeLimitsGrid->Add(new wxStaticText(limitsSizer->GetStaticBox(), wxID_ANY, i18n("active_downloads")));
     activeLimitsGrid->Add(m_activeDownloadsLimit, 0, wxALIGN_RIGHT);
     activeLimitsGrid->Add(new wxStaticText(limitsSizer->GetStaticBox(), wxID_ANY, i18n("active_seeds")));
     activeLimitsGrid->Add(m_activeSeedsLimit, 0, wxALIGN_RIGHT);
+    activeLimitsGrid->Add(new wxStaticText(limitsSizer->GetStaticBox(), wxID_ANY, i18n("connections")));
+    activeLimitsGrid->Add(m_connectionsLimit, 0, wxALIGN_RIGHT);
 
     limitsSizer->Add(transferLimitsGrid, 0, wxEXPAND | wxALL, 5);
     limitsSizer->Add(new wxStaticLine(limitsSizer->GetStaticBox(), wxID_ANY), 0, wxEXPAND | wxALL, 5);
@@ -157,9 +163,13 @@ void PreferencesDownloadsPage::Save()
     long activeSeeds = 0;
     m_activeSeedsLimit->GetValue().ToLong(&activeSeeds);
 
+    long connectionsLimit = 0;
+    m_connectionsLimit->GetValue().ToLong(&connectionsLimit);
+
     m_cfg->Set("libtorrent.active_limit", static_cast<int>(activeLimit));
     m_cfg->Set("libtorrent.active_downloads", static_cast<int>(activeDownloads));
     m_cfg->Set("libtorrent.active_seeds", static_cast<int>(activeSeeds));
+    m_cfg->Set("libtorrent.connections_limit", static_cast<int>(connectionsLimit));
 }
 
 bool PreferencesDownloadsPage::IsValid()

diff --git a/src/picotorrent/ui/dialogs/preferencesdownloadspage.hpp b/src/picotorrent/ui/dialogs/preferencesdownloadspage.hpp
@@ -42,6 +42,7 @@ namespace Dialogs
         wxTextCtrl* m_activeLimit;
         wxTextCtrl* m_activeDownloadsLimit;
         wxTextCtrl* m_activeSeedsLimit;
+        wxTextCtrl* m_connectionsLimit;
     };
 }
 }