Backport changes to v4.3.x branch

README.md

@@ -1,7 +1,6 @@
 qBittorrent - A BitTorrent client in Qt
 ------------------------------------------
 
-[![TravisCI Status](https://travis-ci.org/qbittorrent/qBittorrent.svg?branch=master)](https://travis-ci.org/qbittorrent/qBittorrent)
 [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/qbittorrent/qBittorrent?branch=master&svg=true)](https://ci.appveyor.com/project/qbittorrent/qBittorrent)
 [![GitHub Actions CI Status](https://github.com/qbittorrent/qBittorrent/workflows/GitHub%20Actions%20CI/badge.svg)](https://github.com/qbittorrent/qBittorrent/actions)
 [![Coverity Status](https://scan.coverity.com/projects/5494/badge.svg)](https://scan.coverity.com/projects/5494)

src/base/bittorrent/torrent.h

@@ -94,12 +94,6 @@ namespace BitTorrent
  Error
  };
 
- struct TrackerInfo
- {
- QString lastMessage;
- int numPeers = 0;
- };
-
  uint qHash(TorrentState key, uint seed);
 
  class Torrent : public AbstractFileStorage
@@ -221,7 +215,6 @@ namespace BitTorrent
  virtual bool hasFilteredPieces() const = 0;
  virtual int queuePosition() const = 0;
  virtual QVector<TrackerEntry> trackers() const = 0;
- virtual QHash<QString, TrackerInfo> trackerInfos() const = 0;
  virtual QVector<QUrl> urlSeeds() const = 0;
  virtual QString error() const = 0;
  virtual qlonglong totalDownload() const = 0;

src/base/bittorrent/torrentimpl.cpp

@@ -96,16 +96,20 @@ namespace
  }
 
 #if (LIBTORRENT_VERSION_NUM >= 20000)
- TrackerEntry fromNativeAnnouncerEntry(const lt::announce_entry &nativeEntry, const lt::info_hash_t &hashes)
+ TrackerEntry fromNativeAnnouncerEntry(const lt::announce_entry &nativeEntry
+ , const lt::info_hash_t &hashes, const QMap<lt::tcp::endpoint, int> &trackerPeerCounts)
 #else
- TrackerEntry fromNativeAnnouncerEntry(const lt::announce_entry &nativeEntry)
+ TrackerEntry fromNativeAnnouncerEntry(const lt::announce_entry &nativeEntry
+ , const QMap<lt::tcp::endpoint, int> &trackerPeerCounts)
 #endif
  {
  TrackerEntry trackerEntry {QString::fromStdString(nativeEntry.url), nativeEntry.tier};
 
  int numUpdating = 0;
  int numWorking = 0;
  int numNotWorking = 0;
+ QString firstTrackerMessage;
+ QString firstErrorMessage;
 #if (LIBTORRENT_VERSION_NUM >= 20000)
  const int numEndpoints = nativeEntry.endpoints.size() * ((hashes.has_v1() && hashes.has_v2()) ? 2 : 1);
  trackerEntry.endpoints.reserve(numEndpoints);
@@ -119,9 +123,11 @@ namespace
 
  TrackerEntry::EndpointStats trackerEndpoint;
  trackerEndpoint.protocolVersion = (protocolVersion == lt::protocol_version::V1) ? 1 : 2;
+ trackerEndpoint.numPeers = trackerPeerCounts.value(endpoint.local_endpoint, -1);
  trackerEndpoint.numSeeds = infoHash.scrape_complete;
  trackerEndpoint.numLeeches = infoHash.scrape_incomplete;
  trackerEndpoint.numDownloaded = infoHash.scrape_downloaded;
+
  if (infoHash.updating)
  {
  trackerEndpoint.status = TrackerEntry::Updating;
@@ -141,11 +147,21 @@ namespace
  {
  trackerEndpoint.status = TrackerEntry::NotContacted;
  }
- trackerEntry.endpoints.append(trackerEndpoint);
 
- trackerEntry.numSeeds = std::max(trackerEntry.numSeeds, infoHash.scrape_complete);
- trackerEntry.numLeeches = std::max(trackerEntry.numLeeches, infoHash.scrape_incomplete);
- trackerEntry.numDownloaded = std::max(trackerEntry.numDownloaded, infoHash.scrape_downloaded);
+ const QString trackerMessage = QString::fromStdString(infoHash.message);
+ const QString errorMessage = QString::fromLocal8Bit(infoHash.last_error.message().c_str());
+ trackerEndpoint.message = (!trackerMessage.isEmpty() ? trackerMessage : errorMessage);
+
+ trackerEntry.endpoints.append(trackerEndpoint);
+ trackerEntry.numPeers = std::max(trackerEntry.numPeers, trackerEndpoint.numPeers);
+ trackerEntry.numSeeds = std::max(trackerEntry.numSeeds, trackerEndpoint.numSeeds);
+ trackerEntry.numLeeches = std::max(trackerEntry.numLeeches, trackerEndpoint.numLeeches);
+ trackerEntry.numDownloaded = std::max(trackerEntry.numDownloaded, trackerEndpoint.numDownloaded);
+
+ if (firstTrackerMessage.isEmpty())
+ firstTrackerMessage = trackerMessage;
+ if (firstErrorMessage.isEmpty())
+ firstErrorMessage = errorMessage;
  }
  }
  }
@@ -155,9 +171,11 @@ namespace
  for (const lt::announce_endpoint &endpoint : nativeEntry.endpoints)
  {
  TrackerEntry::EndpointStats trackerEndpoint;
+ trackerEndpoint.numPeers = trackerPeerCounts.value(endpoint.local_endpoint, -1);
  trackerEndpoint.numSeeds = endpoint.scrape_complete;
  trackerEndpoint.numLeeches = endpoint.scrape_incomplete;
  trackerEndpoint.numDownloaded = endpoint.scrape_downloaded;
+
  if (endpoint.updating)
  {
  trackerEndpoint.status = TrackerEntry::Updating;
@@ -177,22 +195,40 @@ namespace
  {
  trackerEndpoint.status = TrackerEntry::NotContacted;
  }
- trackerEntry.endpoints.append(trackerEndpoint);
 
- trackerEntry.numSeeds = std::max(trackerEntry.numSeeds, endpoint.scrape_complete);
- trackerEntry.numLeeches = std::max(trackerEntry.numLeeches, endpoint.scrape_incomplete);
- trackerEntry.numDownloaded = std::max(trackerEntry.numDownloaded, endpoint.scrape_downloaded);
+ const QString trackerMessage = QString::fromStdString(endpoint.message);
+ const QString errorMessage = QString::fromLocal8Bit(endpoint.last_error.message().c_str());
+ trackerEndpoint.message = (!trackerMessage.isEmpty() ? trackerMessage : errorMessage);
+
+ trackerEntry.endpoints.append(trackerEndpoint);
+ trackerEntry.numPeers = std::max(trackerEntry.numPeers, trackerEndpoint.numPeers);
+ trackerEntry.numSeeds = std::max(trackerEntry.numSeeds, trackerEndpoint.numSeeds);
+ trackerEntry.numLeeches = std::max(trackerEntry.numLeeches, trackerEndpoint.numLeeches);
+ trackerEntry.numDownloaded = std::max(trackerEntry.numDownloaded, trackerEndpoint.numDownloaded);
+
+ if (firstTrackerMessage.isEmpty())
+ firstTrackerMessage = trackerMessage;
+ if (firstErrorMessage.isEmpty())
+ firstErrorMessage = errorMessage;
  }
 #endif
 
  if (numEndpoints > 0)
  {
  if (numUpdating > 0)
+ {
  trackerEntry.status = TrackerEntry::Updating;
+ }
  else if (numWorking > 0)
+ {
  trackerEntry.status = TrackerEntry::Working;
+ trackerEntry.message = firstTrackerMessage;
+ }
  else if (numNotWorking == numEndpoints)
+ {
  trackerEntry.status = TrackerEntry::NotWorking;
+ trackerEntry.message = (!firstTrackerMessage.isEmpty() ? firstTrackerMessage : firstErrorMessage);
+ }
  }
 
  return trackerEntry;
@@ -439,20 +475,18 @@ QVector<TrackerEntry> TorrentImpl::trackers() const
  entries.reserve(nativeTrackers.size());
 
  for (const lt::announce_entry &tracker : nativeTrackers)
+ {
+ const QString trackerURL = QString::fromStdString(tracker.url);
 #if (LIBTORRENT_VERSION_NUM >= 20000)
- entries << fromNativeAnnouncerEntry(tracker, m_nativeHandle.info_hashes());
+ entries << fromNativeAnnouncerEntry(tracker, m_nativeHandle.info_hashes(), m_trackerPeerCounts[trackerURL]);
 #else
- entries << fromNativeAnnouncerEntry(tracker);
+ entries << fromNativeAnnouncerEntry(tracker, m_trackerPeerCounts[trackerURL]);
 #endif
+ }
 
  return entries;
 }
 
-QHash<QString, TrackerInfo> TorrentImpl::trackerInfos() const
-{
- return m_trackerInfos;
-}
-
 void TorrentImpl::addTrackers(const QVector<TrackerEntry> &trackers)
 {
  QSet<TrackerEntry> currentTrackers;
@@ -1627,31 +1661,21 @@ void TorrentImpl::handleMoveStorageJobFinished(const bool hasOutstandingJob)
 
 void TorrentImpl::handleTrackerReplyAlert(const lt::tracker_reply_alert *p)
 {
- const QString trackerUrl(p->tracker_url());
- qDebug("Received a tracker reply from %s (Num_peers = %d)", qUtf8Printable(trackerUrl), p->num_peers);
- // Connection was successful now. Remove possible old errors
- m_trackerInfos[trackerUrl] = {{}, p->num_peers};
+ const QString trackerUrl = p->tracker_url();
+ m_trackerPeerCounts[trackerUrl][p->local_endpoint] = p->num_peers;
 
  m_session->handleTorrentTrackerReply(this, trackerUrl);
 }
 
 void TorrentImpl::handleTrackerWarningAlert(const lt::tracker_warning_alert *p)
 {
  const QString trackerUrl = p->tracker_url();
- const QString message = p->warning_message();
-
- // Connection was successful now but there is a warning message
- m_trackerInfos[trackerUrl].lastMessage = message; // Store warning message
-
  m_session->handleTorrentTrackerWarning(this, trackerUrl);
 }
 
 void TorrentImpl::handleTrackerErrorAlert(const lt::tracker_error_alert *p)
 {
  const QString trackerUrl = p->tracker_url();
- const QString message = p->error_message();
-
- m_trackerInfos[trackerUrl].lastMessage = message;
 
  // Starting with libtorrent 1.2.x each tracker has multiple local endpoints from which
  // an announce is attempted. Some endpoints might succeed while others might fail.