~aleteoryx/muditaos

5af5c740d45ec959fdeb991f6e75ff10cf76263e — Mateusz Piesta 3 years ago ed806a4 
[MOS-807] Removed read code

Removed dead code
Fixed Harmony relaxation app assets path
patch browse .tar.gz 
13 files changed, 64 insertions(+), 200 deletions(-)

M module-services/service-db/DatabaseAgent.cpp
M module-services/service-db/agents/settings/SettingsAgent.cpp
M module-services/service-db/agents/settings/SettingsAgent.hpp
M module-services/service-db/include/service-db/DatabaseAgent.hpp
M products/BellHybrid/alarms/src/AlarmSoundPaths.cpp
M products/BellHybrid/assets/assets_common.json
M products/BellHybrid/services/db/ServiceDB.cpp
M products/BellHybrid/services/db/agents/MeditationStatsAgent.cpp
M products/BellHybrid/services/db/agents/MeditationStatsAgent.hpp
M products/BellHybrid/services/db/include/db/ServiceDB.hpp
M products/PurePhone/services/db/ServiceDB.cpp
M products/PurePhone/services/db/include/db/ServiceDB.hpp
M source/MessageType.hpp

M module-services/service-db/DatabaseAgent.cpp => module-services/service-db/DatabaseAgent.cpp +0 -8
@@ 10,11 10,3 @@ namespace sys

DatabaseAgent::DatabaseAgent(sys::Service *parentService) : parentService(parentService)
{}
bool DatabaseAgent::storeIntoFile(const std::filesystem::path &file)
{
    if (database != nullptr) {
        return database->storeIntoFile(file);
    }

    return false;
}


M module-services/service-db/agents/settings/SettingsAgent.cpp => module-services/service-db/agents/settings/SettingsAgent.cpp +1 -5
@@ 27,7 27,7 @@ SettingsAgent::SettingsAgent(sys::Service *parentService, const std::string dbNa
        this->cache = settings::SettingsCache::getInstance();
    }

    database = std::make_unique<Database>(getDbFilePath().c_str());
    database = std::make_unique<Database>((purefs::dir::getDatabasesPath() / dbName).c_str());

    factorySettings.initDb(database.get());



@@ 68,10 68,6 @@ void SettingsAgent::unRegisterMessages()
    parentService->disconnect(typeid(settings::Messages::UnregisterOnVariableChange));
}

