VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1164 from srcejon/fix_httpdownload_googledrive 

HttpDownloadManager - Fix Google Drive downloads
This commit is contained in:
Edouard Griffiths 2022-02-25 11:45:46 +01:00 committed by GitHub
parent c9e33c86aa c0fc9cabd7
commit 21b2131148
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sdrbase/util/httpdownloadmanager.cpp
View File

@ -20,7 +20,7 @@
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#include <QDateTime> #include <QDateTime>
#include <QRegExp> #include <QRegularExpression>
HttpDownloadManager::HttpDownloadManager() HttpDownloadManager::HttpDownloadManager()
{ {
@ -119,36 +119,36 @@ void HttpDownloadManager::downloadFinished(QNetworkReply *reply)
if (!isHttpRedirect(reply)) if (!isHttpRedirect(reply))
{ {
QByteArray data = reply->readAll(); QByteArray data = reply->readAll();
QRegExp regexp("href=\\\"\\/uc\\?export\\=download\\&amp\\;confirm=([a-zA-Z0-9_\\-]*)\\&amp\\;id=([a-zA-Z0-9_\\-\\=\\;\\&]*)\\\"");
// Google drive can redirect downloads to a virus scan warning page // Google drive can redirect downloads to a virus scan warning page
// We need to extract the confirm code and retry // We need to use URL with confirm code and retry
if (url.startsWith("https://drive.google.com/uc?export=download") if (url.startsWith("https://drive.google.com/uc?export=download")
&& data.startsWith("<!DOCTYPE html>") && data.startsWith("<!DOCTYPE html>")
&& !filename.endsWith(".html") && !filename.endsWith(".html")
&& (regexp.indexIn(data) >= 0)
) )
{ {
QString confirm = regexp.capturedTexts()[1]; QRegularExpression regexp("action=\\\"(.*?)\\\"");
QString id = regexp.capturedTexts()[2]; QRegularExpressionMatch match = regexp.match(data);
if (confirm.isEmpty()) if (match.hasMatch())
{ {
qDebug() << "HttpDownloadManager::downloadFinished - Got HTML response but not confirmation code"; m_downloads.removeAll(reply);
qDebug() << QString(data); m_filenames.remove(idx);
qDebug() << regexp.capturedTexts();
QString action = match.captured(1);
action = action.replace("&amp;", "&");
qDebug() << "HttpDownloadManager: Skipping Go ogle drive warning - downloading " << action;
QUrl newUrl(action);
QNetworkReply *newReply = download(newUrl, filename);
// Indicate that we are retrying, so progress dialogs can be updated
emit retryDownload(filename, reply, newReply);
retry = true;
}
else
{
qDebug() << "HttpDownloadManager: Can't find action URL in Google Drive page " << data;
} }
m_downloads.removeAll(reply);
m_filenames.remove(idx);
qDebug() << "HttpDownloadManager: Skipping Google drive warning: " << confirm << " " << id;
QUrl newUrl(QString("https://drive.google.com/uc?export=download&confirm=%1&id=%2").arg(confirm).arg(id));
QNetworkReply *newReply = download(newUrl, filename);
// Indicate that we are retrying, so progress dialogs can be updated
emit retryDownload(filename, reply, newReply);
retry = true;
} }
else if (writeToFile(filename, data)) else if (writeToFile(filename, data))
{ {