Merge pull request #12805 from glassez/move-storage

Wait for storage to be moved when removing torrent

src/base/bittorrent/session.cpp

@@ -115,6 +115,7 @@ namespace
 {
 #if (LIBTORRENT_VERSION_NUM < 10200)
     using LTAlertCategory = int;
+    using LTDownloadPriority = int;
     using LTPeerClass = int;
     using LTQueuePosition = int;
     using LTSessionFlags = int;
@@ -122,6 +123,7 @@ namespace
     using LTString = std::string;
 #else
     using LTAlertCategory = lt::alert_category_t;
+    using LTDownloadPriority = lt::download_priority_t;
     using LTPeerClass = lt::peer_class_t;
     using LTQueuePosition = lt::queue_position_t;
     using LTSessionFlags = lt::session_flags_t;
@@ -416,6 +418,34 @@ namespace
         return {};
     }
 #endif
+
+    QStringList getUnwantedFilePaths(const lt::torrent_handle &torrentHandle)
+    {
+        const TorrentInfo torrentInfo {torrentHandle.torrent_file()};
+        if (!torrentInfo.isValid())
+            return {};
+
+        const QString savePath = QString::fromStdString(
+                    torrentHandle.status(lt::torrent_handle::query_save_path).save_path);
+        const QDir saveDir {savePath};
+    #if (LIBTORRENT_VERSION_NUM < 10200)
+        const std::vector<LTDownloadPriority> fp = torrentHandle.file_priorities();
+    #else
+        const std::vector<LTDownloadPriority> fp = torrentHandle.get_file_priorities();
+    #endif
+
+        QStringList res;
+        for (int i = 0; i < static_cast<int>(fp.size()); ++i) {
+            if (fp[i] == LTDownloadPriority {0}) {
+                const QString path = Utils::Fs::expandPathAbs(
+                            saveDir.absoluteFilePath(torrentInfo.filePath(i)));
+                if (path.contains(".unwanted"))
+                    res << path;
+            }
+        }
+
+        return res;
+    }
 }
 
 // Session
