CLI: Add new '--cache-path' option

The option can be used to select the path for metadata cache without
opening the installer's settings dialog.

Add public PackageManagerCore::resetLocalCache() function and remove
automatic initialization of the local cache in the private core class
constructor, so we can control the timeline better. Also make
PackageManagerCore::clearLocalCache() a regular member function as
it does not need to be a Qt slot.

Task-number: QTIFW-2810
Change-Id: Ia4a903026a10b90da16ba1b93fd3098a709f7ed7
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

5 files changed, 21 insertions, 4 deletions

diff --git a/src/libs/installer/commandlineparser.cpp b/src/libs/installer/commandlineparser.cpp
index fd870da2d..3b5b46e0e 100644
--- a/src/libs/installer/commandlineparser.cpp
+++ b/src/libs/installer/commandlineparser.cpp
@@ -173,6 +173,10 @@ CommandLineParser::CommandLineParser()
                       "search command. The keys can be any of the possible package information elements, like "
                       "\"DisplayName\" and \"Description\"."),
         QLatin1String("element=regex,...")), CommandLineOnly);
+    addOption(QCommandLineOption(QStringList()
+        << CommandLineOptions::scLocalCachePathShort << CommandLineOptions::scLocalCachePathLong,
+        QLatin1String("Sets the path used for local metadata cache. The path must be writable by the current user."),
+        QLatin1String("path")));
 
     // Message query options
     addOptionWithContext(QCommandLineOption(QStringList() << CommandLineOptions::scAcceptMessageQueryShort
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h
index 77fc0237f..485982672 100644
--- a/src/libs/installer/constants.h
+++ b/src/libs/installer/constants.h
@@ -213,6 +213,8 @@ static const QLatin1String scNoDefaultInstallationShort("nd");
 static const QLatin1String scNoDefaultInstallationLong("no-default-installations");
 static const QLatin1String scFilterPackagesShort("fp");
 static const QLatin1String scFilterPackagesLong("filter-packages");
+static const QLatin1String scLocalCachePathShort("cp");
+static const QLatin1String scLocalCachePathLong("cache-path");
 
 // Developer options
 static const QLatin1String scScriptShort("s");
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 48d071321..d5f830903 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -574,11 +574,21 @@ void PackageManagerCore::cancelMetaInfoJob()
 }
 
 /*!
+    Resets the cache used to store downloaded metadata, if one was previously
+    initialized. If \a init is set to \c true, the cache is reinitialized for
+    the path configured in installer's settings.
+
+    Returns \c true on success, \c false otherwise.
+*/
+bool PackageManagerCore::resetLocalCache(bool init)
+{
+    return d->m_metadataJob.resetCache(init);
+}
+
+/*!
     Clears the contents of the cache used to store downloaded metadata.
     Returns \c true on success, \c false otherwise. An error string can
     be retrieved with \a error.
-
-    \sa {installer::clearLocalCache}{installer.clearLocalCache}
 */
 bool PackageManagerCore::clearLocalCache(QString *error)
 {
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h
index db1c0765f..2c307971a 100644
--- a/src/libs/installer/packagemanagercore.h
+++ b/src/libs/installer/packagemanagercore.h
@@ -345,6 +345,9 @@ public:
     void createLocalDependencyHash(const QString &component, const QString &dependencies) const;
     void createAutoDependencyHash(const QString &component, const QString &oldDependencies, const QString &newDependencies) const;
 
+    bool resetLocalCache(bool init = false);
+    bool clearLocalCache(QString *error = nullptr);
+
 public Q_SLOTS:
     bool runInstaller();
     bool runUninstaller();
@@ -355,7 +358,6 @@ public Q_SLOTS:
     void languageChanged();
     void setCompleteUninstallation(bool complete);
     void cancelMetaInfoJob();
-    bool clearLocalCache(QString *error = nullptr);
     void componentsToInstallNeedsRecalculation();
     void calculateUserSelectedComponentsToInstall(const QList<QModelIndex> &indexes);
     void clearComponentsToInstallCalculated();
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index c61c6bc99..64af77a98 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -664,7 +664,6 @@ void PackageManagerCorePrivate::initialize(const QHash<QString, QString> &params
     m_metadataJob.disconnect();
     m_metadataJob.setAutoDelete(false);
     m_metadataJob.setPackageManagerCore(m_core);
-    m_metadataJob.resetCache(true);
 
     connect(&m_metadataJob, &Job::infoMessage, this, &PackageManagerCorePrivate::infoMessage);
     connect(&m_metadataJob, &Job::progress, this, &PackageManagerCorePrivate::infoProgress);