From 79e05da7a9cb012621b8af207f94b1a2ebc56522 Mon Sep 17 00:00:00 2001 From: lizhao Date: Thu, 19 Dec 2024 10:28:04 +0800 Subject: [PATCH] add shrinkInfo option for updateMessage Signed-off-by: lizhao --- interfaces/kits/updaterkits/updaterkits.cpp | 4 +++- services/include/updater/updater.h | 2 ++ services/updater_main.cpp | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/interfaces/kits/updaterkits/updaterkits.cpp b/interfaces/kits/updaterkits/updaterkits.cpp index 81f0085e..cefbd0e5 100755 --- a/interfaces/kits/updaterkits/updaterkits.cpp +++ b/interfaces/kits/updaterkits/updaterkits.cpp @@ -126,7 +126,9 @@ static bool WriteToMiscAndResultFileRebootToUpdater(const struct UpdateMessage & static bool IsPackagePath(const std::string &path) { if (path.find("--force_update_action=") != std::string::npos || - path.find("--night_update") != std::string::npos) { + path.find("--night_update") != std::string::npos || + path.find("--shrink_info=") != std::string::npos || + path.find("--virtual_shrink_info=") != std::string::npos) { return false; } return true; diff --git a/services/include/updater/updater.h b/services/include/updater/updater.h index 7c3fd9fa..a0e3a915 100644 --- a/services/include/updater/updater.h +++ b/services/include/updater/updater.h @@ -51,6 +51,8 @@ struct UpdaterParams { float initialProgress = 0; /* The upgrade starts at the progress bar location */ float currentPercentage = 0; /* The proportion of progress bars occupied by the upgrade process */ unsigned int pkgLocation = 0; + std::string shrinkInfo = ""; + std::string virtualShrinkInfo = ""; std::string miscCmd {"boot_updater"}; std::vector updatePackage {}; std::vector> installTime {}; diff --git a/services/updater_main.cpp b/services/updater_main.cpp index f434a2dc..4306cf08 100644 --- a/services/updater_main.cpp +++ b/services/updater_main.cpp @@ -75,6 +75,8 @@ constexpr struct option OPTIONS[] = { { "UPDATE:SD", no_argument, nullptr, 0 }, { "UPDATE:SDFROMDEV", no_argument, nullptr, 0 }, { "sdcard_intral_update", optional_argument, nullptr, 0}, + { "shrink_info", required_argument, nullptr, 0 }, + { "virtual_shrink_info", required_argument, nullptr, 0 }, {"wipe_data_factory_lowlevel", no_argument, nullptr, 0}, { "wipe_data_at_factoryreset_0", no_argument, nullptr, 0 }, { nullptr, 0, nullptr, 0 }, @@ -743,6 +745,14 @@ std::unordered_map> InitOptionsFuncTab(char* {"sdcard_intral_update", [&]() -> void { upParams.updateMode = SDCARD_UPDATE; + }}, + {"shrink_info", [&]() -> void + { + upParams.shrinkInfo = std::string(optarg); + }}, + {"virtual_shrink_info", [&]() -> void + { + upParams.virtualShrinkInfo = std::string(optarg); }} }; return optionsFuncTab; -- Gitee