From 72f01e450b21ed5346c94f7736c4ac21787022a7 Mon Sep 17 00:00:00 2001
From: Lukasz Mastalerz <lukasz.mastalerz@mudita.com>
Date: Mon, 20 Nov 2023 11:43:08 +0100
Subject: [PATCH] [BH-1815] Optimalize loading music files in relaxation

Add relaxation list refresh after files added or deleted
---
 module-vfs/src/purefs/fs/notifier.cpp         |  4 +--
 .../ApplicationBellRelaxation.cpp             | 33 +++++++++++++++++--
 .../ApplicationBellRelaxation.hpp             |  1 +
 .../model/RelaxationSongsModel.cpp            |  9 +++--
 .../model/RelaxationSongsModel.hpp            |  1 +
 .../model/RelaxationSongsRepository.cpp       |  6 +++-
 .../model/RelaxationSongsRepository.hpp       |  1 +
 .../RelaxationMainWindowPresenter.cpp         |  5 +++
 .../RelaxationMainWindowPresenter.hpp         |  2 ++
 .../windows/RelaxationMainWindow.cpp          |  1 +
 10 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/module-vfs/src/purefs/fs/notifier.cpp b/module-vfs/src/purefs/fs/notifier.cpp
index bf43afb390f6223d10aa5238b8ca4ea6c3b0bb3f..5eab84f0c66b3ea205df9752a2fef872c900373a 100644
--- a/module-vfs/src/purefs/fs/notifier.cpp
+++ b/module-vfs/src/purefs/fs/notifier.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 #include <purefs/fs/notifier.hpp>
 #include <purefs/fs/inotify_message.hpp>
@@ -109,7 +109,7 @@ namespace purefs::fs::internal
             svc->bus.sendUnicast(std::move(msg), svc->GetName());
         }
         else {
-            LOG_WARN("Sent notification to the same thread is forbidded");
+            LOG_WARN("Sending a notification to the same thread is forbidden");
         }
     }
 } // namespace purefs::fs::internal
diff --git a/products/BellHybrid/apps/application-bell-relaxation/ApplicationBellRelaxation.cpp b/products/BellHybrid/apps/application-bell-relaxation/ApplicationBellRelaxation.cpp
index 5883dc4d0399650660a46fb03150bbc9f6248e0c..298d5eb96284ac433443016644847a0e59961b95 100644
--- a/products/BellHybrid/apps/application-bell-relaxation/ApplicationBellRelaxation.cpp
+++ b/products/BellHybrid/apps/application-bell-relaxation/ApplicationBellRelaxation.cpp
@@ -28,9 +28,16 @@
 #include <common/models/BatteryModel.hpp>
 #include <common/models/AudioModel.hpp>
 #include <audio/AudioMessage.hpp>
+#include <service-db/DBNotificationMessage.hpp>
 
 #include <log/log.hpp>
 
+namespace
+{
+    constexpr auto relaxationRebuildTimer         = "RelaxationRebuildTimer";
+    constexpr auto relaxationRebuildTimerInterval = std::chrono::milliseconds{5000};
+} // namespace
+
 namespace app
 {
     ApplicationBellRelaxation::ApplicationBellRelaxation(std::string name,
@@ -42,6 +49,7 @@ namespace app
           audioModel{std::make_unique<AudioModel>(this)}
     {
         bus.channels.push_back(sys::BusChannel::ServiceAudioNotifications);
+        bus.channels.push_back(sys::BusChannel::ServiceDBNotifications);
     }
     ApplicationBellRelaxation::~ApplicationBellRelaxation() = default;
 
@@ -52,8 +60,15 @@ namespace app
             return ret;
         }
 
-        batteryModel = std::make_unique<app::BatteryModel>(this);
-        player       = std::make_unique<relaxation::RelaxationPlayer>(*audioModel);
+        batteryModel                 = std::make_unique<app::BatteryModel>(this);
+        player                       = std::make_unique<relaxation::RelaxationPlayer>(*audioModel);
+        relaxationRebuildTimerHandle = sys::TimerFactory::createSingleShotTimer(
+            this, relaxationRebuildTimer, relaxationRebuildTimerInterval, [this](sys::Timer &) {
+                const auto mainWindow = getWindow(gui::name::window::main_window);
+                if (mainWindow != nullptr) {
+                    mainWindow->rebuild();
+                }
+            });
 
         createUserInterface();
 
@@ -141,6 +156,20 @@ namespace app
             return retMsg;
         }
 
