Add alternative way to update components from repository

Components can be updated from online repository using version number.
Sometimes there is a need to update to an older version which is now
possible by using content sha. Content sha can be added to repository
with repogen --sha-update <component_id>. If there is a new content sha
available in the repository, component is updated although it version
number might be smaller. After the content sha is removed from online
repository, the normal update with version number is performed.

Task-number: QTIFW-1798
Change-Id: Id9e32b0345af5101cccaf6e30c81bd39691d9590
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

5 files changed, 25 insertions, 7 deletions

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 66f333377..c5d74cdfa 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -300,6 +300,7 @@ void Component::loadDataFromPackage(const KDUpdater::LocalPackage &package)
     setValue(scCurrentState, scInstalled);
     setValue(scCheckable, package.checkable ? scTrue : scFalse);
     setValue(scExpandedByDefault, package.expandedByDefault ? scTrue : scFalse);
+    setValue(scContentSha1, package.contentSha1);
 }
 
 /*!
@@ -341,6 +342,7 @@ void Component::loadDataFromPackage(const Package &package)
     if (PackageManagerCore::noForceInstallation())
         forced = scFalse;
     setValue(scForcedInstallation, forced);
+    setValue(scContentSha1, package.data(scContentSha1).toString());
 
     setLocalTempPath(QInstaller::pathFromUrl(package.packageSource().url));
     const QStringList uis = package.data(QLatin1String("UserInterfaces")).toString()
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h
index 42b14ce63..f1105941b 100644
--- a/src/libs/installer/constants.h
+++ b/src/libs/installer/constants.h
@@ -67,6 +67,7 @@ static const QLatin1String scUncompressedSizeSum("UncompressedSizeSum");
 static const QLatin1String scRequiresAdminRights("RequiresAdminRights");
 static const QLatin1String scOfflineBinaryName("OfflineBinaryName");
 static const QLatin1String scSHA1("SHA1");
+static const QLatin1String scContentSha1("ContentSha1");
 
 // constants used throughout the components class
 static const QLatin1String scVirtual("Virtual");
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 7528a3188..5bbccbe98 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -1549,9 +1549,8 @@ bool PackageManagerCore::fetchPackagesTree(const PackagesList &packages, const L
                         continue;
 
                     const LocalPackage localPackage = installedPackages.value(name);
-                    const QString updateVersion = update->data(scVersion).toString();
-                    if (KDUpdater::compareVersion(updateVersion, localPackage.version) <= 0)
-                        continue;  // remote version equals or is less than the installed maintenance tool
+                    if (!d->packageNeedsUpdate(localPackage, update))
+                        continue;
 
                     const QDate updateDate = update->data(scReleaseDate).toDate();
                     if (localPackage.lastUpdateDate >= updateDate)
@@ -2322,6 +2321,7 @@ PackageManagerCore::Status PackageManagerCore::updateComponentsSilently(const QS
 
     if (componentList.count() ==  0) {
         qCDebug(QInstaller::lcInstallerInstallLog) << "No updates available.";
+        setCanceled();
     } else {
         // Check if essential components are available (essential components are disabled).
         // If essential components are found, update first essential updates,
@@ -3769,10 +3769,8 @@ bool PackageManagerCore::fetchUpdaterPackages(const PackagesList &remotes, const
                 continue;   // Update for not installed package found, skip it.
 
             const LocalPackage &localPackage = locals.value(name);
-            const QString updateVersion = update->data(scVersion).toString();
-            if (KDUpdater::compareVersion(updateVersion, localPackage.version) <= 0)
+            if (!d->packageNeedsUpdate(localPackage, update))
                 continue;
-
             // It is quite possible that we may have already installed the update. Lets check the last
             // update date of the package and the release date of the update. This way we can compare and
             // figure out if the update has been installed or not.
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index f4670c738..e6220ba35 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -2246,7 +2246,8 @@ void PackageManagerCorePrivate::installComponent(Component *component, double pr
                                   component->value(scUncompressedSize).toULongLong(),
                                   component->value(scInheritVersion),
                                   component->isCheckable(),
-                                  component->isExpandedByDefault());
+                                  component->isExpandedByDefault(),
+                                  component->value(scContentSha1));
     m_localPackageHub->writeToDisk();
 
     component->setInstalled();
@@ -2898,4 +2899,19 @@ bool PackageManagerCorePrivate::askUserConfirmCommand() const
     }
 }
 
+bool PackageManagerCorePrivate::packageNeedsUpdate(const LocalPackage &localPackage, const Package *update) const
+{
+    bool updateNeeded = true;
+    const QString contentSha1 = update->data(scContentSha1).toString();
+    if (!contentSha1.isEmpty()) {
+        if (contentSha1 == localPackage.contentSha1)
+            updateNeeded = false;
+    } else {
+        const QString updateVersion = update->data(scVersion).toString();
+        if (KDUpdater::compareVersion(updateVersion, localPackage.version) <= 0)
+            updateNeeded = false;
+    }
+    return updateNeeded;
+}
+
 } // namespace QInstaller
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 858baf9eb..4d5021471 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -254,6 +254,7 @@ private:
     bool acceptLicenseAgreements() const;
     bool askUserAcceptLicense(const QString &name, const QString &content) const;
     bool askUserConfirmCommand() const;
+    bool packageNeedsUpdate(const LocalPackage &localPackage, const Package *update) const;
 
 private:
     PackageManagerCore *m_core;