Browse Source

Fix bug of torrents don't save "stopped" state

adaptive-webui-19844
Vladimir Golovnev (Glassez) 4 years ago
parent
commit
5f94238d23
No known key found for this signature in database
GPG Key ID: 52A2C7DEE2DFA6F7
  1. 16
      src/base/bittorrent/session.cpp
  2. 14
      src/base/bittorrent/torrenthandleimpl.cpp

16
src/base/bittorrent/session.cpp

@ -4253,20 +4253,20 @@ bool Session::loadTorrentResumeData(const QByteArray &data, const TorrentInfo &m
if (metadata.isValid()) if (metadata.isValid())
p.ti = metadata.nativeInfo(); p.ti = metadata.nativeInfo();
torrentParams.paused = (p.flags & lt::torrent_flags::paused) && !(p.flags & lt::torrent_flags::auto_managed); if (p.flags & lt::torrent_flags::stop_when_ready)
if (!torrentParams.paused)
{ {
// If torrent has "stop_when_ready" flag set then it is actually "stopped" // If torrent has "stop_when_ready" flag set then it is actually "stopped"
// but temporarily "resumed" to perform some service jobs (e.g. checking) torrentParams.paused = true;
torrentParams.paused = !!(p.flags & lt::torrent_flags::stop_when_ready); torrentParams.forced = false;
// ...but temporarily "resumed" to perform some service jobs (e.g. checking)
p.flags &= ~lt::torrent_flags::paused;
p.flags |= lt::torrent_flags::auto_managed;
} }
else else
{ {
// Fix inconsistent state when "paused" torrent has "stop_when_ready" flag set torrentParams.paused = (p.flags & lt::torrent_flags::paused) && !(p.flags & lt::torrent_flags::auto_managed);
p.flags &= ~lt::torrent_flags::stop_when_ready;
}
torrentParams.forced = !(p.flags & lt::torrent_flags::paused) && !(p.flags & lt::torrent_flags::auto_managed); torrentParams.forced = !(p.flags & lt::torrent_flags::paused) && !(p.flags & lt::torrent_flags::auto_managed);
}
const bool hasMetadata = (p.ti && p.ti->is_valid()); const bool hasMetadata = (p.ti && p.ti->is_valid());
if (!hasMetadata && !root.dict_find("info-hash")) if (!hasMetadata && !root.dict_find("info-hash"))

14
src/base/bittorrent/torrenthandleimpl.cpp

@ -1325,6 +1325,7 @@ void TorrentHandleImpl::endReceivedMetadataHandling(const QString &savePath, con
m_nativeHandle = m_nativeSession->add_torrent(p); m_nativeHandle = m_nativeSession->add_torrent(p);
m_nativeHandle.queue_position_set(queuePos); m_nativeHandle.queue_position_set(queuePos);
m_torrentInfo = TorrentInfo {m_nativeHandle.torrent_file()};
// If first/last piece priority was specified when adding this torrent, // If first/last piece priority was specified when adding this torrent,
// we should apply it now that we have metadata: // we should apply it now that we have metadata:
if (m_hasFirstLastPiecePriority) if (m_hasFirstLastPiecePriority)
@ -1337,7 +1338,6 @@ void TorrentHandleImpl::endReceivedMetadataHandling(const QString &savePath, con
m_nativeHandle.resume(); m_nativeHandle.resume();
} }
m_torrentInfo = TorrentInfo {m_nativeHandle.torrent_file()};
m_maintenanceJob = MaintenanceJob::None; m_maintenanceJob = MaintenanceJob::None;
updateStatus(); updateStatus();
@ -1485,11 +1485,10 @@ void TorrentHandleImpl::handleTorrentCheckedAlert(const lt::torrent_checked_aler
return; return;
} }
if (m_fastresumeDataRejected && !m_hasMissingFiles)
{
saveResumeData(); saveResumeData();
if (m_fastresumeDataRejected && !m_hasMissingFiles)
m_fastresumeDataRejected = false; m_fastresumeDataRejected = false;
}
updateStatus(); updateStatus();
@ -1554,7 +1553,12 @@ void TorrentHandleImpl::handleSaveResumeDataAlert(const lt::save_resume_data_ale
m_ltAddTorrentParams = p->params; m_ltAddTorrentParams = p->params;
} }
if (!m_isStopped) if (m_isStopped)
{
m_ltAddTorrentParams.flags |= lt::torrent_flags::paused;
m_ltAddTorrentParams.flags &= ~lt::torrent_flags::auto_managed;
}
else
{ {
// Torrent can be actually "running" but temporarily "paused" to perform some // Torrent can be actually "running" but temporarily "paused" to perform some
// service jobs behind the scenes so we need to restore it as "running" // service jobs behind the scenes so we need to restore it as "running"

Loading…
Cancel
Save