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

Merge pull request #10723 from glassez/fix-seqdl

Browse Source 
Fix sequential downloading when redirected
This commit is contained in:
Vladimir Golovnev 2019-05-30 10:44:03 +03:00 committed by GitHub
commit c5768e3513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/base/net/downloadmanager.cpp
View File

@ -221,15 +221,15 @@ Net::DownloadHandler *Net::DownloadManager::download(const DownloadRequest &down
m_waitingJobs[id].removeOne(downloadHandler); m_waitingJobs[id].removeOne(downloadHandler);
}); });
if (!isSequentialService || !m_busyServices.contains(id)) { if (isSequentialService && m_busyServices.contains(id)) {
m_waitingJobs[id].enqueue(downloadHandler);
}
else {
qDebug("Downloading %s...", qUtf8Printable(downloadRequest.url())); qDebug("Downloading %s...", qUtf8Printable(downloadRequest.url()));
if (isSequentialService) if (isSequentialService)
m_busyServices.insert(id); m_busyServices.insert(id);
downloadHandler->assignNetworkReply(m_networkManager.get(request)); downloadHandler->assignNetworkReply(m_networkManager.get(request));
} }
else {
m_waitingJobs[id].enqueue(downloadHandler);
}
return downloadHandler; return downloadHandler;
} }
@ -308,9 +308,13 @@ void Net::DownloadManager::applyProxySettings()
void Net::DownloadManager::handleReplyFinished(const QNetworkReply *reply) void Net::DownloadManager::handleReplyFinished(const QNetworkReply *reply)
{ {
const ServiceID id = ServiceID::fromURL(reply->url()); // QNetworkReply::url() may be different from that of the original request
// so we need QNetworkRequest::url() to properly process Sequential Services
// in the case when the redirection occurred.
const ServiceID id = ServiceID::fromURL(reply->request().url());
const auto waitingJobsIter = m_waitingJobs.find(id); const auto waitingJobsIter = m_waitingJobs.find(id);
if ((waitingJobsIter == m_waitingJobs.end()) || waitingJobsIter.value().isEmpty()) { if ((waitingJobsIter == m_waitingJobs.end()) || waitingJobsIter.value().isEmpty()) {
// No more waiting jobs for given ServiceID
m_busyServices.remove(id); m_busyServices.remove(id);
return; return;
} }
@ -437,13 +441,12 @@ namespace
void DownloadHandlerImpl::processFinishedDownload() void DownloadHandlerImpl::processFinishedDownload()
{ {
const QString url = m_reply->url().toString(); qDebug("Download finished: %s", qUtf8Printable(url()));
qDebug("Download finished: %s", qUtf8Printable(url));
// Check if the request was successful // Check if the request was successful
if (m_reply->error() != QNetworkReply::NoError) { if (m_reply->error() != QNetworkReply::NoError) {
// Failure // Failure
qDebug("Download failure (%s), reason: %s", qUtf8Printable(url), qUtf8Printable(errorCodeToString(m_reply->error()))); qDebug("Download failure (%s), reason: %s", qUtf8Printable(url()), qUtf8Printable(errorCodeToString(m_reply->error())));
setError(errorCodeToString(m_reply->error())); setError(errorCodeToString(m_reply->error()));
finish(); finish();
return; return;