mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #1164 from srcejon/fix_httpdownload_googledrive 

HttpDownloadManager - Fix Google Drive downloads
pull/1171/head
Edouard Griffiths 2022-02-25 11:45:46 +01:00 zatwierdzone przez GitHub
rodzic c9e33c86aa c0fc9cabd7
commit 21b2131148
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 22 dodań i 22 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

44
sdrbase/util/httpdownloadmanager.cpp
Wyświetl plik

@ -20,7 +20,7 @@
#include <QDebug>
#include <QFile>
#include <QDateTime>
#include <QRegExp>
#include <QRegularExpression>
HttpDownloadManager::HttpDownloadManager()
{
@ -119,36 +119,36 @@ void HttpDownloadManager::downloadFinished(QNetworkReply *reply)
if (!isHttpRedirect(reply))
{
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
// 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")
&& data.startsWith("<!DOCTYPE html>")
&& !filename.endsWith(".html")
&& (regexp.indexIn(data) >= 0)
)
{
QString confirm = regexp.capturedTexts()[1];
QString id = regexp.capturedTexts()[2];
if (confirm.isEmpty())
QRegularExpression regexp("action=\\\"(.*?)\\\"");
QRegularExpressionMatch match = regexp.match(data);
if (match.hasMatch())
{
qDebug() << "HttpDownloadManager::downloadFinished - Got HTML response but not confirmation code";
qDebug() << QString(data);
qDebug() << regexp.capturedTexts();
m_downloads.removeAll(reply);
m_filenames.remove(idx);
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))
{