Merge pull request #13340 from glassez/fix-magnet

Improve adding torrent using Magnet URI

src/base/bittorrent/session.cpp

@@ -1775,18 +1775,9 @@ bool Session::cancelLoadMetadata(const InfoHash &hash)
     if (loadedMetadataIter == m_loadedMetadata.end()) return false;
 
     m_loadedMetadata.erase(loadedMetadataIter);
-    const lt::torrent_handle torrent = m_nativeSession->find_torrent(hash);
-    if (!torrent.is_valid()) return false;
-
-    if (!torrent.status(lt::status_flags_t {0}).has_metadata) {
-        // if hidden torrent is still loading metadata...
-        --m_extraLimit;
-        adjustLimits();
-    }
-
-    // Remove it from session
-    m_nativeSession->remove_torrent(torrent, lt::session::delete_files);
-    qDebug("Preloaded torrent deleted.");
+    --m_extraLimit;
+    adjustLimits();
+    m_nativeSession->remove_torrent(m_nativeSession->find_torrent(hash), lt::session::delete_files);
     return true;
 }
 
@@ -1834,7 +1825,7 @@ void Session::decreaseTorrentsQueuePos(const QVector<InfoHash> &hashes)
     }
 
     for (auto i = m_loadedMetadata.cbegin(); i != m_loadedMetadata.cend(); ++i)
-        torrentQueuePositionBottom(m_nativeSession->find_torrent(i.key()));
+        torrentQueuePositionBottom(m_nativeSession->find_torrent(*i));
 
     saveTorrentsQueue();
 }
@@ -1883,7 +1874,7 @@ void Session::bottomTorrentsQueuePos(const QVector<InfoHash> &hashes)
     }
 
     for (auto i = m_loadedMetadata.cbegin(); i != m_loadedMetadata.cend(); ++i)
-        torrentQueuePositionBottom(m_nativeSession->find_torrent(i.key()));
+        torrentQueuePositionBottom(m_nativeSession->find_torrent(*i));
 
     saveTorrentsQueue();
 }