@@ -1845,56 +1875,65 @@ bool Session::deleteTorrent(const InfoHash &hash, const DeleteOption deleteOptio
 
     // Remove it from session
     if (deleteOption == Torrent) {
-        m_removingTorrents[torrent->hash()] = {torrent->name(), "", deleteOption};
-        QStringList unwantedFiles;
-        if (torrent->hasMetadata())
-            unwantedFiles = torrent->absoluteFilePathsUnwanted();
-        m_nativeSession->remove_torrent(torrent->nativeHandle(), lt::session::delete_partfile);
-        // Remove unwanted and incomplete files
-        for (const QString &unwantedFile : asConst(unwantedFiles)) {
-            qDebug("Removing unwanted file: %s", qUtf8Printable(unwantedFile));
-            Utils::Fs::forceRemove(unwantedFile);
-            const QString parentFolder = Utils::Fs::branchPath(unwantedFile);
-            qDebug("Attempt to remove parent folder (if empty): %s", qUtf8Printable(parentFolder));
-            QDir().rmdir(parentFolder);
+        const lt::torrent_handle nativeHandle {torrent->nativeHandle()};
+        const auto iter = std::find_if(m_moveStorageQueue.begin(), m_moveStorageQueue.end()
+                                 , [&nativeHandle](const MoveStorageJob &job)
+        {
+            return job.torrentHandle == nativeHandle;
+        });
+        if (iter != m_moveStorageQueue.end()) {
+            // We shouldn't actually remove torrent until existing "move storage jobs" are done
+            torrentQueuePositionBottom(nativeHandle);
+#if (LIBTORRENT_VERSION_NUM < 10200)
+            nativeHandle.auto_managed(false);
+#else
+            nativeHandle.unset_flags(lt::torrent_flags::auto_managed);
+#endif
+            nativeHandle.pause();
+            m_removingTorrents[torrent->hash()] = {torrent->name(), {}, deleteOption};
+        }
+        else {
+            m_removingTorrents[torrent->hash()] = {torrent->name(), getUnwantedFilePaths(nativeHandle), deleteOption};
+            m_nativeSession->remove_torrent(nativeHandle, lt::session::delete_partfile);
         }
     }
     else {
         const QString rootPath = torrent->rootPath(true);
         if (!rootPath.isEmpty()) {
             // torrent with root folder
-            m_removingTorrents[torrent->hash()] = {torrent->name(), rootPath, deleteOption};
+            m_removingTorrents[torrent->hash()] = {torrent->name(), {rootPath}, deleteOption};
         }
         else if (torrent->useTempPath()) {
             // torrent without root folder still has it in its temporary save path
-            m_removingTorrents[torrent->hash()] = {torrent->name(), torrent->savePath(true), deleteOption};
+            m_removingTorrents[torrent->hash()] = {torrent->name(), {torrent->actualStorageLocation()}, deleteOption};
         }
         else {
-            m_removingTorrents[torrent->hash()] = {torrent->name(), "", deleteOption};
-        }
-        m_nativeSession->remove_torrent(torrent->nativeHandle(), lt::session::delete_files);
+            m_removingTorrents[torrent->hash()] = {torrent->name(), {}, deleteOption};
         }
 
-    // Remove it from torrent resume directory
-    const QDir resumeDataDir(m_resumeFolderPath);
-    QStringList filters;
-    filters << QString::fromLatin1("%1.*").arg(torrent->hash());
-    const QStringList files = resumeDataDir.entryList(filters, QDir::Files, QDir::Unsorted);
-    for (const QString &file : files)
-        Utils::Fs::forceRemove(resumeDataDir.absoluteFilePath(file));
-
         if (m_moveStorageQueue.size() > 1) {
             // Delete "move storage job" for the deleted torrent
             // (note: we shouldn't delete active job)
             const auto iter = std::find_if(m_moveStorageQueue.begin() + 1, m_moveStorageQueue.end()
                                      , [torrent](const MoveStorageJob &job)
             {
-            return job.torrent == torrent;
+                return job.torrentHandle == torrent->nativeHandle();
             });
             if (iter != m_moveStorageQueue.end())
                 m_moveStorageQueue.erase(iter);
         }
 
+        m_nativeSession->remove_torrent(torrent->nativeHandle(), lt::session::delete_files);
+    }
+
+    // Remove it from torrent resume directory
+    const QDir resumeDataDir(m_resumeFolderPath);
+    QStringList filters;
+    filters << QString::fromLatin1("%1.*").arg(torrent->hash());
+    const QStringList files = resumeDataDir.entryList(filters, QDir::Files, QDir::Unsorted);
+    for (const QString &file : files)
+        Utils::Fs::forceRemove(resumeDataDir.absoluteFilePath(file));
+
     delete torrent;
     return true;
 }
