1 files changed, 127 insertions, 29 deletions

diff --git a/src/libs/installer/downloadarchivesjob.cpp b/src/libs/installer/downloadarchivesjob.cpp
index 5dbccc0b6..65eead1f9 100644
--- a/src/libs/installer/downloadarchivesjob.cpp
+++ b/src/libs/installer/downloadarchivesjob.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -32,6 +32,7 @@
 #include "messageboxhandler.h"
 #include "packagemanagercore.h"
 #include "utils.h"
+#include "fileutils.h"
 
 #include "filedownloader.h"
 #include "filedownloaderfactory.h"
@@ -43,10 +44,12 @@ using namespace QInstaller;
 using namespace KDUpdater;
 
 
+static constexpr uint scMaxRetries = 5;
+
 /*!
     Creates a new DownloadArchivesJob with parent \a core.
 */
-DownloadArchivesJob::DownloadArchivesJob(PackageManagerCore *core)
+DownloadArchivesJob::DownloadArchivesJob(PackageManagerCore *core, const QString &objectName)
     : Job(core)
     , m_core(core)
     , m_downloader(nullptr)
@@ -55,8 +58,12 @@ DownloadArchivesJob::DownloadArchivesJob(PackageManagerCore *core)
     , m_canceled(false)
     , m_lastFileProgress(0)
     , m_progressChangedTimerId(0)
+    , m_totalSizeToDownload(0)
+    , m_totalSizeDownloaded(0)
+    , m_retryCount(scMaxRetries)
 {
     setCapabilities(Cancelable);
+    setObjectName(objectName);
 }
 
 /*!
@@ -72,17 +79,26 @@ DownloadArchivesJob::~DownloadArchivesJob()
     Sets the \a archives to download. The first value of each pair contains the file name to register
     the file in the installer's internal file system, the second one the source url.
 */
-void DownloadArchivesJob::setArchivesToDownload(const QList<QPair<QString, QString> > &archives)
+void DownloadArchivesJob::setArchivesToDownload(const QList<PackageManagerCore::DownloadItem> &archives)
 {
     m_archivesToDownload = archives;
     m_archivesToDownloadCount = archives.count();
 }
 
 /*!
+    Sets the expected total size of archives to download to \a total.
+*/
+void DownloadArchivesJob::setExpectedTotalSize(quint64 total)
+{
+    m_totalSizeToDownload = total;
+}
+
+/*!
     \reimp
 */
 void DownloadArchivesJob::doStart()
 {
+    m_totalDownloadSpeedTimer.start();
     m_archivesDownloaded = 0;
     fetchNextArchiveHash();
 }
