Respect tracker tier when adding trackers

zyrill · May 15, 2021 · 7a8f438 · 7a8f438
1 parent 257a506
commit 7a8f438
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/src/picotorrent/ui/dialogs/addtrackerdialog.cpp b/src/picotorrent/ui/dialogs/addtrackerdialog.cpp
@@ -79,3 +79,8 @@ std::string AddTrackerDialog::GetUrl()
 {
     return m_url->GetValue().ToStdString();
 }
+
+void AddTrackerDialog::SetTier(int tier)
+{
+    m_tier->SetValue(std::to_string(tier));
+}
diff --git a/src/picotorrent/ui/dialogs/addtrackerdialog.hpp b/src/picotorrent/ui/dialogs/addtrackerdialog.hpp
@@ -19,6 +19,7 @@ namespace Dialogs
 
         int GetTier();
         std::string GetUrl();
+        void SetTier(int tier);
 
     private:
         wxTextCtrl* m_url;

diff --git a/src/picotorrent/ui/torrentdetailstrackerspanel.cpp b/src/picotorrent/ui/torrentdetailstrackerspanel.cpp
@@ -128,22 +128,23 @@ void TorrentDetailsTrackersPanel::ShowTrackerContextMenu(wxDataViewEvent& evt)
             wxEVT_MENU,
             [this](wxCommandEvent const&)
             {
+                auto trackers = m_torrent->Trackers();
+                auto maxTier = std::max_element(
+                    trackers.begin(),
+                    trackers.end(),
+                    [](lt::announce_entry const& lhs, lt::announce_entry const& rhs)
+                    { return lhs.tier < rhs.tier; });
+
                 Dialogs::AddTrackerDialog addDialog(this, wxID_ANY);
+                addDialog.SetTier(maxTier != trackers.end() ? maxTier->tier + 1 : 0);
 
                 if (addDialog.ShowModal() == wxID_OK
                     && addDialog.GetUrl().size() > 0)
                 {
-                    // Get max tier
-                    auto trackers = m_torrent->Trackers();
-                    auto maxTier = std::max_element(
-                        trackers.begin(),
-                        trackers.end(),
-                        [](lt::announce_entry const& lhs, lt::announce_entry const& rhs)
-                        { return lhs.tier < rhs.tier; });
-
                     lt::announce_entry ae;
-                    ae.tier = maxTier != trackers.end() ? maxTier->tier + 1 : 0;
+                    ae.tier = addDialog.GetTier();
                     ae.url = addDialog.GetUrl();
+
                     m_torrent->AddTracker(ae);
                     m_trackersModel->Update(m_torrent);
                 }