d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix torrent state calculation

Browse Source
This commit is contained in:
Vladimir Golovnev (Glassez) 2020-10-26 13:23:10 +03:00
parent 9f0edde12b
commit 80ca7796ca
No known key found for this signature in database
GPG Key ID: 52A2C7DEE2DFA6F7
1 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/base/bittorrent/torrenthandleimpl.cpp
View File

@ -743,48 +743,61 @@ void TorrentHandleImpl::updateState()
if (m_nativeStatus.state == lt::torrent_status::checking_resume_data) { if (m_nativeStatus.state == lt::torrent_status::checking_resume_data) {
m_state = TorrentState::CheckingResumeData; 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()) { 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 { 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;
}
} }
} }
} }