kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

+ issue #0001705: Download manager does not follow redirect (HTTP status 302)

Browse Source
This commit is contained in:
wmayer
2015-01-04 18:15:20 +01:00
parent 0d1fc35b20
commit c3102b69bc
4 changed files with 65 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Gui/DownloadManager.cpp
View File

@@ -71,6 +71,8 @@ DownloadManager::DownloadManager(QWidget *parent)
m_model = new DownloadModel(this);
ui->downloadsView->setModel(m_model);
connect(ui->cleanupButton, SIGNAL(clicked()), this, SLOT(cleanup()));
connect(m_manager, SIGNAL(finished(QNetworkReply*)),
this, SLOT(replyFinished(QNetworkReply*)));
load();
Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance();
@@ -108,11 +110,57 @@ int DownloadManager::activeDownloads() const
return count;
}
QUrl DownloadManager::redirectUrl(const QUrl& url) const
{
QUrl redirectUrl = url;
if (url.host() == QLatin1String("www.dropbox.com")) {
QList< QPair<QString, QString> > query = url.queryItems();
for (QList< QPair<QString, QString> >::iterator it = query.begin(); it != query.end(); ++it) {
if (it->first == QLatin1String("dl") && it->second == QLatin1String("0\r\n")) {
redirectUrl.removeQueryItem(QLatin1String("dl"));
redirectUrl.addQueryItem(QLatin1String("dl"), QLatin1String("1\r\n"));
break;
}
}
}
return redirectUrl;
}
void DownloadManager::replyFinished(QNetworkReply* reply)
{
// The 'requestFileName' is used to store the argument passed by 'download()'
// and to also distinguish between replies created by 'download()' and
// this method.
// Replies from this method shouldn't be further examined because it's not
// assumed to get re-directed urls over several steps.
QVariant var = reply->property("requestFileName");
if (var.isValid()) {
bool requestFileName = reply->property("requestFileName").toBool();
QUrl url = reply->url();
// If this is a redirected url use this instead
QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
if (!redirectUrl.isEmpty()) {
url = redirectUrl;
}
// start the actual download now
handleUnsupportedContent(m_manager->get(QNetworkRequest(url)), requestFileName);
}
reply->deleteLater();
}
void DownloadManager::download(const QNetworkRequest &request, bool requestFileName)
{
if (request.url().isEmpty())
return;
handleUnsupportedContent(m_manager->get(request), requestFileName);
// postpone this reply until we can examine it in replyFinished
QNetworkReply* reply = m_manager->get(request);
reply->setProperty("requestFileName", QVariant(requestFileName));
}
void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool requestFileName)