@@ -4034,11 +4073,13 @@ bool Session::addMoveTorrentStorageJob(TorrentHandleImpl *torrent, const QString
 {
     Q_ASSERT(torrent);
 
+    const lt::torrent_handle torrentHandle = torrent->nativeHandle();
+
     if (m_moveStorageQueue.size() > 1) {
         const auto iter = std::find_if(m_moveStorageQueue.begin() + 1, m_moveStorageQueue.end()
-                                 , [torrent](const MoveStorageJob &job)
+                                 , [&torrentHandle](const MoveStorageJob &job)
         {
-            return job.torrent == torrent;
+            return job.torrentHandle == torrentHandle;
         });
 
         if (iter != m_moveStorageQueue.end()) {
@@ -4047,9 +4088,8 @@ bool Session::addMoveTorrentStorageJob(TorrentHandleImpl *torrent, const QString
         }
     }
 
-    QString currentLocation = QString::fromStdString(
-                torrent->nativeHandle().status(lt::torrent_handle::query_save_path).save_path);
-    if (!m_moveStorageQueue.isEmpty() && (m_moveStorageQueue.first().torrent == torrent)) {
+    QString currentLocation = torrent->actualStorageLocation();
+    if (!m_moveStorageQueue.isEmpty() && (m_moveStorageQueue.first().torrentHandle == torrentHandle)) {
         // if there is active job for this torrent consider its target path as current location
         // of this torrent to prevent creating meaningless job that will do nothing
         currentLocation = m_moveStorageQueue.first().path;
@@ -4058,7 +4098,7 @@ bool Session::addMoveTorrentStorageJob(TorrentHandleImpl *torrent, const QString
     if (QDir {currentLocation} == QDir {newPath})
         return false;
 
-    const MoveStorageJob moveStorageJob {torrent, newPath, mode};
+    const MoveStorageJob moveStorageJob {torrentHandle, newPath, mode};
     m_moveStorageQueue << moveStorageJob;
     qDebug("Move storage from \"%s\" to \"%s\" is enqueued.", qUtf8Printable(currentLocation), qUtf8Printable(newPath));
 
@@ -4070,24 +4110,19 @@ bool Session::addMoveTorrentStorageJob(TorrentHandleImpl *torrent, const QString
 
 void Session::moveTorrentStorage(const MoveStorageJob &job) const
 {
-    lt::torrent_handle handle = job.torrent->nativeHandle();
-
     qDebug("Moving torrent storage to \"%s\"...", qUtf8Printable(job.path));
-#if (LIBTORRENT_VERSION_NUM < 10200)
-    handle.move_storage(job.path.toUtf8().constData()
+
+    job.torrentHandle.move_storage(job.path.toUtf8().constData()
                             , ((job.mode == MoveStorageMode::Overwrite)
+#if (LIBTORRENT_VERSION_NUM < 10200)
                              ? lt::always_replace_files : lt::dont_replace));
 #else
-    handle.move_storage(job.path.toUtf8().constData()
-                            , ((job.mode == MoveStorageMode::Overwrite)
                              ? lt::move_flags_t::always_replace_files : lt::move_flags_t::dont_replace));
 #endif
 }
 
 void Session::handleMoveTorrentStorageJobFinished(const QString &errorMessage)
 {
-    Q_ASSERT(!m_moveStorageQueue.isEmpty());
-
     const MoveStorageJob finishedJob = m_moveStorageQueue.takeFirst();
     if (!m_moveStorageQueue.isEmpty())
         moveTorrentStorage(m_moveStorageQueue.first());
@@ -4095,11 +4130,23 @@ void Session::handleMoveTorrentStorageJobFinished(const QString &errorMessage)
     const auto iter = std::find_if(m_moveStorageQueue.cbegin(), m_moveStorageQueue.cend()
                                    , [&finishedJob](const MoveStorageJob &job)
     {
-        return job.torrent == finishedJob.torrent;
+        return job.torrentHandle == finishedJob.torrentHandle;
     });
     if (iter == m_moveStorageQueue.cend()) {
+        TorrentHandleImpl *torrent = m_torrents.value(finishedJob.torrentHandle.info_hash());
+        if (torrent) {
             // There is no more job for this torrent
-        finishedJob.torrent->handleStorageMoved(finishedJob.path, errorMessage);
+            torrent->handleStorageMoved(finishedJob.path, errorMessage);
+        }
+        else {
+            // Last job is completed for torrent that being removing, so actually remove it
+            const lt::torrent_handle nativeHandle {finishedJob.torrentHandle};
+            RemovingTorrentData &removingTorrentData = m_removingTorrents[nativeHandle.info_hash()];
+            if (removingTorrentData.deleteOption == Torrent) {
+                removingTorrentData.pathsToRemove = getUnwantedFilePaths(nativeHandle);
+                m_nativeSession->remove_torrent(nativeHandle, lt::session::delete_partfile);
+            }
+        }
     }
 }
 
@@ -4609,6 +4656,15 @@ void Session::handleTorrentRemovedAlert(const lt::torrent_removed_alert *p)
     const auto removingTorrentDataIter = m_removingTorrents.find(infoHash);
     if (removingTorrentDataIter != m_removingTorrents.end()) {
         if (removingTorrentDataIter->deleteOption == Torrent) {
+            // Remove unwanted and incomplete files
+            for (const QString &unwantedFile : asConst(removingTorrentDataIter->pathsToRemove)) {
+                qDebug("Removing unwanted file: %s", qUtf8Printable(unwantedFile));
+                Utils::Fs::forceRemove(unwantedFile);
+                const QString parentFolder = Utils::Fs::branchPath(unwantedFile);
+                qDebug("Attempt to remove parent folder (if empty): %s", qUtf8Printable(parentFolder));
+                QDir().rmdir(parentFolder);
+            }
+
             LogMsg(tr("'%1' was removed from the transfer list.", "'xxx.avi' was removed...").arg(removingTorrentDataIter->name));
             m_removingTorrents.erase(removingTorrentDataIter);
         }
@@ -4623,7 +4679,8 @@ void Session::handleTorrentDeletedAlert(const lt::torrent_deleted_alert *p)
     if (removingTorrentDataIter == m_removingTorrents.end())
         return;
 
-    Utils::Fs::smartRemoveEmptyFolderTree(removingTorrentDataIter->savePathToRemove);
+    Q_ASSERT(removingTorrentDataIter->pathsToRemove.count() == 1);
+    Utils::Fs::smartRemoveEmptyFolderTree(removingTorrentDataIter->pathsToRemove.first());
     LogMsg(tr("'%1' was removed from the transfer list and hard disk.", "'xxx.avi' was removed...").arg(removingTorrentDataIter->name));
     m_removingTorrents.erase(removingTorrentDataIter);
 }
@@ -4638,7 +4695,8 @@ void Session::handleTorrentDeleteFailedAlert(const lt::torrent_delete_failed_ale
 
     // libtorrent won't delete the directory if it contains files not listed in the torrent,
     // so we remove the directory ourselves
-    Utils::Fs::smartRemoveEmptyFolderTree(removingTorrentDataIter->savePathToRemove);
+    Q_ASSERT(removingTorrentDataIter->pathsToRemove.count() == 1);
+    Utils::Fs::smartRemoveEmptyFolderTree(removingTorrentDataIter->pathsToRemove.first());
 
     if (p->error) {
         LogMsg(tr("'%1' was removed from the transfer list but the files couldn't be deleted. Error: %2", "'xxx.avi' was removed...")
@@ -4989,23 +5047,21 @@ void Session::handleAlertsDroppedAlert(const lt::alerts_dropped_alert *p) const
 
 void Session::handleStorageMovedAlert(const lt::storage_moved_alert *p)
 {
-    if (m_moveStorageQueue.isEmpty()) return;
+    Q_ASSERT(!m_moveStorageQueue.isEmpty());
 
-    const TorrentHandleImpl *torrent = m_torrents.value(p->handle.info_hash());
     const MoveStorageJob &currentJob = m_moveStorageQueue.first();
-    if (currentJob.torrent != torrent) return;
+    Q_ASSERT(currentJob.torrentHandle == p->handle);
 
     const QString newPath {p->storage_path()};
-    handleMoveTorrentStorageJobFinished(newPath != currentJob.path ? tr("New path doesn't match a target path.") : QString {});
+    Q_ASSERT(newPath == currentJob.path);
+
+    handleMoveTorrentStorageJobFinished();
 }
 
 void Session::handleStorageMovedFailedAlert(const lt::storage_moved_failed_alert *p)
 {
-    if (m_moveStorageQueue.isEmpty()) return;
-
-    const TorrentHandleImpl *torrent = m_torrents.value(p->handle.info_hash());
-    const MoveStorageJob &currentJob = m_moveStorageQueue.first();
-    if (currentJob.torrent != torrent) return;
+    Q_ASSERT(!m_moveStorageQueue.isEmpty());
+    Q_ASSERT(m_moveStorageQueue.first().torrentHandle == p->handle);
 
     handleMoveTorrentStorageJobFinished(QString::fromStdString(p->message()));
 }

src/base/bittorrent/session.h

@@ -34,6 +34,7 @@
 #include <vector>
 
 #include <libtorrent/fwd.hpp>
+#include <libtorrent/torrent_handle.hpp>
 
 #include <QHash>
 #include <QPointer>
@@ -528,7 +529,7 @@ namespace BitTorrent
     private:
         struct MoveStorageJob
         {
-            TorrentHandleImpl *torrent;
+            lt::torrent_handle torrentHandle;
             QString path;
             MoveStorageMode mode;
         };
@@ -536,7 +537,7 @@ namespace BitTorrent
         struct RemovingTorrentData
         {
             QString name;
-            QString savePathToRemove;
+            QStringList pathsToRemove;
             DeleteOption deleteOption;
         };
 

src/base/bittorrent/torrenthandle.h

@@ -192,7 +192,6 @@ namespace BitTorrent
         virtual QString fileName(int index) const = 0;
         virtual qlonglong fileSize(int index) const = 0;
         virtual QStringList absoluteFilePaths() const = 0;
-        virtual QStringList absoluteFilePathsUnwanted() const = 0;
         virtual QVector<DownloadPriority> filePriorities() const = 0;
 
         virtual TorrentInfo info() const = 0;

src/base/bittorrent/torrenthandleimpl.cpp

@@ -660,29 +660,6 @@ QStringList TorrentHandleImpl::absoluteFilePaths() const
     return res;
 }
 
-QStringList TorrentHandleImpl::absoluteFilePathsUnwanted() const
-{
-    if (!hasMetadata()) return {};
-
-    const QDir saveDir(savePath(true));
-#if (LIBTORRENT_VERSION_NUM < 10200)
-    const std::vector<LTDownloadPriority> fp = m_nativeHandle.file_priorities();
-#else
-    const std::vector<LTDownloadPriority> fp = m_nativeHandle.get_file_priorities();
-#endif
-
-    QStringList res;
-    for (int i = 0; i < static_cast<int>(fp.size()); ++i) {
-        if (fp[i] == LTDownloadPriority {0}) {
-            const QString path = Utils::Fs::expandPathAbs(saveDir.absoluteFilePath(filePath(i)));
-            if (path.contains(".unwanted"))
-                res << path;
-        }
-    }
-
-    return res;
-}
-
 QVector<DownloadPriority> TorrentHandleImpl::filePriorities() const
 {
 #if (LIBTORRENT_VERSION_NUM < 10200)
@@ -851,15 +828,21 @@ TorrentState TorrentHandleImpl::state() const
 
 void TorrentHandleImpl::updateState()
 {
-    if (hasError()) {
-        m_state = TorrentState::Error;
-    }
-    else if (m_nativeStatus.state == lt::torrent_status::checking_resume_data) {
+    if (m_nativeStatus.state == lt::torrent_status::checking_resume_data) {
         m_state = TorrentState::CheckingResumeData;
     }
+    else if (m_nativeStatus.state == lt::torrent_status::checking_files) {
+        m_state = m_hasSeedStatus ? TorrentState::CheckingUploading : TorrentState::CheckingDownloading;
+    }
+    else if (m_nativeStatus.state == lt::torrent_status::allocating) {
+        m_state = TorrentState::Allocating;
+    }
     else if (isMoveInProgress()) {
         m_state = TorrentState::Moving;
     }
+    else if (hasError()) {
+        m_state = TorrentState::Error;
+    }
     else if (hasMissingFiles()) {
         m_state = TorrentState::MissingFiles;
     }
@@ -878,12 +861,6 @@ void TorrentHandleImpl::updateState()
             else
                 m_state = m_nativeStatus.upload_payload_rate > 0 ? TorrentState::Uploading : TorrentState::StalledUploading;
             break;
-        case lt::torrent_status::allocating:
-            m_state = TorrentState::Allocating;
-            break;
-        case lt::torrent_status::checking_files:
-            m_state = m_hasSeedStatus ? TorrentState::CheckingUploading : TorrentState::CheckingDownloading;
-            break;
         case lt::torrent_status::downloading_metadata:
             m_state = TorrentState::DownloadingMetadata;
             break;

src/base/bittorrent/torrenthandleimpl.h

@@ -148,7 +148,6 @@ namespace BitTorrent
         QString fileName(int index) const override;
         qlonglong fileSize(int index) const override;
         QStringList absoluteFilePaths() const override;
-        QStringList absoluteFilePathsUnwanted() const override;
         QVector<DownloadPriority> filePriorities() const override;
 
         TorrentInfo info() const override;
@@ -254,6 +253,8 @@ namespace BitTorrent
         void saveResumeData();
         void handleStorageMoved(const QString &newPath, const QString &errorMessage);
 
+        QString actualStorageLocation() const;
+
     private:
         typedef std::function<void ()> EventTrigger;
 
@@ -286,7 +287,6 @@ namespace BitTorrent
 
         void resume_impl(bool forced);
         bool isMoveInProgress() const;
-        QString actualStorageLocation() const;
         bool isAutoManaged() const;
         void setAutoManaged(bool enable);