1 files changed, 83 insertions, 11 deletions

diff --git a/src/libs/kdtools/updatefinder.h b/src/libs/kdtools/updatefinder.h
index 47fa42c9a..626a700fd 100644
--- a/src/libs/kdtools/updatefinder.h
+++ b/src/libs/kdtools/updatefinder.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
 **
@@ -32,19 +32,68 @@
 
 #include "task.h"
 #include "packagesource.h"
+#include "filedownloader.h"
+#include "updatesinfo_p.h"
+#include "abstracttask.h"
 
 #include <memory>
 
+using namespace QInstaller;
 namespace KDUpdater {
 
 class LocalPackageHub;
 class Update;
 
+class ParseXmlFilesTask : public AbstractTask<void>
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(ParseXmlFilesTask)
+
+public:
+    ParseXmlFilesTask(UpdatesInfo *info)
+        : m_info(info)
+    {}
+
+    void doTask(QFutureInterface<void> &fi) override
+    {
+        fi.reportStarted();
+        fi.setExpectedResultCount(1);
+
+        if (fi.isCanceled()) {
+            fi.reportFinished();
+            return; // ignore already canceled
+        }
+        m_info->parseFile();
+
+        fi.reportFinished();
+    }
+
+private:
+    UpdatesInfo *const m_info;
+};
+
+
 class KDTOOLS_EXPORT UpdateFinder : public Task
 {
     Q_OBJECT
     class Private;
 
+    struct Data {
+        Data()
+            : downloader(0) {}
+        explicit Data(const QInstaller::PackageSource &i, KDUpdater::FileDownloader *d = 0)
+            : info(i), downloader(d) {}
+
+        QInstaller::PackageSource info;
+        KDUpdater::FileDownloader *downloader;
+    };
+
+    enum struct Resolution {
+        AddPackage,
+        KeepExisting,
+        RemoveExisting
+    };
+
 public:
     UpdateFinder();
     ~UpdateFinder();
@@ -53,18 +102,41 @@ public:
 
     void setLocalPackageHub(std::weak_ptr<LocalPackageHub> hub);
     void setPackageSources(const QSet<QInstaller::PackageSource> &sources);
-    void addCompressedPackage(bool add) { m_compressedPackage = add; }
-    bool isCompressedPackage() { return m_compressedPackage; }
+
 private:
-    void doRun();
-    bool doStop();
-    bool doPause();
-    bool doResume();
+    void doRun() override;
+    bool doStop() override;
+    bool doPause() override;
+    bool doResume() override;
+    void clear();
+    void computeUpdates();
+    void cancelComputeUpdates();
+    bool downloadUpdateXMLFiles();
+    bool parseUpdateXMLFiles();
+    bool removeInvalidObjects();
+    bool computeApplicableUpdates();
+
+    QList<UpdateInfo> applicableUpdates(UpdatesInfo *updatesInfo);
+    void createUpdateObjects(const PackageSource &source, const QList<UpdateInfo> &updateInfoList);
+    Resolution checkPriorityAndVersion(const QInstaller::PackageSource &source, const QVariantHash &data) const;
+    bool waitForJobToFinish(const int &currentCount, const int &totalsCount);
+
+private slots:
+    void parseUpdatesXmlTaskFinished();
+    void slotDownloadDone();
 
 private:
-    bool m_compressedPackage;
-    Private *d;
-    Q_PRIVATE_SLOT(d, void slotDownloadDone())
+    QSet<PackageSource> m_packageSources;
+    std::weak_ptr<LocalPackageHub> m_localPackageHub;
+    QHash<QString, Update *> m_updates;
+
+    bool m_cancel;
+    int m_downloadCompleteCount;
+    int m_downloadsToComplete;
+    QHash<UpdatesInfo *, Data> m_updatesInfoList;
+    int m_updatesXmlTasks;
+    int m_updatesXmlTasksToComplete;
+    QList<ParseXmlFilesTask*> m_xmlFileTasks;
 };
 
 } // namespace KDUpdater