@@ -99,17 +115,17 @@ void DownloadArchivesJob::doCancel()
 
 void DownloadArchivesJob::fetchNextArchiveHash()
 {
-    if (m_core->testChecksum()) {
+    if (m_archivesToDownload.isEmpty()) {
+        emitFinished();
+        return;
+    }
+
+    if (m_archivesToDownload.first().checkSha1CheckSum) {
         if (m_canceled) {
             finishWithError(tr("Canceled"));
             return;
         }
 
-        if (m_archivesToDownload.isEmpty()) {
-            emitFinished();
-            return;
-        }
-
         if (m_downloader)
             m_downloader->deleteLater();
 
@@ -134,6 +150,7 @@ void DownloadArchivesJob::finishedHashDownload()
 
     QFile sha1HashFile(m_downloader->downloadedFileName());
     if (sha1HashFile.open(QFile::ReadOnly)) {
+        emit hashDownloadReady(m_downloader->downloadedFileName());
         m_currentHash = sha1HashFile.readAll();
         fetchNextArchive();
     } else {
@@ -198,41 +215,115 @@ void DownloadArchivesJob::timerEvent(QTimerEvent *event)
 }
 
 /*!
+    Builds a textual representation of the total download \a status and
+    emits the \c {downloadStatusChanged()} signal.
+*/
+void DownloadArchivesJob::onDownloadStatusChanged(const QString &status)
+{
+    if (!m_downloader || m_canceled) {
+        emit downloadStatusChanged(status);
+        return;
+    }
+
+    QString extendedStatus;
+    quint64 currentDownloaded = m_totalSizeDownloaded + m_downloader->getBytesReceived();
+    if (m_totalSizeToDownload > 0) {
+        QString bytesReceived = humanReadableSize(currentDownloaded);
+        const QString bytesToReceive = humanReadableSize(m_totalSizeToDownload);
+
+        // remove the unit from the bytesReceived value if bytesToReceive has the same
+        const QString tmp = bytesToReceive.mid(bytesToReceive.indexOf(QLatin1Char(' ')));
+        if (bytesReceived.endsWith(tmp))
+            bytesReceived.chop(tmp.length());
+
+        extendedStatus = tr("%1 of %2").arg(bytesReceived, bytesToReceive);
+    } else if (currentDownloaded > 0) {
+        extendedStatus = tr("%1 downloaded.").arg(humanReadableSize(currentDownloaded));
+    }
+
+    const quint64 totalDownloadSpeed = currentDownloaded
+        / double(m_totalDownloadSpeedTimer.elapsed() / 1000);
+
+    if (m_totalSizeToDownload > 0 && totalDownloadSpeed > 0) {
+        const qint64 time = (m_totalSizeToDownload - currentDownloaded) / totalDownloadSpeed;
+
+        int s = time % 60;
+        const int d = time / 86400;
+        const int h = (time / 3600) - (d * 24);
+        const int m = (time / 60) - (d * 1440) - (h * 60);
+
+        QString days;
+        if (d > 0)
+            days = tr("%n day(s), ", "", d);
+
+        QString hours;
+        if (h > 0)
+            hours = tr("%n hour(s), ", "", h);
+
+        QString minutes;
+        if (m > 0)
+            minutes = tr("%n minute(s)", "", m);
+
+        QString seconds;
+        if (s >= 0 && minutes.isEmpty()) {
+            s = (s <= 0 ? 1 : s);
+            seconds = tr("%n second(s)", "", s);
+        }
+        extendedStatus += tr(" - %1%2%3%4 remaining.").arg(days, hours, minutes, seconds);
+    } else {
+        extendedStatus += tr(" - unknown time remaining.");
+    }
+
+    emit downloadStatusChanged(tr("Archive: ") + status
+        + QLatin1String("<br>") + tr("Total: ")+ extendedStatus);
+}
+
+/*!
     Registers the just downloaded file in the installer's file system.
 */
 void DownloadArchivesJob::registerFile()
 {
     Q_ASSERT(m_downloader != nullptr);
 
-    if (m_canceled)
+    if (m_canceled || m_archivesToDownload.isEmpty())
         return;
 
-    if (m_core->testChecksum() && m_currentHash != m_downloader->sha1Sum().toHex()) {
+    if (m_archivesToDownload.first().checkSha1CheckSum && m_currentHash != m_downloader->sha1Sum().toHex()) {
         //TODO: Maybe we should try to download the file again automatically
         const QMessageBox::Button res =
             MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(),
             QLatin1String("DownloadError"), tr("Download Error"), tr("Hash verification while "
-            "downloading failed. This is a temporary error, please retry."),
-            QMessageBox::Retry | QMessageBox::Cancel, QMessageBox::Cancel);
-
-        // If run from command line instance, do not continue if hash verification failed.
-        // Same download is tried again and again causing infinite loop if hash not
-        // fixed to repositories.
-        if (res == QMessageBox::Cancel || m_core->isCommandLineInstance()) {
-            finishWithError(tr("Cannot verify Hash"));
+            "downloading failed. This is a temporary error, please retry.\n\n"
+            "Expected: %1 \nDownloaded: %2").arg(QString::fromLatin1(m_currentHash), QString::fromLatin1(m_downloader->sha1Sum().toHex())),
+            QMessageBox::Retry | QMessageBox::Cancel, QMessageBox::Retry);
+
+        if (res == QMessageBox::Cancel) {
+            finishWithError(tr("Cannot verify Hash\nExpected: %1 \nDownloaded: %2")
+                .arg(QString::fromLatin1(m_currentHash), QString::fromLatin1(m_downloader->sha1Sum().toHex())));
             return;
         }
+        // When using command line instance, only retry a number of times to avoid
+        // infinite loop in case the automatic answer for the messagebox is "Retry"
+        if (m_core->isCommandLineInstance() && (--m_retryCount == 0)) {
+           finishWithError(tr("Retry count (%1) exceeded").arg(scMaxRetries));
+           return;
+        }
     } else {
+        m_retryCount = scMaxRetries;
+
         ++m_archivesDownloaded;
+        m_totalSizeDownloaded += QFile(m_downloader->downloadedFileName()).size();
         if (m_progressChangedTimerId) {
             killTimer(m_progressChangedTimerId);
             m_progressChangedTimerId = 0;
             emit progressChanged(double(m_archivesDownloaded) / m_archivesToDownloadCount);
         }
 
-        const QPair<QString, QString> pair = m_archivesToDownload.takeFirst();
-        BinaryFormatEngineHandler::instance()->registerResource(pair.first,
+        const PackageManagerCore::DownloadItem item = m_archivesToDownload.takeFirst();
+        BinaryFormatEngineHandler::instance()->registerResource(item.fileName,
             m_downloader->downloadedFileName());
+
+        emit fileDownloadReady(m_downloader->downloadedFileName());
     }
     fetchNextArchiveHash();
 }
@@ -250,14 +341,21 @@ void DownloadArchivesJob::downloadFailed(const QString &error)
     const QMessageBox::StandardButton b =
         MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(),
         QLatin1String("archiveDownloadError"), tr("Download Error"), tr("Cannot download archive %1: %2")
-        .arg(m_archivesToDownload.first().second, error), QMessageBox::Retry | QMessageBox::Cancel);
+        .arg(m_archivesToDownload.first().sourceUrl, error), QMessageBox::Retry | QMessageBox::Cancel,
+        QMessageBox::Retry);
+
+    if (b == QMessageBox::Retry) {
+        // When using command line instance, only retry a number of times to avoid
+        // infinite loop in case the automatic answer for the messagebox is "Retry"
+         if (m_core->isCommandLineInstance() && (--m_retryCount == 0)) {
+            finishWithError(tr("Retry count (%1) exceeded").arg(scMaxRetries));
+            return;
+         }
 
-    // Do not call fetchNextArchiveHash when using command line instance,
-    // installer tries to download the same archive causing infinite loop
-    if (b == QMessageBox::Retry && !m_core->isCommandLineInstance())
         QMetaObject::invokeMethod(this, "fetchNextArchiveHash", Qt::QueuedConnection);
-    else
+    } else {
         downloadCanceled();
+    }
 }
 
 void DownloadArchivesJob::finishWithError(const QString &error)
