Clean up code

src/base/net/downloadhandler.cpp

@@ -41,7 +41,6 @@
 #include "base/utils/fs.h"
 #include "base/utils/gzip.h"
 #include "base/utils/misc.h"
-#include "downloadmanager.h"
 
 namespace
 {
@@ -95,44 +94,43 @@ QString Net::DownloadHandler::url() const
 
 void Net::DownloadHandler::processFinishedDownload()
 {
-    QString url = m_reply->url().toString();
+    const QString url = m_reply->url().toString();
     qDebug("Download finished: %s", qUtf8Printable(url));
+
     // Check if the request was successful
     if (m_reply->error() != QNetworkReply::NoError) {
         // Failure
         qDebug("Download failure (%s), reason: %s", qUtf8Printable(url), qUtf8Printable(errorCodeToString(m_reply->error())));
         emit downloadFailed(m_downloadRequest.url(), errorCodeToString(m_reply->error()));
         this->deleteLater();
+        return;
+    }
+
+    // Check if the server ask us to redirect somewhere else
+    const QVariant redirection = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
+    if (redirection.isValid()) {
+        // We should redirect
+        handleRedirection(redirection.toUrl());
+        return;
+    }
+
+    // Success
+    const QByteArray replyData = (m_reply->rawHeader("Content-Encoding") == "gzip")
+        ? Utils::Gzip::decompress(m_reply->readAll())
+        : m_reply->readAll();
+
+    if (m_downloadRequest.saveToFile()) {
+        QString filePath;
+        if (saveToFile(replyData, filePath))
+            emit downloadFinished(m_downloadRequest.url(), filePath);
+        else
+            emit downloadFailed(m_downloadRequest.url(), tr("I/O Error"));
     }
     else {
-        // Check if the server ask us to redirect somewhere else
+        emit downloadFinished(m_downloadRequest.url(), replyData);
-        const QVariant redirection = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
-        if (redirection.isValid()) {
-            // We should redirect
-            handleRedirection(redirection.toUrl());
-        }
-        else {
-            // Success
-            QByteArray replyData = m_reply->readAll();
-            if (m_reply->rawHeader("Content-Encoding") == "gzip") {
-                // decompress gzip reply
-                replyData = Utils::Gzip::decompress(replyData);
-            }
-
-            if (m_downloadRequest.saveToFile()) {
-                QString filePath;
-                if (saveToFile(replyData, filePath))
-                    emit downloadFinished(m_downloadRequest.url(), filePath);
-                else
-                    emit downloadFailed(m_downloadRequest.url(), tr("I/O Error"));
-            }
-            else {
-                emit downloadFinished(m_downloadRequest.url(), replyData);
-            }
-
-            this->deleteLater();
-        }
     }
+
+    this->deleteLater();
 }
 
 void Net::DownloadHandler::checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal)
@@ -155,13 +153,11 @@ void Net::DownloadHandler::checkDownloadSize(qint64 bytesReceived, qint64 bytesT
     }
 }
 
-void Net::DownloadHandler::handleRedirection(QUrl newUrl)
+void Net::DownloadHandler::handleRedirection(const QUrl &newUrl)
 {
     // Resolve relative urls
-    if (newUrl.isRelative())
+    const QUrl resolvedUrl = (newUrl.isRelative()) ? m_reply->url().resolved(newUrl) : newUrl;
-        newUrl = m_reply->url().resolved(newUrl);
+    const QString newUrlString = resolvedUrl.toString();
-
-    const QString newUrlString = newUrl.toString();
     qDebug("Redirecting from %s to %s...", qUtf8Printable(m_reply->url().toString()), qUtf8Printable(newUrlString));
 
     // Redirect to magnet workaround
@@ -174,29 +170,29 @@ void Net::DownloadHandler::handleRedirection(QUrl newUrl)
             emit downloadFailed(m_downloadRequest.url(), tr("Unexpected redirect to magnet URI."));
 
         this->deleteLater();
+        return;
     }
