Allow to fetch data asynchronously

src/gui/properties/peerlistwidget.cpp

@@ -37,6 +37,7 @@
 #include <QHostAddress>
 #include <QMenu>
 #include <QMessageBox>
+#include <QPointer>
 #include <QSet>
 #include <QShortcut>
 #include <QSortFilterProxyModel>
@@ -392,38 +393,47 @@ void PeerListWidget::saveSettings() const
 
 void PeerListWidget::loadPeers(const BitTorrent::Torrent *torrent)
 {
-    if (!torrent) return;
+    if (!torrent)
+        return;
 
-    const QVector<BitTorrent::PeerInfo> peers = torrent->peers();
-    QSet<PeerEndpoint> existingPeers;
-    for (auto i = m_peerItems.cbegin(); i != m_peerItems.cend(); ++i)
-        existingPeers << i.key();
-
-    for (const BitTorrent::PeerInfo &peer : peers)
+    using TorrentPtr = QPointer<const BitTorrent::Torrent>;
+    torrent->fetchPeerInfo([this, torrent = TorrentPtr(torrent)](const QVector<BitTorrent::PeerInfo> &peers)
     {
-        if (peer.address().ip.isNull()) continue;
+        if (torrent != m_properties->getCurrentTorrent())
+            return;
 
-        bool isNewPeer = false;
-        updatePeer(torrent, peer, isNewPeer);
-        if (!isNewPeer)
+        QSet<PeerEndpoint> existingPeers;
+        existingPeers.reserve(m_peerItems.size());
+        for (auto i = m_peerItems.cbegin(); i != m_peerItems.cend(); ++i)
+            existingPeers.insert(i.key());
+
+        for (const BitTorrent::PeerInfo &peer : peers)
         {
-            const PeerEndpoint peerEndpoint {peer.address(), peer.connectionType()};
-            existingPeers.remove(peerEndpoint);
+            if (peer.address().ip.isNull())
+                continue;
+
+            bool isNewPeer = false;
+            updatePeer(torrent, peer, isNewPeer);
+            if (!isNewPeer)
+            {
+                const PeerEndpoint peerEndpoint {peer.address(), peer.connectionType()};
+                existingPeers.remove(peerEndpoint);
+            }
         }
-    }
 
-    // Remove peers that are gone
-    for (const PeerEndpoint &peerEndpoint : asConst(existingPeers))
-    {
-        QStandardItem *item = m_peerItems.take(peerEndpoint);
+        // Remove peers that are gone
+        for (const PeerEndpoint &peerEndpoint : asConst(existingPeers))
+        {
+            QStandardItem *item = m_peerItems.take(peerEndpoint);
 
-        QSet<QStandardItem *> &items = m_itemsByIP[peerEndpoint.address.ip];
-        items.remove(item);
-        if (items.isEmpty())
-            m_itemsByIP.remove(peerEndpoint.address.ip);
+            QSet<QStandardItem *> &items = m_itemsByIP[peerEndpoint.address.ip];
+            items.remove(item);
+            if (items.isEmpty())
+                m_itemsByIP.remove(peerEndpoint.address.ip);
 
-        m_listModel->removeRow(item->row());
-    }
+            m_listModel->removeRow(item->row());
+        }
+    });
 }
 
 void PeerListWidget::updatePeer(const BitTorrent::Torrent *torrent, const BitTorrent::PeerInfo &peer, bool &isNewPeer)