@@ -1938,42 +1929,14 @@ bool Session::addTorrent(const MagnetUri &magnetUri, const AddTorrentParams &par
 
     const auto it = m_loadedMetadata.constFind(hash);
     if (it != m_loadedMetadata.constEnd()) {
-        // Adding preloaded torrent...
-        const TorrentInfo metadata = it->metadata;
-        if (metadata.isValid()) {
-            // Metadata is received and torrent_handle is being deleted
-            // so we can't reuse it. Just add torrent using its metadata.
-            return addTorrent(metadata, params);
-        }
-
-        // Reuse existing torrent_handle
-        lt::torrent_handle handle = m_nativeSession->find_torrent(hash);
-
-        // Preloaded torrent is in "Upload mode" so we need to disable it
-        // otherwise the torrent never be downloaded (until application restart)
-        handle.unset_flags(lt::torrent_flags::upload_mode);
-
-        LoadTorrentParams createTorrentParams = initLoadTorrentParams(params);
-        createTorrentParams.ltAddTorrentParams = it->ltAddTorrentParams;
-
-        if (createTorrentParams.paused) {
-            // Preloaded torrent isn't auto managed already
-            handle.pause();
-        }
-        else if (!createTorrentParams.forced) {
-            handle.set_flags(lt::torrent_flags::auto_managed);
-            handle.pause();
-        }
-
-        m_loadedMetadata.remove(hash);
-        m_loadingTorrents.insert(hash, createTorrentParams);
-
+        // It looks illogical that we don't just use an existing handle,
+        // but as previous experience has shown, it actually creates unnecessary
+        // problems and unwanted behavior due to the fact that it was originally
+        // added with parameters other than those provided by the user.
+        m_loadedMetadata.erase(it);
         --m_extraLimit;
         adjustLimits();
-
-        // use common last step of torrent loading
-        createTorrentHandle(handle);
-        return true;
+        m_nativeSession->remove_torrent(m_nativeSession->find_torrent(hash), lt::session::delete_files);
     }
 
     return addTorrent_impl(params, magnetUri);
@@ -2081,6 +2044,10 @@ bool Session::addTorrent_impl(const AddTorrentParams &addTorrentParams, const Ma
     }
     else {
         p = magnetUri.addTorrentParams();
+
+        if (loadTorrentParams.name.isEmpty() && !p.name.empty())
+            loadTorrentParams.name = QString::fromStdString(p.name);
+
         if (isTempPathEnabled())
             actualSavePath = tempPath();
     }
@@ -2211,7 +2178,7 @@ bool Session::loadMetadata(const MagnetUri &magnetUri)
     if (ec) return false;
 
     // waiting for metadata...
-    m_loadedMetadata.insert(h.info_hash(), {p, TorrentInfo {}});
+    m_loadedMetadata.insert(h.info_hash());
     ++m_extraLimit;
     adjustLimits();
 
@@ -4056,6 +4023,10 @@ bool Session::loadTorrentResumeData(const QByteArray &data, const TorrentInfo &m
             const lt::bdecode_node addedTimeNode = root.dict_find("qBt-addedTime");
             if (addedTimeNode.type() == lt::bdecode_node::int_t)
                 p.added_time = addedTimeNode.int_value();
+
+            if (torrentParams.name.isEmpty() && !p.name.empty())
+                torrentParams.name = QString::fromStdString(p.name);
+
         }
         // === END DEPRECATED CODE === //
         else {
@@ -4394,12 +4365,6 @@ void Session::handleTorrentRemovedAlert(const lt::torrent_removed_alert *p)
 {
     const InfoHash infoHash {p->info_hash};
 
-    const auto loadedMetadataIter = m_loadedMetadata.find(infoHash);
-    if (loadedMetadataIter != m_loadedMetadata.end()) {
-        emit metadataLoaded(loadedMetadataIter->metadata);
-        m_loadedMetadata.erase(loadedMetadataIter);
-    }
-
     const auto removingTorrentDataIter = m_removingTorrents.find(infoHash);
     if (removingTorrentDataIter != m_removingTorrents.end()) {
         if (removingTorrentDataIter->deleteOption == Torrent) {
@@ -4451,10 +4416,14 @@ void Session::handleMetadataReceivedAlert(const lt::metadata_received_alert *p)
     const auto loadedMetadataIter = m_loadedMetadata.find(hash);
 
     if (loadedMetadataIter != m_loadedMetadata.end()) {
+        TorrentInfo metadata {p->handle.torrent_file()};
+
+        m_loadedMetadata.erase(loadedMetadataIter);
         --m_extraLimit;
         adjustLimits();
-        loadedMetadataIter->metadata = TorrentInfo {p->handle.torrent_file()};
         m_nativeSession->remove_torrent(p->handle, lt::session::delete_files);
+
+        emit metadataLoaded(metadata);
     }
 }
 

src/base/bittorrent/session.h

@@ -758,12 +758,7 @@ namespace BitTorrent
         QThread *m_ioThread = nullptr;
         ResumeDataSavingManager *m_resumeDataSavingManager = nullptr;
 
-        struct LoadedMetadataHandle
-        {
-            lt::add_torrent_params ltAddTorrentParams {};
-            TorrentInfo metadata;
-        };
-        QHash<InfoHash, LoadedMetadataHandle> m_loadedMetadata;
+        QSet<InfoHash> m_loadedMetadata;
 
         QHash<InfoHash, TorrentHandleImpl *> m_torrents;
         QHash<InfoHash, LoadTorrentParams> m_loadingTorrents;

src/gui/addnewtorrentdialog.cpp

@@ -39,6 +39,7 @@
 #include <QVector>
 
 #include "base/bittorrent/downloadpriority.h"
+#include "base/bittorrent/infohash.h"
 #include "base/bittorrent/magneturi.h"
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/torrenthandle.h"
@@ -276,11 +277,11 @@ bool AddNewTorrentDialog::loadTorrentFile(const QString &torrentPath)
 bool AddNewTorrentDialog::loadTorrentImpl()
 {
     m_hasMetadata = true;
-    m_hash = m_torrentInfo.hash();
+    const BitTorrent::InfoHash infoHash = m_torrentInfo.hash();
 
     // Prevent showing the dialog if download is already present
-    if (BitTorrent::Session::instance()->isKnownTorrent(m_hash)) {
-        BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(m_hash);
+    if (BitTorrent::Session::instance()->isKnownTorrent(infoHash)) {
+        BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(infoHash);
         if (torrent) {
             if (torrent->isPrivate() || m_torrentInfo.isPrivate()) {
                 RaisedMessageBox::warning(this, tr("Torrent is already present"), tr("Torrent '%1' is already in the transfer list. Trackers haven't been merged because it is a private torrent.").arg(torrent->name()), QMessageBox::Ok);
@@ -297,7 +298,7 @@ bool AddNewTorrentDialog::loadTorrentImpl()
         return false;
     }
 
-    m_ui->labelHashData->setText(m_hash);
+    m_ui->labelHashData->setText(infoHash);
     setupTreeview();
     TMMChanged(m_ui->comboTTM->currentIndex());
     m_ui->keepTopLevelFolderCheckBox->setEnabled(m_torrentInfo.hasRootFolder());
@@ -312,10 +313,11 @@ bool AddNewTorrentDialog::loadMagnet(const BitTorrent::MagnetUri &magnetUri)
     }
 
     m_torrentGuard = std::make_unique<TorrentFileGuard>();
-    m_hash = magnetUri.hash();
+
+    const BitTorrent::InfoHash infoHash = magnetUri.hash();
     // Prevent showing the dialog if download is already present
-    if (BitTorrent::Session::instance()->isKnownTorrent(m_hash)) {
-        BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(m_hash);
+    if (BitTorrent::Session::instance()->isKnownTorrent(infoHash)) {
+        BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(infoHash);
         if (torrent) {
             if (torrent->isPrivate()) {
                 RaisedMessageBox::warning(this, tr("Torrent is already present"), tr("Torrent '%1' is already in the transfer list. Trackers haven't been merged because it is a private torrent.").arg(torrent->name()), QMessageBox::Ok);
@@ -335,7 +337,7 @@ bool AddNewTorrentDialog::loadMagnet(const BitTorrent::MagnetUri &magnetUri)
     connect(BitTorrent::Session::instance(), &BitTorrent::Session::metadataLoaded, this, &AddNewTorrentDialog::updateMetadata);
 
     // Set dialog title
-    QString torrentName = magnetUri.name();
+    const QString torrentName = magnetUri.name();
     setWindowTitle(torrentName.isEmpty() ? tr("Magnet link") : torrentName);
 
     setupTreeview();
@@ -343,8 +345,9 @@ bool AddNewTorrentDialog::loadMagnet(const BitTorrent::MagnetUri &magnetUri)
 
     BitTorrent::Session::instance()->loadMetadata(magnetUri);
     setMetadataProgressIndicator(true, tr("Retrieving metadata..."));
-    m_ui->labelHashData->setText(m_hash);
+    m_ui->labelHashData->setText(infoHash);
 
+    m_magnetURI = magnetUri;
     return true;
 }
 
@@ -573,7 +576,7 @@ void AddNewTorrentDialog::accept()
 
     // Add torrent
     if (!m_hasMetadata)
-        BitTorrent::Session::instance()->addTorrent(m_hash, m_torrentParams);
+        BitTorrent::Session::instance()->addTorrent(m_magnetURI, m_torrentParams);
     else
         BitTorrent::Session::instance()->addTorrent(m_torrentInfo, m_torrentParams);
 
@@ -585,26 +588,26 @@ void AddNewTorrentDialog::reject()
 {
     if (!m_hasMetadata) {
         setMetadataProgressIndicator(false);
-        BitTorrent::Session::instance()->cancelLoadMetadata(m_hash);
+        BitTorrent::Session::instance()->cancelLoadMetadata(m_magnetURI.hash());
     }
 
     QDialog::reject();
 }
 
-void AddNewTorrentDialog::updateMetadata(const BitTorrent::TorrentInfo &info)
+void AddNewTorrentDialog::updateMetadata(const BitTorrent::TorrentInfo &metadata)
 {
-    if (info.hash() != m_hash) return;
+    if (metadata.hash() != m_magnetURI.hash()) return;
 
     disconnect(BitTorrent::Session::instance(), &BitTorrent::Session::metadataLoaded, this, &AddNewTorrentDialog::updateMetadata);
 
-    if (!info.isValid()) {
+    if (!metadata.isValid()) {
         RaisedMessageBox::critical(this, tr("I/O Error"), ("Invalid metadata."));
         setMetadataProgressIndicator(false, tr("Invalid metadata"));
         return;
     }
 
     // Good to go
-    m_torrentInfo = info;
+    m_torrentInfo = metadata;
     m_hasMetadata = true;
     setMetadataProgressIndicator(true, tr("Parsing metadata..."));
 

src/gui/addnewtorrentdialog.h

@@ -34,13 +34,13 @@
 #include <QDialog>
 
 #include "base/bittorrent/addtorrentparams.h"
-#include "base/bittorrent/infohash.h"
+#include "base/bittorrent/magneturi.h"
 #include "base/bittorrent/torrentinfo.h"
 #include "base/settingvalue.h"
 
 namespace BitTorrent
 {
-    class MagnetUri;
+    class InfoHash;
 }
 
 namespace Net
@@ -82,7 +82,7 @@ private slots:
     void displayContentTreeMenu(const QPoint &);
     void updateDiskSpaceLabel();
     void onSavePathChanged(const QString &newPath);
-    void updateMetadata(const BitTorrent::TorrentInfo &info);
+    void updateMetadata(const BitTorrent::TorrentInfo &metadata);
     void handleDownloadFinished(const Net::DownloadResult &result);
     void TMMChanged(int index);
     void categoryChanged(int index);
@@ -112,7 +112,7 @@ private:
     TorrentContentFilterModel *m_contentModel;
     PropListDelegate *m_contentDelegate;
     bool m_hasMetadata;
-    BitTorrent::InfoHash m_hash;
+    BitTorrent::MagnetUri m_magnetURI;
     BitTorrent::TorrentInfo m_torrentInfo;
     QByteArray m_headerState;
     int m_oldIndex;