auto SettingsAgent::getDbFilePath() -> const std::string
{
    return (purefs::dir::getDatabasesPath() / dbName).string();
}
auto SettingsAgent::getAgentName() -> const std::string
{
    return std::string("settingsAgent");


M module-services/service-db/agents/settings/SettingsAgent.hpp => module-services/service-db/agents/settings/SettingsAgent.hpp +0 -1
@@ 32,7 32,6 @@ class SettingsAgent : public DatabaseAgent
    void registerMessages() override;
    void unRegisterMessages() override;
    auto getAgentName() -> const std::string override;
    auto getDbFilePath() -> const std::string override;

  private:
    settings::SettingsCache *cache;


M module-services/service-db/include/service-db/DatabaseAgent.hpp => module-services/service-db/include/service-db/DatabaseAgent.hpp +0 -3
@@ 25,9 25,6 @@ class DatabaseAgent
    virtual void unRegisterMessages()                              = 0;
    [[nodiscard]] virtual auto getAgentName() -> const std::string = 0;

    bool storeIntoFile(const std::filesystem::path &file);
    [[nodiscard]] virtual auto getDbFilePath() -> const std::string = 0;

    static constexpr auto ZERO_ROWS_FOUND = 0;
    static constexpr auto ONE_ROW_FOUND   = 1;



M products/BellHybrid/alarms/src/AlarmSoundPaths.cpp => products/BellHybrid/alarms/src/AlarmSoundPaths.cpp +1 -1
@@ 34,7 34,7 @@ namespace alarms::paths

    std::filesystem::path getBackgroundSoundsDir() noexcept
    {
        return purefs::dir::getAssetsDirPath() / "audio/bg_sounds";
        return purefs::dir::getAssetsDirPath() / "audio/relaxation";
    }

    std::filesystem::path getMeditationSoundsDir() noexcept


M products/BellHybrid/assets/assets_common.json => products/BellHybrid/assets/assets_common.json +60 -60
@@ 1,65 1,65 @@
{
    "assets": [
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/arrow_right_long_W_G.vpi", "output": "assets/images/bell/arrow_right_long_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/arrow_back_W_G.vpi", "output": "assets/images/bell/arrow_back_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/circle_success_big.vpi", "output": "assets/images/bell/circle_success_big.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_arrow_right_W_M.vpi", "output": "assets/images/bell/bell_arrow_right_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl1_W_M.vpi", "output": "assets/images/bell/bell_battery_lvl1_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_update_W_M.vpi", "output": "assets/images/bell/bell_update_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl2_W_G.vpi", "output": "assets/images/bell/bell_status_battery_lvl2_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_off_bottom_W_G.vpi", "output": "assets/images/bell/bell_off_bottom_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_bedtime_W_G.vpi", "output": "assets/images/bell/big_bedtime_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_alarm_ringing_W_G.vpi", "output": "assets/images/bell/bell_alarm_ringing_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_empty_W_M.vpi", "output": "assets/images/bell/bell_battery_empty_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl1_W_G.vpi", "output": "assets/images/bell/bell_status_battery_lvl1_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl3_W_G.vpi", "output": "assets/images/bell/bell_status_battery_lvl3_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/button_light_press_W_G.vpi", "output": "assets/images/bell/button_light_press_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_play_W_G.vpi", "output": "assets/images/bell/big_play_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl0_W_G.vpi", "output": "assets/images/bell/bell_status_battery_lvl0_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_alarm_activated_W_M.vpi", "output": "assets/images/bell/bell_alarm_activated_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_alarm_W_G.vpi", "output": "assets/images/bell/big_alarm_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_alarm_snoozed_W_M.vpi", "output": "assets/images/bell/big_alarm_snoozed_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl2_W_M.vpi", "output": "assets/images/bell/bell_battery_lvl2_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_mudita_logo_W_G.vpi", "output": "assets/images/bell/bell_mudita_logo_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl5_W_G.vpi", "output": "assets/images/bell/bell_status_battery_lvl5_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/button_deep_press_W_G.vpi", "output": "assets/images/bell/button_deep_press_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_big_logo_W_G.vpi", "output": "assets/images/bell/bell_big_logo_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl4_W_M.vpi", "output": "assets/images/bell/bell_battery_lvl4_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_charging_W_M.vpi", "output": "assets/images/bell/bell_battery_charging_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/alarm_colon_W_M.vpi", "output": "assets/images/bell/alarm_colon_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_check_W_M.vpi", "output": "assets/images/bell/big_check_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_lightning_W_M.vpi", "output": "assets/images/bell/bell_lightning_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl5_W_M.vpi", "output": "assets/images/bell/bell_battery_lvl5_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/button_icon_sun_W_G.vpi", "output": "assets/images/bell/button_icon_sun_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl4_W_G.vpi", "output": "assets/images/bell/bell_status_battery_lvl4_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_status_empty_W_M.vpi", "output": "assets/images/bell/bell_battery_status_empty_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_very_big_logo_W_G.vpi", "output": "assets/images/bell/bell_very_big_logo_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/alarm_colon_clock_W_M.vpi", "output": "assets/images/bell/alarm_colon_clock_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/icon_folder_W_M.vpi", "output": "assets/images/bell/icon_folder_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_namaste_W_G.vpi", "output": "assets/images/bell/big_namaste_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl3_W_M.vpi", "output": "assets/images/bell/bell_battery_lvl3_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_pause_W_G.vpi", "output": "assets/images/bell/big_pause_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_big_logo_W_M.vpi", "output": "assets/images/bell/bell_big_logo_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_alarm_deactivated_W_M.vpi", "output": "assets/images/bell/bell_alarm_deactivated_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_arrow_left_W_M.vpi", "output": "assets/images/bell/bell_arrow_left_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_alarm_snooze_W_M.vpi", "output": "assets/images/bell/bell_alarm_snooze_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_pause_W_M.vpi", "output": "assets/images/bell/big_pause_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_play_W_M.vpi", "output": "assets/images/bell/big_play_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_arrow_top_W_M.vpi", "output": "assets/images/bell/bell_arrow_top_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_no-alarm_W_G.vpi", "output": "assets/images/bell/big_no-alarm_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_check_W_G.vpi", "output": "assets/images/bell/big_check_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_lightning_W_G.vpi", "output": "assets/images/bell/bell_lightning_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/button_rotate_W_G.vpi", "output": "assets/images/bell/button_rotate_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/alarm_colon_select_W_M.vpi", "output": "assets/images/bell/alarm_colon_select_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_arrow_down_W_M.vpi", "output": "assets/images/bell/bell_arrow_down_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_bell_ringing_W_G.vpi", "output": "assets/images/bell/big_bell_ringing_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_rotate_W_G.vpi", "output": "assets/images/bell/shortcuts_step_rotate_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_light_click_W_G.vpi", "output": "assets/images/bell/shortcuts_step_light_click_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_deep_press_W_G.vpi", "output": "assets/images/bell/shortcuts_step_deep_press_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_home_and_battery_W_G.vpi", "output": "assets/images/bell/shortcuts_step_home_and_battery_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_turn_off_W_G.vpi", "output": "assets/images/bell/shortcuts_step_turn_off_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_restart_W_G.vpi", "output": "assets/images/bell/shortcuts_step_restart_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_bedside_lamp_W_G.vpi", "output": "assets/images/bell/shortcuts_step_bedside_lamp_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/arrow_right_long_W_G.vpi", "output": "assets/images/arrow_right_long_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/arrow_back_W_G.vpi", "output": "assets/images/arrow_back_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/circle_success_big.vpi", "output": "assets/images/circle_success_big.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_arrow_right_W_M.vpi", "output": "assets/images/bell_arrow_right_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl1_W_M.vpi", "output": "assets/images/bell_battery_lvl1_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_update_W_M.vpi", "output": "assets/images/bell_update_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl2_W_G.vpi", "output": "assets/images/bell_status_battery_lvl2_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_off_bottom_W_G.vpi", "output": "assets/images/bell_off_bottom_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_bedtime_W_G.vpi", "output": "assets/images/big_bedtime_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_alarm_ringing_W_G.vpi", "output": "assets/images/bell_alarm_ringing_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_empty_W_M.vpi", "output": "assets/images/bell_battery_empty_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl1_W_G.vpi", "output": "assets/images/bell_status_battery_lvl1_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl3_W_G.vpi", "output": "assets/images/bell_status_battery_lvl3_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/button_light_press_W_G.vpi", "output": "assets/images/button_light_press_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_play_W_G.vpi", "output": "assets/images/big_play_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl0_W_G.vpi", "output": "assets/images/bell_status_battery_lvl0_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_alarm_activated_W_M.vpi", "output": "assets/images/bell_alarm_activated_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_alarm_W_G.vpi", "output": "assets/images/big_alarm_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_alarm_snoozed_W_M.vpi", "output": "assets/images/big_alarm_snoozed_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl2_W_M.vpi", "output": "assets/images/bell_battery_lvl2_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_mudita_logo_W_G.vpi", "output": "assets/images/bell_mudita_logo_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl5_W_G.vpi", "output": "assets/images/bell_status_battery_lvl5_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/button_deep_press_W_G.vpi", "output": "assets/images/button_deep_press_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_big_logo_W_G.vpi", "output": "assets/images/bell_big_logo_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl4_W_M.vpi", "output": "assets/images/bell_battery_lvl4_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_charging_W_M.vpi", "output": "assets/images/bell_battery_charging_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/alarm_colon_W_M.vpi", "output": "assets/images/alarm_colon_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_check_W_M.vpi", "output": "assets/images/big_check_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_lightning_W_M.vpi", "output": "assets/images/bell_lightning_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl5_W_M.vpi", "output": "assets/images/bell_battery_lvl5_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/button_icon_sun_W_G.vpi", "output": "assets/images/button_icon_sun_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_status_battery_lvl4_W_G.vpi", "output": "assets/images/bell_status_battery_lvl4_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_status_empty_W_M.vpi", "output": "assets/images/bell_battery_status_empty_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_very_big_logo_W_G.vpi", "output": "assets/images/bell_very_big_logo_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/alarm_colon_clock_W_M.vpi", "output": "assets/images/alarm_colon_clock_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/icon_folder_W_M.vpi", "output": "assets/images/icon_folder_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_namaste_W_G.vpi", "output": "assets/images/big_namaste_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl3_W_M.vpi", "output": "assets/images/bell_battery_lvl3_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_pause_W_G.vpi", "output": "assets/images/big_pause_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_big_logo_W_M.vpi", "output": "assets/images/bell_big_logo_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_alarm_deactivated_W_M.vpi", "output": "assets/images/bell_alarm_deactivated_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_arrow_left_W_M.vpi", "output": "assets/images/bell_arrow_left_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_alarm_snooze_W_M.vpi", "output": "assets/images/bell_alarm_snooze_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_pause_W_M.vpi", "output": "assets/images/big_pause_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_play_W_M.vpi", "output": "assets/images/big_play_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_arrow_top_W_M.vpi", "output": "assets/images/bell_arrow_top_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_no-alarm_W_G.vpi", "output": "assets/images/big_no-alarm_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_check_W_G.vpi", "output": "assets/images/big_check_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_lightning_W_G.vpi", "output": "assets/images/bell_lightning_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/button_rotate_W_G.vpi", "output": "assets/images/button_rotate_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/alarm_colon_select_W_M.vpi", "output": "assets/images/alarm_colon_select_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_arrow_down_W_M.vpi", "output": "assets/images/bell_arrow_down_W_M.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_bell_ringing_W_G.vpi", "output": "assets/images/big_bell_ringing_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_rotate_W_G.vpi", "output": "assets/images/shortcuts_step_rotate_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_light_click_W_G.vpi", "output": "assets/images/shortcuts_step_light_click_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_deep_press_W_G.vpi", "output": "assets/images/shortcuts_step_deep_press_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_home_and_battery_W_G.vpi", "output": "assets/images/shortcuts_step_home_and_battery_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_turn_off_W_G.vpi", "output": "assets/images/shortcuts_step_turn_off_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_restart_W_G.vpi", "output": "assets/images/shortcuts_step_restart_W_G.vpi"},
        {"name": "release.tgz", "tarfile" :"image/assets/images/bell/shortcuts_step_bedside_lamp_W_G.vpi", "output": "assets/images/shortcuts_step_bedside_lamp_W_G.vpi"},
        
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/chimes/Blissful_Dream.mp3", "output": "assets/audio/chimes/Blissful_Dream.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/chimes/Gentle_Chime.mp3", "output": "assets/audio/chimes/Gentle_Chime.mp3"},


M products/BellHybrid/services/db/ServiceDB.cpp => products/BellHybrid/services/db/ServiceDB.cpp +1 -45
@@ 42,34 42,6 @@ db::Interface *ServiceDB::getInterface(db::Interface::Name interface)
    return nullptr;
}

sys::MessagePointer ServiceDB::DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp)
{
    auto responseMsg = std::static_pointer_cast<sys::ResponseMessage>(ServiceDBCommon::DataReceivedHandler(msgl, resp));
    if (responseMsg) {
        return responseMsg;
    }
    auto type = static_cast<MessageType>(msgl->messageType);
    switch (type) {

    case MessageType::DBServiceBackup: {
        auto time   = utils::time::Scoped("DBServiceBackup");
        auto msg    = static_cast<DBServiceMessageBackup *>(msgl);
        auto ret    = StoreIntoBackup({msg->backupPath});
        responseMsg = std::make_shared<DBServiceResponseMessage>(ret);
    } break;

    default:
        break;
    }

    if (responseMsg == nullptr) {
        return std::make_shared<sys::ResponseMessage>();
    }

    responseMsg->responseTo = msgl->messageType;
    return responseMsg;
}

sys::ReturnCodes ServiceDB::InitHandler()
{
    if (const auto returnCode = ServiceDBCommon::InitHandler(); returnCode != sys::ReturnCodes::Success) {


@@ 99,20 71,4 @@ sys::ReturnCodes ServiceDB::InitHandler()
    crashdump::setSerialNumber(serial_number_reader::readSerialNumber());

    return sys::ReturnCodes::Success;
}

bool ServiceDB::StoreIntoBackup(const std::filesystem::path &backupPath)
{
    if (eventsDB->storeIntoFile(backupPath / std::filesystem::path(eventsDB->getName()).filename()) == false) {
        LOG_ERROR("eventsDB backup failed");
        return false;
    }

    return std::all_of(databaseAgents.cbegin(), databaseAgents.cend(), [&backupPath](const auto &agent) {
        if (not agent->storeIntoFile(backupPath / std::filesystem::path(agent->getDbFilePath()).filename())) {
            LOG_ERROR("%s backup failed", agent->getAgentName().c_str());
            return false;
        }
        return true;
    });
}
}
\ No newline at end of file


M products/BellHybrid/services/db/agents/MeditationStatsAgent.cpp => products/BellHybrid/services/db/agents/MeditationStatsAgent.cpp +1 -5
@@ 25,7 25,7 @@ namespace
namespace service::db::agents
{
    MeditationStats::MeditationStats(sys::Service *parentService, const std::string dbName)
        : DatabaseAgent(parentService), dbName{dbName}, db{getDbFilePath().c_str()}
        : DatabaseAgent(parentService), dbName{dbName}, db{(purefs::dir::getDatabasesPath() / dbName).c_str()}
    {}

    void MeditationStats::registerMessages()


@@ 40,10 40,6 @@ namespace service::db::agents
        parentService->disconnect(typeid(messages::GetByDays));
    }

    auto MeditationStats::getDbFilePath() -> const std::string
    {
        return (purefs::dir::getDatabasesPath() / dbName).string();
    }
    auto MeditationStats::getAgentName() -> const std::string
    {
        return dbName + "_agent";


M products/BellHybrid/services/db/agents/MeditationStatsAgent.hpp => products/BellHybrid/services/db/agents/MeditationStatsAgent.hpp +0 -1
@@ 26,7 26,6 @@ namespace service::db::agents
        void registerMessages() override;
        void unRegisterMessages() override;
        auto getAgentName() -> const std::string override;
        auto getDbFilePath() -> const std::string override;

      private:
        sys::MessagePointer handleAdd(const sys::Message *req);


M products/BellHybrid/services/db/include/db/ServiceDB.hpp => products/BellHybrid/services/db/include/db/ServiceDB.hpp +0 -3
@@ 21,8 21,6 @@ class ServiceDB : public ServiceDBCommon
  public:
    ~ServiceDB() override;

    bool StoreIntoBackup(const std::filesystem::path &backupPath);

  private:
    std::unique_ptr<EventsDB> eventsDB;
    std::unique_ptr<db::multimedia_files::MultimediaFilesDB> multimediaFilesDB;


@@ 31,7 29,6 @@ class ServiceDB : public ServiceDBCommon
    std::unique_ptr<db::multimedia_files::MultimediaFilesRecordInterface> multimediaFilesRecordInterface;

    db::Interface *getInterface(db::Interface::Name interface) override;
    sys::MessagePointer DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp) override;
    sys::ReturnCodes InitHandler() override;
};



