dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NOISSUE less jumpy download progress bars and redirect URL fix

Browse source
This commit is contained in:
Petr Mrázek 2017-04-30 02:54:37 +02:00
parent 1be99b075a
commit 794102b32c
4 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
api/logic/net/Download.cpp
View file

@ -106,6 +106,17 @@ void Download::executeTask()
void Download::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
{
// FIXME: ignore unknown size. for now.
if(bytesTotal == -1)
{
return;
}
// FIXME: ignore redirects... for now.
auto redirectURL = getRedirect();
if(!redirectURL.isEmpty())
{
return;
}
m_progressTotal = bytesTotal;
m_progress = bytesReceived;
emit progress(bytesReceived, bytesTotal);
@ -134,7 +145,7 @@ void Download::downloadError(QNetworkReply::NetworkError error)
}
}
bool Download::handleRedirect()
QString Download::getRedirect()
{
QVariant redirect = m_reply->header(QNetworkRequest::LocationHeader);
QString redirectURL;
@ -151,10 +162,15 @@ bool Download::handleRedirect()
redirectURL = m_reply->url().scheme() + ":" + data;
}
}
return redirectURL;
}
bool Download::handleRedirect()
{
auto redirectURL = getRedirect();
if (!redirectURL.isEmpty())
{
m_url = QUrl(redirect.toString());
qDebug() << "Following redirect to " << m_url.toString();
m_url = QUrl(redirectURL);
start();
return true;
}