@@ -273,13 +371,13 @@ void DownloadArchivesJob::finishWithError(const QString &error)
 KDUpdater::FileDownloader *DownloadArchivesJob::setupDownloader(const QString &suffix, const QString &queryString)
 {
     KDUpdater::FileDownloader *downloader = nullptr;
-    const QFileInfo fi = QFileInfo(m_archivesToDownload.first().first);
+    const QFileInfo fi = QFileInfo(m_archivesToDownload.first().fileName);
     const Component *const component = m_core->componentByName(PackageManagerCore::checkableName(QFileInfo(fi.path()).fileName()));
     if (component) {
         QString fullQueryString;
         if (!queryString.isEmpty())
             fullQueryString = QLatin1String("?") + queryString;
-        const QUrl url(m_archivesToDownload.first().second + suffix + fullQueryString);
+        const QUrl url(m_archivesToDownload.first().sourceUrl + suffix + fullQueryString);
         const QString &scheme = url.scheme();
         downloader = FileDownloaderFactory::instance().create(scheme, this);
 
@@ -295,7 +393,7 @@ KDUpdater::FileDownloader *DownloadArchivesJob::setupDownloader(const QString &s
             connect(downloader, &FileDownloader::downloadCanceled, this, &DownloadArchivesJob::downloadCanceled);
             connect(downloader, &FileDownloader::downloadAborted, this, &DownloadArchivesJob::downloadFailed,
                 Qt::QueuedConnection);
-            connect(downloader, &FileDownloader::downloadStatus, this, &DownloadArchivesJob::downloadStatusChanged);
+            connect(downloader, &FileDownloader::downloadStatus, this, &DownloadArchivesJob::onDownloadStatusChanged);
 
             if (FileDownloaderFactory::isSupportedScheme(scheme)) {
                 downloader->setDownloadedFileName(component->localTempPath() + QLatin1Char('/')