Merge pull request #13658 from glassez/recheck

Don't resume "paused" torrents when put into "checking" state by libtorrent

src/base/bittorrent/nativetorrentextension.cpp

@@ -49,17 +49,6 @@ NativeTorrentExtension::NativeTorrentExtension(const lt::torrent_handle &torrent
 {
 }
 
-// This method is called when state of torrent is changed
-void NativeTorrentExtension::on_state(const lt::torrent_status::state_t state)
-{
-    // When a torrent enters "checking files" state while paused, we temporarily resume it
-    // (really we just allow libtorrent to resume it by enabling auto management for it).
-    if (state == lt::torrent_status::checking_files) {
-        if (isPaused(m_torrentHandle.status({})))
-            m_torrentHandle.set_flags(lt::torrent_flags::stop_when_ready | lt::torrent_flags::auto_managed);
-    }
-}
-
 bool NativeTorrentExtension::on_pause()
 {
     if (!isAutoManaged(m_torrentHandle.status({})))

src/base/bittorrent/nativetorrentextension.h

@@ -37,7 +37,6 @@ public:
     explicit NativeTorrentExtension(const lt::torrent_handle &torrentHandle);
 
 private:
-    void on_state(lt::torrent_status::state_t state) override;
     bool on_pause() override;
 
     lt::torrent_handle m_torrentHandle;

src/base/bittorrent/torrenthandleimpl.cpp

@@ -743,48 +743,61 @@ void TorrentHandleImpl::updateState()
     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;
-    }
     else if (isPaused()) {
-        m_state = isSeed() ? TorrentState::PausedUploading : TorrentState::PausedDownloading;
+        if (isMoveInProgress()) {
-    }
+            m_state = TorrentState::Moving;
-    else if (m_session->isQueueingSystemEnabled() && isQueued() && !isChecking()) {
+        }
-        m_state = isSeed() ? TorrentState::QueuedUploading : TorrentState::QueuedDownloading;
+        else if (hasMissingFiles()) {
+            m_state = TorrentState::MissingFiles;
+        }
+        else if (hasError()) {
+            m_state = TorrentState::Error;
+        }
+        else {
+            m_state = isSeed() ? TorrentState::PausedUploading : TorrentState::PausedDownloading;
+        }
     }
     else {
-        switch (m_nativeStatus.state) {
+        if (m_nativeStatus.state == lt::torrent_status::checking_files) {
-        case lt::torrent_status::finished:
+            m_state = m_hasSeedStatus ? TorrentState::CheckingUploading : TorrentState::CheckingDownloading;
-        case lt::torrent_status::seeding:
+        }
-            if (isForced())
+        else if (m_nativeStatus.state == lt::torrent_status::allocating) {
-                m_state = TorrentState::ForcedUploading;
+            m_state = TorrentState::Allocating;
-            else
+        }
-                m_state = m_nativeStatus.upload_payload_rate > 0 ? TorrentState::Uploading : TorrentState::StalledUploading;
+        else if (isMoveInProgress()) {
-            break;
+            m_state = TorrentState::Moving;
-        case lt::torrent_status::downloading_metadata:
+        }
-            m_state = TorrentState::DownloadingMetadata;
+        else if (hasMissingFiles()) {
-            break;
+            m_state = TorrentState::MissingFiles;
-        case lt::torrent_status::downloading:
+        }
-            if (isForced())
+        else if (hasError()) {
-                m_state = TorrentState::ForcedDownloading;
+            m_state = TorrentState::Error;
-            else
+        }
-                m_state = m_nativeStatus.download_payload_rate > 0 ? TorrentState::Downloading : TorrentState::StalledDownloading;
+        else if (m_session->isQueueingSystemEnabled() && isQueued() && !isChecking()) {
-            break;
+            m_state = isSeed() ? TorrentState::QueuedUploading : TorrentState::QueuedDownloading;
-        default:
+        }
-            qWarning("Unrecognized torrent status, should not happen!!! status was %d", m_nativeStatus.state);
+        else {
-            m_state = TorrentState::Unknown;
+            switch (m_nativeStatus.state) {
+            case lt::torrent_status::finished:
+            case lt::torrent_status::seeding:
+                if (isForced())
+                    m_state = TorrentState::ForcedUploading;
+                else
+                    m_state = m_nativeStatus.upload_payload_rate > 0 ? TorrentState::Uploading : TorrentState::StalledUploading;
+                break;
+            case lt::torrent_status::downloading_metadata:
+                m_state = TorrentState::DownloadingMetadata;
+                break;
+            case lt::torrent_status::downloading:
+                if (isForced())
+                    m_state = TorrentState::ForcedDownloading;
+                else
+                    m_state = m_nativeStatus.download_payload_rate > 0 ? TorrentState::Downloading : TorrentState::StalledDownloading;
+                break;
+            default:
+                qWarning("Unrecognized torrent status, should not happen!!! status was %d", m_nativeStatus.state);
+                m_state = TorrentState::Unknown;
+            }
         }
     }
 }
@@ -1194,6 +1207,12 @@ void TorrentHandleImpl::forceRecheck()
 
     m_nativeHandle.force_recheck();
     m_unchecked = false;
+
+    if (isPaused()) {
+        // When "force recheck" is applied on paused torrent, we temporarily resume it
+        // (really we just allow libtorrent to resume it by enabling auto management for it).
+        m_nativeHandle.set_flags(lt::torrent_flags::stop_when_ready | lt::torrent_flags::auto_managed);
+    }
 }
 
 void TorrentHandleImpl::setSequentialDownload(const bool enable)
@@ -1449,17 +1468,6 @@ void TorrentHandleImpl::handleSaveResumeDataAlert(const lt::save_resume_data_ale
     m_ltAddTorrentParams.added_time = addedTime().toSecsSinceEpoch();
     m_ltAddTorrentParams.save_path = Profile::instance()->toPortablePath(
                 QString::fromStdString(m_ltAddTorrentParams.save_path)).toStdString();
-    if (!m_hasMissingFiles) {
-        m_ltAddTorrentParams.flags = m_nativeStatus.flags;
-        if (m_nativeStatus.flags & lt::torrent_flags::stop_when_ready) {
-            // We need to redefine these values when torrent starting/rechecking
-            // in "paused" state since native values can be logically wrong
-            // (torrent can be not paused and auto_managed when it is checking).
-            m_ltAddTorrentParams.flags |= lt::torrent_flags::paused;
-            m_ltAddTorrentParams.flags &= ~lt::torrent_flags::auto_managed;
-            m_ltAddTorrentParams.flags &= ~lt::torrent_flags::stop_when_ready;
-        }
-    }
 
     auto resumeDataPtr = std::make_shared<lt::entry>(lt::write_resume_data(m_ltAddTorrentParams));
     lt::entry &resumeData = *resumeDataPtr;