-    else {
+
-        DownloadHandler *redirected = m_manager->download(DownloadRequest(m_downloadRequest).url(newUrlString));
+    const DownloadHandler *redirected = m_manager->download(DownloadRequest(m_downloadRequest).url(newUrlString));
-        connect(redirected, &DownloadHandler::destroyed, this, &DownloadHandler::deleteLater);
+    connect(redirected, &DownloadHandler::destroyed, this, &DownloadHandler::deleteLater);
-        connect(redirected, &DownloadHandler::downloadFailed, this, [this](const QString &, const QString &reason)
+    connect(redirected, &DownloadHandler::downloadFailed, this, [this](const QString &, const QString &reason)
-        {
+    {
-            emit downloadFailed(url(), reason);
+        emit downloadFailed(url(), reason);
-        });
+    });
-        connect(redirected, &DownloadHandler::redirectedToMagnet, this, [this](const QString &, const QString &magnetUri)
+    connect(redirected, &DownloadHandler::redirectedToMagnet, this, [this](const QString &, const QString &magnetUri)
-        {
+    {
-            emit redirectedToMagnet(url(), magnetUri);
+        emit redirectedToMagnet(url(), magnetUri);
-        });
+    });
-        connect(redirected, static_cast<void (DownloadHandler::*)(const QString &, const QString &)>(&DownloadHandler::downloadFinished)
+    connect(redirected, static_cast<void (DownloadHandler::*)(const QString &, const QString &)>(&DownloadHandler::downloadFinished)
-                , this, [this](const QString &, const QString &fileName)
+            , this, [this](const QString &, const QString &fileName)
-        {
+    {
-            emit downloadFinished(url(), fileName);
+        emit downloadFinished(url(), fileName);
-        });
+    });
-        connect(redirected, static_cast<void (DownloadHandler::*)(const QString &, const QByteArray &)>(&DownloadHandler::downloadFinished)
+    connect(redirected, static_cast<void (DownloadHandler::*)(const QString &, const QByteArray &)>(&DownloadHandler::downloadFinished)
-                , this, [this](const QString &, const QByteArray &data)
+            , this, [this](const QString &, const QByteArray &data)
-        {
+    {
-            emit downloadFinished(url(), data);
+        emit downloadFinished(url(), data);
-        });
+    });
-    }
 }
 
 QString Net::DownloadHandler::errorCodeToString(const QNetworkReply::NetworkError status)

src/base/net/downloadhandler.h

@@ -67,7 +67,7 @@ namespace Net
 
     private:
         void assignNetworkReply(QNetworkReply *reply);
-        void handleRedirection(QUrl newUrl);
+        void handleRedirection(const QUrl &newUrl);
 
         static QString errorCodeToString(QNetworkReply::NetworkError status);
 

src/base/net/downloadmanager.cpp

@@ -131,9 +131,7 @@ Net::DownloadManager *Net::DownloadManager::m_instance = nullptr;
 Net::DownloadManager::DownloadManager(QObject *parent)
     : QObject(parent)
 {
-#ifndef QT_NO_OPENSSL
     connect(&m_networkManager, &QNetworkAccessManager::sslErrors, this, &Net::DownloadManager::ignoreSslErrors);
-#endif
     connect(&m_networkManager, &QNetworkAccessManager::finished, this, &DownloadManager::handleReplyFinished);
     connect(ProxyConfigurationManager::instance(), &ProxyConfigurationManager::proxyConfigurationChanged
             , this, &DownloadManager::applyProxySettings);
@@ -270,7 +268,6 @@ void Net::DownloadManager::handleReplyFinished(QNetworkReply *reply)
     handler->disconnect(this);
 }
 
-#ifndef QT_NO_OPENSSL
 void Net::DownloadManager::ignoreSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
 {
     QStringList errorList;
@@ -281,7 +278,6 @@ void Net::DownloadManager::ignoreSslErrors(QNetworkReply *reply, const QList<QSs
     // Ignore all SSL errors
     reply->ignoreSslErrors();
 }
-#endif
 
 Net::DownloadRequest::DownloadRequest(const QString &url)
     : m_url {url}
@@ -348,7 +344,7 @@ Net::ServiceID Net::ServiceID::fromURL(const QUrl &url)
     return {url.host(), url.port(80)};
 }
 
-uint Net::qHash(const ServiceID &serviceID, uint seed)
+uint Net::qHash(const ServiceID &serviceID, const uint seed)
 {
     return ::qHash(serviceID.hostName, seed) ^ serviceID.port;
 }

src/base/net/downloadmanager.h

@@ -37,8 +37,8 @@
 #include <QQueue>
 #include <QSet>
 
-class QNetworkReply;
 class QNetworkCookie;
+class QNetworkReply;
 class QSslError;
 class QUrl;
 
@@ -83,6 +83,9 @@ namespace Net
         static ServiceID fromURL(const QUrl &url);
     };
 
+    uint qHash(const ServiceID &serviceID, uint seed);
+    bool operator==(const ServiceID &lhs, const ServiceID &rhs);
+
     class DownloadManager : public QObject
     {
         Q_OBJECT
@@ -106,9 +109,7 @@ namespace Net
         static bool hasSupportedScheme(const QString &url);
 
     private slots:
-    #ifndef QT_NO_OPENSSL
         void ignoreSslErrors(QNetworkReply *, const QList<QSslError> &);
-    #endif
 
     private:
         explicit DownloadManager(QObject *parent = nullptr);
@@ -123,9 +124,6 @@ namespace Net
         QSet<ServiceID> m_busyServices;
         QHash<ServiceID, QQueue<DownloadHandler *>> m_waitingJobs;
     };
-
-    uint qHash(const ServiceID &serviceID, uint seed);
-    bool operator==(const ServiceID &lhs, const ServiceID &rhs);
 }
 
 #endif // NET_DOWNLOADMANAGER_H