Merge pull request #1085 from vktr/fix/tracker-tier-removing

Fix removing trackers and tiers
picotorrent · Dec 27, 2020 · a8733db · a8733db
2 parents 4e8b60d + 80ede85
commit a8733db
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/picotorrent/ui/models/trackerlistmodel.cpp b/src/picotorrent/ui/models/trackerlistmodel.cpp
@@ -53,7 +53,7 @@ void TrackerListModel::Update(BitTorrent::TorrentHandle* torrent)
     if (m_dht == nullptr)
     {
         m_dht = std::make_shared<ListItem>();
-        m_dht->key = L"DHT";
+        m_dht->key = "DHT";
         m_dht->tier = -1;
 
         m_items.insert(
@@ -66,7 +66,7 @@ void TrackerListModel::Update(BitTorrent::TorrentHandle* torrent)
     if (m_lsd == nullptr)
     {
         m_lsd = std::make_shared<ListItem>();
-        m_lsd->key = L"LSD";
+        m_lsd->key = "LSD";
         m_lsd->tier = -1;
 
         m_items.insert(
@@ -79,7 +79,7 @@ void TrackerListModel::Update(BitTorrent::TorrentHandle* torrent)
     if (m_pex == nullptr)
     {
         m_pex = std::make_shared<ListItem>();
-        m_pex->key = L"PeX";
+        m_pex->key = "PeX";
         m_pex->tier = -1;
 
         m_items.insert(
@@ -144,7 +144,7 @@ void TrackerListModel::Update(BitTorrent::TorrentHandle* torrent)
                 trackers.end(),
                 [tierIterator, trackerIterator](lt::announce_entry const& ae)
                 {
-                    return Utils::toStdWString(ae.url) == (*trackerIterator)->key
+                    return ae.url == (*trackerIterator)->key
                         && ae.tier == (*tierIterator)->tier;
                 });
 
@@ -191,7 +191,7 @@ void TrackerListModel::Update(BitTorrent::TorrentHandle* torrent)
         if (tierIter == m_items.end())
         {
             auto newTier = std::make_shared<ListItem>();
-            newTier->key = fmt::format(i18n("tier_n"), iter->tier);
+            newTier->key = Utils::toStdString(fmt::format(i18n("tier_n"), iter->tier));
             newTier->tier = iter->tier;
 
             m_items.push_back(newTier);
@@ -217,13 +217,13 @@ void TrackerListModel::Update(BitTorrent::TorrentHandle* torrent)
             [iter](auto const& itm)
             {
                 return itm->tier == iter->tier
-                    && itm->key == Utils::toStdWString(iter->url);
+                    && itm->key == iter->url;
             });
 
         if (trackerIter == (*tierIter)->children.end())
         {
             auto newTracker = std::make_shared<ListItem>();
-            newTracker->key = Utils::toStdWString(iter->url);
+            newTracker->key = iter->url;
             newTracker->parent = (*tierIter);
             newTracker->tier = iter->tier;
 
@@ -301,7 +301,7 @@ void TrackerListModel::GetValue(wxVariant& variant, const wxDataViewItem& item,
     {
     case Column::Url:
     {
-        variant = li->key;
+        variant = Utils::toStdWString(li->key);
         break;
     }
     case Column::Status:

diff --git a/src/picotorrent/ui/models/trackerlistmodel.hpp b/src/picotorrent/ui/models/trackerlistmodel.hpp
@@ -47,7 +47,7 @@ namespace Models
 
         struct ListItem
         {
-            std::wstring key;
+            std::string key;
             int tier;
             ListItemStatus status;
             int numDownloaded;

diff --git a/src/picotorrent/ui/torrentdetailstrackerspanel.cpp b/src/picotorrent/ui/torrentdetailstrackerspanel.cpp
@@ -188,7 +188,10 @@ void TorrentDetailsTrackersPanel::ShowTrackerContextMenu(wxDataViewEvent& evt)
                     return ae.tier == item->tier && ae.url == item->key;
                 });
 
-            if (selectedTracker == originalTrackers.end())
+            if ((evt.GetId() == ptID_CONTEXT_MENU_COPY_URL
+                || evt.GetId() == ptID_CONTEXT_MENU_FORCE_REANNOUNCE
+                || evt.GetId() == ptID_CONTEXT_MENU_SCRAPE)
+                && selectedTracker == originalTrackers.end())
             {
                 BOOST_LOG_TRIVIAL(warning) << "Could not find selected tracker in torrent trackers: " << item->key;
                 return;