@@ -433,7 +443,7 @@ void PeerListWidget::updatePeer(const BitTorrent::Torrent *torrent, const BitTor
     const Qt::Alignment intDataTextAlignment = Qt::AlignRight | Qt::AlignVCenter;
 
     const auto setModelData =
-        [this] (const int row, const int column, const QString &displayData
+        [this](const int row, const int column, const QString &displayData
                 , const QVariant &underlyingData, const Qt::Alignment textAlignmentData = {}
                 , const QString &toolTip = {})
     {

src/gui/properties/propertieswidget.cpp

@@ -34,6 +34,7 @@
 #include <QHeaderView>
 #include <QListWidgetItem>
 #include <QMenu>
+#include <QPointer>
 #include <QSplitter>
 #include <QShortcut>
 #include <QStackedWidget>
@@ -498,13 +499,20 @@ void PropertiesWidget::loadDynamicData()
 
             if (m_torrent->hasMetadata())
             {
+                using TorrentPtr = QPointer<BitTorrent::Torrent>;
+
                 m_ui->labelTotalPiecesVal->setText(tr("%1 x %2 (have %3)", "(torrent pieces) eg 152 x 4MB (have 25)").arg(m_torrent->piecesCount()).arg(Utils::Misc::friendlyUnit(m_torrent->pieceLength())).arg(m_torrent->piecesHave()));
 
                 if (!m_torrent->isSeed() && !m_torrent->isPaused() && !m_torrent->isQueued() && !m_torrent->isChecking())
                 {
                     // Pieces availability
                     showPiecesAvailability(true);
-                    m_piecesAvailability->setAvailability(m_torrent->pieceAvailability());
+                    m_torrent->fetchPieceAvailability([this, torrent = TorrentPtr(m_torrent)](const QVector<int> &pieceAvailability)
+                    {
+                        if (torrent == m_torrent)
+                            m_piecesAvailability->setAvailability(pieceAvailability);
+                    });
+
                     m_ui->labelAverageAvailabilityVal->setText(Utils::String::fromDouble(m_torrent->distributedCopies(), 3));
                 }
                 else
@@ -515,7 +523,12 @@ void PropertiesWidget::loadDynamicData()
                 // Progress
                 qreal progress = m_torrent->progress() * 100.;
                 m_ui->labelProgressVal->setText(Utils::String::fromDouble(progress, 1) + u'%');
-                m_downloadedPieces->setProgress(m_torrent->pieces(), m_torrent->downloadingPieces());
+
+                m_torrent->fetchDownloadingPieces([this, torrent = TorrentPtr(m_torrent)](const QBitArray &downloadingPieces)
+                {
+                    if (torrent == m_torrent)
+                        m_downloadedPieces->setProgress(m_torrent->pieces(), downloadingPieces);
+                });
             }
             else
             {
@@ -538,6 +551,19 @@ void PropertiesWidget::loadDynamicData()
             qDebug("Updating priorities in files tab");
             m_ui->filesList->setUpdatesEnabled(false);
 
+            using TorrentPtr = QPointer<BitTorrent::Torrent>;
+            m_torrent->fetchFilesProgress([this, torrent = TorrentPtr(m_torrent)](const QVector<qreal> &filesProgress)
+            {
+                if (torrent == m_torrent)
+                    m_propListModel->model()->updateFilesProgress(filesProgress);
+            });
+
+            m_torrent->fetchAvailableFileFractions([this, torrent = TorrentPtr(m_torrent)](const QVector<qreal> &availableFileFractions)
+            {
+                if (torrent == m_torrent)
+                    m_propListModel->model()->updateFilesAvailability(availableFileFractions);
+            });
+
             // Load torrent content if not yet done so
             const bool isContentInitialized = m_propListModel->model()->hasIndex(0, 0);
             if (!isContentInitialized)
@@ -546,9 +572,6 @@ void PropertiesWidget::loadDynamicData()
                 m_propListModel->model()->setupModelData(*m_torrent);
                 // Load file priorities
                 m_propListModel->model()->updateFilesPriorities(m_torrent->filePriorities());
-                // Update file progress/availability
-                m_propListModel->model()->updateFilesProgress(m_torrent->filesProgress());
-                m_propListModel->model()->updateFilesAvailability(m_torrent->availableFileFractions());
 
                 // Expand single-item folders recursively.
                 // This will trigger sorting and filtering so do it after all relevant data is loaded.
@@ -563,8 +586,6 @@ void PropertiesWidget::loadDynamicData()
             {
                 // Torrent content was loaded already, only make some updates
 
-                m_propListModel->model()->updateFilesProgress(m_torrent->filesProgress());
-                m_propListModel->model()->updateFilesAvailability(m_torrent->availableFileFractions());
                 // XXX: We don't update file priorities regularly for performance
                 // reasons. This means that priorities will not be updated if
                 // set from the Web UI.
@@ -583,15 +604,21 @@ void PropertiesWidget::loadUrlSeeds()
     if (!m_torrent)
         return;
 
-    m_ui->listWebSeeds->clear();
-    qDebug("Loading URL seeds");
-    const QVector<QUrl> hcSeeds = m_torrent->urlSeeds();
-    // Add url seeds
-    for (const QUrl &hcSeed : hcSeeds)
+    using TorrentPtr = QPointer<BitTorrent::Torrent>;
+    m_torrent->fetchURLSeeds([this, torrent = TorrentPtr(m_torrent)](const QVector<QUrl> &urlSeeds)
     {
-        qDebug("Loading URL seed: %s", qUtf8Printable(hcSeed.toString()));
-        new QListWidgetItem(hcSeed.toString(), m_ui->listWebSeeds);
-    }
+        if (torrent != m_torrent)
+            return;
+
+        m_ui->listWebSeeds->clear();
+        qDebug("Loading URL seeds");
+        // Add url seeds
+        for (const QUrl &urlSeed : urlSeeds)
+        {
+            qDebug("Loading URL seed: %s", qUtf8Printable(urlSeed.toString()));
+            new QListWidgetItem(urlSeed.toString(), m_ui->listWebSeeds);
+        }
+    });
 }
 
 Path PropertiesWidget::getFullPath(const QModelIndex &index) const

src/gui/properties/trackerlistwidget.cpp

@@ -36,6 +36,7 @@
 #include <QHeaderView>
 #include <QMenu>
 #include <QMessageBox>
+#include <QPointer>
 #include <QShortcut>
 #include <QStringList>
 #include <QTreeWidgetItem>
@@ -310,42 +311,50 @@ void TrackerListWidget::loadStickyItems(const BitTorrent::Torrent *torrent)
         m_LSDItem->setText(COL_MSG, privateMsg);
     }
 
-    // XXX: libtorrent should provide this info...
-    // Count peers from DHT, PeX, LSD
-    uint seedsDHT = 0, seedsPeX = 0, seedsLSD = 0, peersDHT = 0, peersPeX = 0, peersLSD = 0;
-    for (const BitTorrent::PeerInfo &peer : asConst(torrent->peers()))
+    using TorrentPtr = QPointer<const BitTorrent::Torrent>;
+    torrent->fetchPeerInfo([this, torrent = TorrentPtr(torrent)](const QVector<BitTorrent::PeerInfo> &peers)
     {
-        if (peer.isConnecting()) continue;
+        if (torrent != m_properties->getCurrentTorrent())
+            return;
 
-        if (peer.fromDHT())
+        // XXX: libtorrent should provide this info...
+        // Count peers from DHT, PeX, LSD
+        uint seedsDHT = 0, seedsPeX = 0, seedsLSD = 0, peersDHT = 0, peersPeX = 0, peersLSD = 0;
+        for (const BitTorrent::PeerInfo &peer : peers)
         {
-            if (peer.isSeed())
-                ++seedsDHT;
-            else
-                ++peersDHT;
-        }
-        if (peer.fromPeX())
-        {
-            if (peer.isSeed())
-                ++seedsPeX;
-            else
-                ++peersPeX;
-        }
-        if (peer.fromLSD())
-        {
-            if (peer.isSeed())
-                ++seedsLSD;
-            else
-                ++peersLSD;
-        }
-    }
+            if (peer.isConnecting())
+                continue;
 
-    m_DHTItem->setText(COL_SEEDS, QString::number(seedsDHT));
-    m_DHTItem->setText(COL_LEECHES, QString::number(peersDHT));
-    m_PEXItem->setText(COL_SEEDS, QString::number(seedsPeX));
-    m_PEXItem->setText(COL_LEECHES, QString::number(peersPeX));
-    m_LSDItem->setText(COL_SEEDS, QString::number(seedsLSD));
-    m_LSDItem->setText(COL_LEECHES, QString::number(peersLSD));
+            if (peer.fromDHT())
+            {
+                if (peer.isSeed())
+                    ++seedsDHT;
+                else
+                    ++peersDHT;
+            }
+            if (peer.fromPeX())
+            {
+                if (peer.isSeed())
+                    ++seedsPeX;
+                else
+                    ++peersPeX;
+            }
+            if (peer.fromLSD())
+            {
+                if (peer.isSeed())
+                    ++seedsLSD;
+                else
+                    ++peersLSD;
+            }
+        }
+
+        m_DHTItem->setText(COL_SEEDS, QString::number(seedsDHT));
+        m_DHTItem->setText(COL_LEECHES, QString::number(peersDHT));
+        m_PEXItem->setText(COL_SEEDS, QString::number(seedsPeX));
+        m_PEXItem->setText(COL_LEECHES, QString::number(peersPeX));
+        m_LSDItem->setText(COL_SEEDS, QString::number(seedsLSD));
+        m_LSDItem->setText(COL_LEECHES, QString::number(peersLSD));
+    });
 }
 
 void TrackerListWidget::loadTrackers()