Install progress reporting fixed

Author: OleksandrChaika

src/FSM/States/Installing.cpp

@@ -38,10 +38,12 @@ namespace sua {
         subscribe(Installer::EVENT_INSTALLING, [this, &ctx](const std::map<std::string, std::string>& payload) {
             const auto percentage = std::stoi(payload.at("percentage"));
             Logger::info("RAUC install progress: {}", percentage);
-            send(ctx, IMqttProcessor::TOPIC_FEEDBACK, "installing");
+						ctx.desiredState.installProgressPercentage = percentage;
+						send(ctx, IMqttProcessor::TOPIC_FEEDBACK, "installing");
         });
 
-        const auto result = ctx.installerAgent->installBundle(ctx.updatesDirectory + "/temp_file");
+        auto installer    = std::make_shared<Installer>(ctx.installerAgent);
+        const auto result = installer->start(ctx.updatesDirectory + "/temp_file");
 
         if(result == TechCode::OK) {
             Logger::info("RAUC install completed");

src/Install/DummyRaucInstaller.cpp

@@ -31,7 +31,10 @@ namespace sua {
 
     int32_t DummyRaucInstaller::getInstallProgress()
     {
-        return 0;
+        static int progress = 0;
+        progress += 1;
+        progress = std::min(100, progress);
+        return progress;
     }
 
     std::string DummyRaucInstaller::getBundleVersion()

src/Install/Installer.cpp

@@ -20,6 +20,11 @@
 
 #include <gio/gio.h>
 
+#include <chrono>
+#include <thread>
+
+using namespace std::chrono_literals;
+
 namespace sua {
 
     const std::string Installer::EVENT_INSTALLING = "Installer/Installing";
@@ -41,17 +46,19 @@ namespace sua {
 
         while(installing) {
             progressPercentage = _installerAgent->getInstallProgress();
-            sleep(2);
+						std::this_thread::sleep_for(2000ms);
             count++;
             if(progressPercentage >= 100 || count >= 120) {
                 installing = false;
             }
 
             if(progressPercentage >= progressNotificationLimiter) {
-                std::map<std::string, std::string> payload;
-                payload["percentage"] = std::to_string(progressPercentage);
-                sua::Dispatcher::instance().dispatch(EVENT_INSTALLING, payload);
-                progressNotificationLimiter += 10;
+                if(progressPercentage != 100) {
+                    std::map<std::string, std::string> payload;
+                    payload["percentage"] = std::to_string(progressPercentage);
+                    sua::Dispatcher::instance().dispatch(EVENT_INSTALLING, payload);\
+                }
+								progressNotificationLimiter += 10;
             }
         }