+        if (auto msg = dynamic_cast<db::NotificationMessage *>(msgl); msg != nullptr) {
+            if (msg->interface == db::Interface::Name::MultimediaFiles && msg->type != db::Query::Type::Read) {
+                if (!relaxationRebuildTimerHandle.isActive()) {
+                    relaxationRebuildTimerHandle.start();
+                }
+                else {
+                    relaxationRebuildTimerHandle.restart(relaxationRebuildTimerInterval);
+                }
+                return sys::msgHandled();
+            }
+            userInterfaceDBNotification(
+                msgl, [&]([[maybe_unused]] sys::Message *, [[maybe_unused]] const std::string &) { return true; });
+            return sys::msgHandled();
+        }
         return handleAsyncResponse(resp);
     }
 
diff --git a/products/BellHybrid/apps/application-bell-relaxation/include/application-bell-relaxation/ApplicationBellRelaxation.hpp b/products/BellHybrid/apps/application-bell-relaxation/include/application-bell-relaxation/ApplicationBellRelaxation.hpp
index 37042895912e67bd8dfabe5342e578ba0dc46b34..ec49078bd5a1c6e02c504a111e662ece3828fe50 100644
--- a/products/BellHybrid/apps/application-bell-relaxation/include/application-bell-relaxation/ApplicationBellRelaxation.hpp
+++ b/products/BellHybrid/apps/application-bell-relaxation/include/application-bell-relaxation/ApplicationBellRelaxation.hpp
@@ -33,6 +33,7 @@ namespace app
         std::unique_ptr<AbstractAudioModel> audioModel;
         std::unique_ptr<AbstractBatteryModel> batteryModel;
         std::unique_ptr<relaxation::RelaxationPlayer> player;
+        sys::TimerHandle relaxationRebuildTimerHandle{};
 
         void onStop() override;
         sys::MessagePointer handleSwitchWindow(sys::Message *msgl) override;
diff --git a/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsModel.cpp b/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsModel.cpp
index 4c39f5732ab75fa0c8e4eed2a27236a447f71902..25c9e3deeb2ba62fc23169fa89bed4ba29cec5dc 100644
--- a/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsModel.cpp
+++ b/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsModel.cpp
@@ -22,6 +22,11 @@ namespace app::relaxation
         songsRepository->init();
     }
 
+    void RelaxationSongsModel::updateRecordsCount()
+    {
+        songsRepository->updateFilesCount();
+    }
+
     unsigned int RelaxationSongsModel::requestRecordsCount()
     {
         return songsRepository->getRecordsCount();
@@ -39,11 +44,11 @@ namespace app::relaxation
 
         auto item = new gui::option::OptionBellMenu(
             sound->tags.title,
-            [=](gui::Item &item) {
+            [=]([[maybe_unused]] gui::Item &item) {
                 activateCallback(*sound);
                 return true;
             },
-            [=](gui::Item &item) { return true; },
+            [=]([[maybe_unused]] gui::Item &item) { return true; },
             nullptr);
 
         return item->build();
diff --git a/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsModel.hpp b/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsModel.hpp
index 0bf847fd06206198fa8419c1f24980132c83d7f3..79779716fa07456fc4c02c6196978d204ca957c5 100644
--- a/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsModel.hpp
+++ b/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsModel.hpp
@@ -44,5 +44,6 @@ namespace app::relaxation
         void requestRecords(std::uint32_t offset, std::uint32_t limit) override;
 
         void createData(OnActivateCallback activateCallback) override;
+        void updateRecordsCount();
     };
 } // namespace app::relaxation
diff --git a/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsRepository.cpp b/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsRepository.cpp
index 3045225f31ed34f7e1520e6ee1f39fc835bc2600..2b53613265b03d5e47aeb65b5d21eb9865ed8946 100644
--- a/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsRepository.cpp
+++ b/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsRepository.cpp
@@ -33,6 +33,11 @@ namespace app::relaxation
     {}
 
     void RelaxationSongsRepository::init()
