d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-23 04:54:18 +00:00
Code Issues Projects Releases Wiki Activity

Fetch torrent status when generating final fastresume data

Browse Source 
This is done to get correct queue position, which has to be written into
the fastresume file. See discussion in #6154.
This commit is contained in:
Eugene Shalygin 2017-01-18 17:23:57 +01:00
parent 6cd233dd61
commit b6e64c13d8
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/base/bittorrent/session.cpp
View File

@ -1858,7 +1858,7 @@ void Session::generateResumeData(bool final)
if (torrent->isChecking() || torrent->hasError()) continue; if (torrent->isChecking() || torrent->hasError()) continue;
if (!final && !torrent->needSaveResumeData()) continue; if (!final && !torrent->needSaveResumeData()) continue;
saveTorrentResumeData(torrent); saveTorrentResumeData(torrent, final);
qDebug("Saving fastresume data for %s", qPrintable(torrent->name())); qDebug("Saving fastresume data for %s", qPrintable(torrent->name()));
} }
} }
@ -2782,9 +2782,9 @@ void Session::handleTorrentRatioLimitChanged(TorrentHandle *const torrent)
updateRatioTimer(); updateRatioTimer();
} }
void Session::saveTorrentResumeData(TorrentHandle *const torrent) void Session::saveTorrentResumeData(TorrentHandle *const torrent, bool finalSave)
{ {
torrent->saveResumeData(); torrent->saveResumeData(finalSave);
++m_numResumeData; ++m_numResumeData;
} }

2
src/base/bittorrent/session.h
View File

@ -467,7 +467,7 @@ namespace BitTorrent
void updateRatioTimer(); void updateRatioTimer();
void exportTorrentFile(TorrentHandle *const torrent, TorrentExportFolder folder = TorrentExportFolder::Regular); void exportTorrentFile(TorrentHandle *const torrent, TorrentExportFolder folder = TorrentExportFolder::Regular);
void saveTorrentResumeData(TorrentHandle *const torrent); void saveTorrentResumeData(TorrentHandle *const torrent, bool finalSave = false);
void handleAlert(libtorrent::alert *a); void handleAlert(libtorrent::alert *a);
void dispatchTorrentAlert(libtorrent::alert *a); void dispatchTorrentAlert(libtorrent::alert *a);

5
src/base/bittorrent/torrenthandle.cpp
View File

@ -485,8 +485,11 @@ bool TorrentHandle::needSaveResumeData() const
SAFE_RETURN(bool, need_save_resume_data, false); SAFE_RETURN(bool, need_save_resume_data, false);
} }
void TorrentHandle::saveResumeData() void TorrentHandle::saveResumeData(bool updateStatus)
{ {
if (updateStatus) // to update queue_position, see discussion in PR #6154
this->updateStatus();
SAFE_CALL(save_resume_data); SAFE_CALL(save_resume_data);
m_needSaveResumeData = false; m_needSaveResumeData = false;
} }

2
src/base/bittorrent/torrenthandle.h
View File

@ -351,7 +351,7 @@ namespace BitTorrent
void handleTempPathChanged(); void handleTempPathChanged();
void handleCategorySavePathChanged(); void handleCategorySavePathChanged();
void handleAppendExtensionToggled(); void handleAppendExtensionToggled();
void saveResumeData(); void saveResumeData(bool updateStatus = false);
private: private:
typedef boost::function<void ()> EventTrigger; typedef boost::function<void ()> EventTrigger;