Merge pull request #1164 from srcejon/fix_httpdownload_googledrive

HttpDownloadManager - Fix Google Drive downloads
Merge pull request #1163 from srcejon/fix_1161
2024-11-28 18:58:48 -05:00 · 2022-02-25 11:45:46 +01:00 · 2022-02-25 10:55:53 +01:00 · 2022-02-25 00:02:13 +00:00 · 2022-02-24 16:27:32 +00:00
3 changed files with 69 additions and 23 deletions
--- a/plugins/samplesource/usrpinput/usrpinput.cpp
+++ b/plugins/samplesource/usrpinput/usrpinput.cpp
@ -35,6 +35,7 @@
 #include "device/deviceapi.h"
 #include "dsp/dspcommands.h"
 #include "dsp/dspengine.h"
+#include "util/poweroftwo.h"
 #include "usrpinput.h"
 #include "usrpinputthread.h"
 #include "usrp/deviceusrpparam.h"
@ -338,8 +339,11 @@ bool USRPInput::acquireChannel()

            m_streamId = m_deviceShared.m_deviceParams->getDevice()->get_rx_stream(stream_args);

-            // Match our receive buffer size to what UHD uses
+            // Decimators require buffers to sized as powers of two (See #1161)
            m_bufSamples = m_streamId->get_max_num_samps();
+            if (!isPowerOfTwo(m_bufSamples)) {
+                m_bufSamples = lowerPowerOfTwo(m_bufSamples);
+            }

            // Wait for reference and LO to lock
            DeviceUSRP::waitForLock(usrp, m_settings.m_clockSource, m_deviceShared.m_channel);
--- a/sdrbase/util/httpdownloadmanager.cpp
+++ b/sdrbase/util/httpdownloadmanager.cpp
@ -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))
            {
--- a/sdrbase/util/poweroftwo.h
+++ b/sdrbase/util/poweroftwo.h
@ -0,0 +1,42 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2022 Jon Beniston, M7RCE                                        //
+//                                                                               //
+// This program is free software; you can redistribute it and/or modify          //
+// it under the terms of the GNU General Public License as published by          //
+// the Free Software Foundation as version 3 of the License, or                  //
+// (at your option) any later version.                                           //
+//                                                                               //
+// This program is distributed in the hope that it will be useful,               //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                  //
+// GNU General Public License V3 for more details.                               //
+//                                                                               //
+// You should have received a copy of the GNU General Public License             //
+// along with this program. If not, see <http://www.gnu.org/licenses/>.          //
+///////////////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDE_POWEROFTWO_H
+#define INCLUDE_POWEROFTWO_H
+
+#include <cstdint>
+
+// Is x a power of two
+// From: https://stackoverflow.com/questions/600293/how-to-check-if-a-number-is-a-power-of-2
+static bool isPowerOfTwo(uint32_t x)
+{
+    return (x & (x - 1)) == 0;
+}
+
+// Calculate next power of 2 lower than x
+// From: https://stackoverflow.com/questions/2679815/previous-power-of-2
+static uint32_t lowerPowerOfTwo(uint32_t x)
+{
+    x = x | (x >> 1);
+    x = x | (x >> 2);
+    x = x | (x >> 4);
+    x = x | (x >> 8);
+    x = x | (x >> 16);
+    return x - (x >> 1);
+}
+
+#endif /* INCLUDE_POWEROFTWO_H */
Author	SHA1	Message	Date
Edouard Griffiths	21b2131148	Merge pull request #1164 from srcejon/fix_httpdownload_googledrive HttpDownloadManager - Fix Google Drive downloads	2022-02-25 11:45:46 +01:00
Edouard Griffiths	c9e33c86aa	Merge pull request #1163 from srcejon/fix_1161 USRPInput - Ensure IQ buffer size is a power of two, as required by decimators	2022-02-25 10:55:53 +01:00
Jon Beniston	c0fc9cabd7	HttpDownloadManager - Fix Google Drive downloads	2022-02-25 00:02:13 +00:00
Jon Beniston	ffe96cbf63	Ensure IQ buffer size is a power of two, as required by decimators	2022-02-24 16:27:32 +00:00