+    {
+        updateFilesCount();
+    }
+
+    void RelaxationSongsRepository::updateFilesCount()
     {
         for (const auto &[musicType, musicPath] : pathPrefixes) {
             updateFilesCount(musicType, musicPath);
@@ -79,7 +84,6 @@ namespace app::relaxation
             if (viewUpdateCallback) {
                 viewUpdateCallback(musicFilesViewCache.records, musicFilesViewCache.recordsCount);
             }
-            updateCountCallback(musicType, result->getCount());
             return true;
         };
 
diff --git a/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsRepository.hpp b/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsRepository.hpp
index 13edde03d7bf5248e26f5785bd358e1c5038c0ae..db0695fd60c08cd90e8c171c3fc8ab9ed4f7b9c7 100644
--- a/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsRepository.hpp
+++ b/products/BellHybrid/apps/application-bell-relaxation/model/RelaxationSongsRepository.hpp
@@ -27,6 +27,7 @@ namespace app::relaxation
                            const OnGetMusicFilesListCallback &viewUpdateCallback);
 
         std::uint32_t getRecordsCount();
+        void updateFilesCount();
 
       private:
         ApplicationCommon *application;
diff --git a/products/BellHybrid/apps/application-bell-relaxation/presenter/RelaxationMainWindowPresenter.cpp b/products/BellHybrid/apps/application-bell-relaxation/presenter/RelaxationMainWindowPresenter.cpp
index 951e6db04458f64698150e2fcc86e1da96bb2c92..e802bd1abc8d9a6e2d39df0446326be6d6a425fd 100644
--- a/products/BellHybrid/apps/application-bell-relaxation/presenter/RelaxationMainWindowPresenter.cpp
+++ b/products/BellHybrid/apps/application-bell-relaxation/presenter/RelaxationMainWindowPresenter.cpp
@@ -23,6 +23,11 @@ namespace app::relaxation
         }
     }
 
+    void RelaxationMainWindowPresenter::updateRecordsCount()
+    {
+        songsModel->updateRecordsCount();
+    }
+
     std::shared_ptr<RelaxationSongsModel> RelaxationMainWindowPresenter::getSongsModel()
     {
         return songsModel;
diff --git a/products/BellHybrid/apps/application-bell-relaxation/presenter/RelaxationMainWindowPresenter.hpp b/products/BellHybrid/apps/application-bell-relaxation/presenter/RelaxationMainWindowPresenter.hpp
index 94d72e648b96746b7f10f43d541421b358d2c09b..51405c3a6b84d44de15616af5fc94616ab17c42e 100644
--- a/products/BellHybrid/apps/application-bell-relaxation/presenter/RelaxationMainWindowPresenter.hpp
+++ b/products/BellHybrid/apps/application-bell-relaxation/presenter/RelaxationMainWindowPresenter.hpp
@@ -33,6 +33,7 @@ namespace app::relaxation
           public:
             virtual void createData(RelaxationSongsModel::OnActivateCallback activateCallback) = 0;
             virtual void updateViewState()                                                     = 0;
+            virtual void updateRecordsCount()                                                  = 0;
             virtual std::shared_ptr<RelaxationSongsModel> getSongsModel()                      = 0;
         };
     };
@@ -43,6 +44,7 @@ namespace app::relaxation
         std::shared_ptr<RelaxationSongsModel> songsModel;
         void createData(RelaxationSongsModel::OnActivateCallback activateCallback) override;
         void updateViewState() override;
+        void updateRecordsCount() override;
         std::shared_ptr<RelaxationSongsModel> getSongsModel() override;
 
       public:
diff --git a/products/BellHybrid/apps/application-bell-relaxation/windows/RelaxationMainWindow.cpp b/products/BellHybrid/apps/application-bell-relaxation/windows/RelaxationMainWindow.cpp
index 07f292dc556d388787a2bddac25fe27ee9f54460..b7bc6248ca08c33c977765c6523631feb54cb48b 100644
--- a/products/BellHybrid/apps/application-bell-relaxation/windows/RelaxationMainWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-relaxation/windows/RelaxationMainWindow.cpp
@@ -70,6 +70,7 @@ namespace gui
     }
     void RelaxationMainWindow::rebuild()
     {
+        presenter->updateRecordsCount();
         songList->rebuildList(gui::listview::RebuildType::Full);
     }