github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-15 09:43:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Improve Download Manager subsystem

Browse source 
PR #20257.
This commit is contained in:
Vladimir Golovnev 2024-01-13 08:55:40 +03:00 • committed by GitHub
parent ad22237a2f
commit 97c0abcbf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/base/net/downloadhandlerimpl.cpp
View file

@ -1,6 +1,6 @@
/*
* Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2015, 2018 Vladimir Golovnev <glassez@yandex.ru>
* Copyright (C) 2015-2024 Vladimir Golovnev <glassez@yandex.ru>
* Copyright (C) 2006 Christophe Dumez <chris@qbittorrent.org>
*
* This program is free software; you can redistribute it and/or
@ -75,10 +75,17 @@ Net::DownloadHandlerImpl::DownloadHandlerImpl(DownloadManager *manager
void Net::DownloadHandlerImpl::cancel()
{
if (m_reply)
if (m_isFinished)
return;
if (m_reply && m_reply->isRunning())
{
m_reply->abort();
}
else if (m_redirectionHandler)
{
m_redirectionHandler->cancel();
}
else
{
setError(errorCodeToString(QNetworkReply::OperationCanceledError));
@ -90,6 +97,7 @@ void Net::DownloadHandlerImpl::assignNetworkReply(QNetworkReply *reply)
{
Q_ASSERT(reply);
Q_ASSERT(!m_reply);
Q_ASSERT(!m_isFinished);
m_reply = reply;
m_reply->setParent(this);
@ -98,6 +106,11 @@ void Net::DownloadHandlerImpl::assignNetworkReply(QNetworkReply *reply)
connect(m_reply, &QNetworkReply::finished, this, &DownloadHandlerImpl::processFinishedDownload);
}
QNetworkReply *Net::DownloadHandlerImpl::assignedNetworkReply() const
{
return m_reply;
}
// Returns original url
QString Net::DownloadHandlerImpl::url() const
{
@ -230,10 +243,10 @@ void Net::DownloadHandlerImpl::handleRedirection(const QUrl &newUrl)
return;
}
auto *redirected = static_cast<DownloadHandlerImpl *>(
m_redirectionHandler = static_cast<DownloadHandlerImpl *>(
m_manager->download(DownloadRequest(m_downloadRequest).url(newUrlString), useProxy()));
redirected->m_redirectionCount = m_redirectionCount + 1;
connect(redirected, &DownloadHandlerImpl::finished, this, [this](const DownloadResult &result)
m_redirectionHandler->m_redirectionCount = m_redirectionCount + 1;
connect(m_redirectionHandler, &DownloadHandlerImpl::finished, this, [this](const DownloadResult &result)
{
m_result = result;
m_result.url = url();
@ -249,6 +262,7 @@ void Net::DownloadHandlerImpl::setError(const QString &error)
void Net::DownloadHandlerImpl::finish()
{
m_isFinished = true;
emit finished(m_result);
}