M products/PurePhone/services/db/ServiceDB.cpp => products/PurePhone/services/db/ServiceDB.cpp +0 -66
@@ 216,13 216,6 @@ sys::MessagePointer ServiceDB::DataReceivedHandler(sys::DataMessage *msgl, sys::
        sendUpdateNotification(db::Interface::Name::Calllog, db::Query::Type::Update, msg->record.ID);
    } break;

    case MessageType::DBServiceBackup: {
        auto time   = utils::time::Scoped("DBServiceBackup");
        auto msg    = static_cast<DBServiceMessageBackup *>(msgl);
        auto ret    = StoreIntoBackup({msg->backupPath});
        responseMsg = std::make_shared<DBServiceResponseMessage>(ret);
    } break;

    case MessageType::DBSyncPackage: {
        auto time   = utils::time::Scoped("DBSyncPackage");
        auto msg    = static_cast<DBServiceMessageSyncPackage *>(msgl);


@@ 290,65 283,6 @@ sys::ReturnCodes ServiceDB::InitHandler()
    return sys::ReturnCodes::Success;
}

bool ServiceDB::StoreIntoBackup(const std::filesystem::path &backupPath)
{
    if (eventsDB->storeIntoFile(backupPath / std::filesystem::path(eventsDB->getName()).filename()) == false) {
        LOG_ERROR("eventsDB backup failed");
        return false;
    }

    if (contactsDB->storeIntoFile(backupPath / std::filesystem::path(contactsDB->getName()).filename()) == false) {
        LOG_ERROR("contactsDB backup failed");
        return false;
    }

    if (smsDB->storeIntoFile(backupPath / std::filesystem::path(smsDB->getName()).filename()) == false) {
        LOG_ERROR("smsDB backup failed");
        return false;
    }

    if (notesDB->storeIntoFile(backupPath / std::filesystem::path(notesDB->getName()).filename()) == false) {
        LOG_ERROR("notesDB backup failed");
        return false;
    }

    if (calllogDB->storeIntoFile(backupPath / std::filesystem::path(calllogDB->getName()).filename()) == false) {
        LOG_ERROR("calllogDB backup failed");
        return false;
    }

    if (predefinedQuotesDB->storeIntoFile(backupPath /
                                          std::filesystem::path(predefinedQuotesDB->getName()).filename()) == false) {
        LOG_ERROR("predefinedQuotesDB backup failed");
        return false;
    }

    if (customQuotesDB->storeIntoFile(backupPath / std::filesystem::path(customQuotesDB->getName()).filename()) ==
        false) {
        LOG_ERROR("customQuotesDB backup failed");
        return false;
    }

    if (notificationsDB->storeIntoFile(backupPath / std::filesystem::path(notificationsDB->getName()).filename()) ==
        false) {
        LOG_ERROR("notificationsDB backup failed");
        return false;
    }

    for (auto &db : databaseAgents) {
        if (db.get() && db.get()->getAgentName() == "settingsAgent") {

            if (db->storeIntoFile(backupPath / std::filesystem::path(db->getDbFilePath()).filename()) == false) {
                LOG_ERROR("settingsAgent backup failed");
                return false;
            }
            break;
        }
    }

    return true;
}

bool ServiceDB::StoreIntoSyncPackage(const std::filesystem::path &syncPackagePath)
{
    if (!contactsDB->storeIntoFile(syncPackagePath / std::filesystem::path(contactsDB->getName()).filename())) {


M products/PurePhone/services/db/include/db/ServiceDB.hpp => products/PurePhone/services/db/include/db/ServiceDB.hpp +0 -1
@@ 39,7 39,6 @@ class ServiceDB : public ServiceDBCommon
  public:
    ~ServiceDB() override;

    bool StoreIntoBackup(const std::filesystem::path &backupPath);
    bool StoreIntoSyncPackage(const std::filesystem::path &syncPackagePath);

  private:


M source/MessageType.hpp => source/MessageType.hpp +0 -1
@@ 16,7 16,6 @@ enum class MessageType
    DBServiceEvents,

    DBServiceNotification, ///< Common service-db notification message.
    DBServiceBackup,
    DBSyncPackage,

    DBSettingsGet,    ///< get current settings from database