From bea1773bf6b92a5485e632f34ca652ec49dd0eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Mon, 10 Feb 2025 07:03:30 +0000 Subject: [PATCH 1/6] update services/sdcard_update/sdcard_update.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- services/sdcard_update/sdcard_update.cpp | 65 ++++++++++-------------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/services/sdcard_update/sdcard_update.cpp b/services/sdcard_update/sdcard_update.cpp index db196e0e..aeac94c8 100644 --- a/services/sdcard_update/sdcard_update.cpp +++ b/services/sdcard_update/sdcard_update.cpp @@ -22,12 +22,16 @@ #include #include #include +#ifndef UPDATER_UT #include "language/language_ui.h" +#endif #include "log/dump.h" #include "log/log.h" #include "fs_manager/mount.h" #include "securec.h" +#ifndef UPDATER_UT #include "ui/updater_ui_stub.h" +#endif #include "updater/updater_const.h" #include "utils.h" @@ -58,15 +62,6 @@ __attribute__((weak)) UpdaterStatus GetSdcardPkgsFromDev(UpdaterParams &upParams return UPDATE_ERROR; } -bool CheckPathNeedMountSD(UpdaterParams &upParams) -{ - for (auto pkgPath : upParams.updatePackage) { - if (pkgPath.find("/sdcard") != 0) { - return false; - } - } - return true; -} bool DoMountSdCard(std::vector &sdCardStr, std::string &mountPoint, UpdaterParams &upParams) { @@ -96,21 +91,9 @@ bool DoMountSdCard(std::vector &sdCardStr, std::string &mountPoint, #endif } -UpdaterStatus CheckSdcardPkgs(UpdaterParams &upParams) +UpdaterStatus FindAndMountSdcard(UpdaterParams &upParams) { #ifndef UPDATER_UT - auto sdParam = "updater.data.configs"; - Utils::SetParameter(sdParam, "1"); - if (upParams.sdExtMode == SDCARD_UPDATE_FROM_DEV && GetSdcardPkgsFromDev(upParams) == UPDATE_SUCCESS) { - LOG(INFO) << "get sd card from dev succeed, skip get package from sd card"; - return UPDATE_SUCCESS; - } - - if (GetSdcardInternalPkgs(upParams) == UPDATE_SUCCESS) { - LOG(INFO) << "get sdcard internal pkgs succeed"; - return UPDATE_SUCCESS; - } - std::string mountPoint = std::string(SDCARD_PATH); std::vector sdcardStr = GetBlockDevicesByMountPoint(mountPoint); if (sdcardStr.empty()) { @@ -118,20 +101,20 @@ UpdaterStatus CheckSdcardPkgs(UpdaterParams &upParams) (errno == ENOENT) ? TR(LOG_SDCARD_NOTFIND) : TR(LOG_SDCARD_ABNORMAL), true); return UPDATE_ERROR; } - if (Utils::CheckUpdateMode(Updater::SDCARD_INTRAL_MODE)) { - if (MountForPath("/data") != 0) { - LOG(ERROR) << "data partition mount fail"; - return UPDATE_ERROR; - } + if (!DoMountSdCard(sdcardStr, mountPoint, upParams)) { + LOG(ERROR) << "mount sdcard fail!"; + return UPDATE_ERROR; } - if ((Utils::CheckUpdateMode(Updater::SDCARD_MODE) && !Utils::CheckUpdateMode(Updater::SDCARD_INTRAL_MODE)) || - (Utils::CheckUpdateMode(Updater::SDCARD_INTRAL_MODE) && CheckPathNeedMountSD(upParams))) { - if (!DoMountSdCard(sdcardStr, mountPoint, upParams)) { - LOG(ERROR) << "mount sdcard fail!"; - return UPDATE_ERROR; - } - } #endif + return UPDATE_SUCCESS; +} + +UpdaterStatus GetPkgsFromSdcard(UpdaterParams &upParams) +{ + if (FindAndMountSdcard(upParams) != UPDATE_SUCCESS) { + LOG(ERROR) << "mount sdcard fail!"; + return UPDATE_ERROR; + } if (GetSdcardPkgsPath(upParams) != UPDATE_SUCCESS) { LOG(ERROR) << "there is no package in sdcard/updater, please check"; return UPDATE_ERROR; @@ -139,9 +122,17 @@ UpdaterStatus CheckSdcardPkgs(UpdaterParams &upParams) return UPDATE_SUCCESS; } -__attribute__((weak)) UpdaterStatus GetSdcardInternalPkgs(UpdaterParams &upParams) +__attribute__((weak)) UpdaterStatus MountAndGetPkgs(UpdaterParams &upParams) { - LOG(INFO) << "not implemented get normal update sdcard pkgs"; - return UPDATE_ERROR; + return GetPkgsFromSdcard(upParams); +} + +UpdaterStatus GetPkgsFromSdcard(UpdaterParams &upParams) +{ +#ifndef UPDATER_UT + auto sdParam = "updater.data.configs"; + Utils::SetParameter(sdParam, "1"); +#endif + return MountAndGetPkgs(upParams); } } // Updater -- Gitee From 6b357b9db2a58b916ef4d0ff4d423cc5aa80f34a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Mon, 10 Feb 2025 07:06:27 +0000 Subject: [PATCH 2/6] update services/sdcard_update/sdcard_update.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- services/sdcard_update/sdcard_update.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/sdcard_update/sdcard_update.h b/services/sdcard_update/sdcard_update.h index de8275cc..eb0626dd 100644 --- a/services/sdcard_update/sdcard_update.h +++ b/services/sdcard_update/sdcard_update.h @@ -21,6 +21,8 @@ namespace Updater { UpdaterStatus CheckSdcardPkgs(UpdaterParams &upParams); +UpdaterStatus FindAndMountSdcard(UpdaterParams &upParams); +UpdaterStatus GetPkgsFromSdcard(UpdaterParams &upParams); #ifdef __cplusplus #if __cplusplus @@ -30,13 +32,13 @@ extern "C" { UpdaterStatus GetSdcardPkgsPath(UpdaterParams &upParams); UpdaterStatus GetSdcardPkgsFromDev(UpdaterParams &upParams); UpdaterStatus GetSdcardInternalPkgs(UpdaterParams &upParams); +UpdaterStatus MountAndGetPkgs(UpdaterParams &upParams); #ifdef __cplusplus #if __cplusplus } #endif #endif -bool CheckPathNeedMountSD(UpdaterParams &upParams); bool DoMountSdCard(std::vector &sdCardStr, std::string &mountPoint, UpdaterParams &upParams); } // namespace Updater #endif // SDCARD_UPDATE_H \ No newline at end of file -- Gitee From b49e3a56496397380220ba36563488325a0321cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Mon, 10 Feb 2025 07:09:22 +0000 Subject: [PATCH 3/6] update test/unittest/service_test/updater_service_unittest.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- .../service_test/updater_service_unittest.cpp | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/test/unittest/service_test/updater_service_unittest.cpp b/test/unittest/service_test/updater_service_unittest.cpp index 8d67ce44..b6ac5f58 100644 --- a/test/unittest/service_test/updater_service_unittest.cpp +++ b/test/unittest/service_test/updater_service_unittest.cpp @@ -320,19 +320,6 @@ HWTEST_F(UpdaterUtilUnitTest, StartUpdaterProcTest, TestSize.Level1) EXPECT_EQ(StartUpdaterProc(pkgManager, upParams), UPDATE_ERROR); } -HWTEST_F(UpdaterUtilUnitTest, CheckPathNeedMountSD, TestSize.Level0) -{ - UpdaterParams upParams; - upParams.updatePackage.push_back("/data/updater/updater_full.zip"); - EXPECT_EQ(CheckPathNeedMountSD(upParams), false); - upParams.updatePackage.clear(); - upParams.updatePackage.push_back("/sdcard/updater/updater_full.zip"); - EXPECT_EQ(CheckPathNeedMountSD(upParams), true); - upParams.updatePackage.clear(); - upParams.updatePackage.push_back("/data/sdcard/updater_full.zip"); - EXPECT_EQ(CheckPathNeedMountSD(upParams), false); -} - HWTEST_F(UpdaterUtilUnitTest, GetSdcardPkgsFromDev, TestSize.Level0) { UpdaterParams upParams; @@ -357,9 +344,13 @@ HWTEST_F(UpdaterUtilUnitTest, GetSdcardPkgsPath, TestSize.Level0) upParams.updatePackage.clear(); } -HWTEST_F(UpdaterUtilUnitTest, GetSdcardInternalPkgs, TestSize.Level0) +HWTEST_F(UpdaterUtilUnitTest, CheckSdcardPkgs, TestSize.Level0) { UpdaterParams upParams; - EXPECT_EQ(GetSdcardInternalPkgs(upParams), UPDATE_ERROR); + EXPECT_EQ(CheckSdcardPkgs(upParams), UPDATE_SUCCESS); + upParams.updatePackage.clear(); + + upParams.updatePackage.push_back("/sdcard/updater/updater_full.zip"); + EXPECT_EQ(GetSdcardPkgsPath(upParams), UPDATE_SUCCESS); } } -- Gitee From 6d2ff6a45b21fe8a9e6c35ec3802e812a63b3fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Mon, 10 Feb 2025 07:25:57 +0000 Subject: [PATCH 4/6] update services/sdcard_update/sdcard_update.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- services/sdcard_update/sdcard_update.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/sdcard_update/sdcard_update.cpp b/services/sdcard_update/sdcard_update.cpp index aeac94c8..75aafbce 100644 --- a/services/sdcard_update/sdcard_update.cpp +++ b/services/sdcard_update/sdcard_update.cpp @@ -127,7 +127,7 @@ __attribute__((weak)) UpdaterStatus MountAndGetPkgs(UpdaterParams &upParams) return GetPkgsFromSdcard(upParams); } -UpdaterStatus GetPkgsFromSdcard(UpdaterParams &upParams) +UpdaterStatus CheckSdcardPkgs(UpdaterParams &upParams) { #ifndef UPDATER_UT auto sdParam = "updater.data.configs"; -- Gitee From bf41e63b48f4e6a27f37b76fa008c4c0f58205e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Mon, 10 Feb 2025 07:26:27 +0000 Subject: [PATCH 5/6] update services/sdcard_update/sdcard_update.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- services/sdcard_update/sdcard_update.h | 1 - 1 file changed, 1 deletion(-) diff --git a/services/sdcard_update/sdcard_update.h b/services/sdcard_update/sdcard_update.h index eb0626dd..dd7e2e97 100644 --- a/services/sdcard_update/sdcard_update.h +++ b/services/sdcard_update/sdcard_update.h @@ -31,7 +31,6 @@ extern "C" { #endif UpdaterStatus GetSdcardPkgsPath(UpdaterParams &upParams); UpdaterStatus GetSdcardPkgsFromDev(UpdaterParams &upParams); -UpdaterStatus GetSdcardInternalPkgs(UpdaterParams &upParams); UpdaterStatus MountAndGetPkgs(UpdaterParams &upParams); #ifdef __cplusplus #if __cplusplus -- Gitee From dcd5bb529e1d86c6d04e2e679a7d5c9d5aef3e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF?= Date: Mon, 10 Feb 2025 07:27:20 +0000 Subject: [PATCH 6/6] update test/unittest/service_test/updater_service_unittest.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈凯 --- test/unittest/service_test/updater_service_unittest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/service_test/updater_service_unittest.cpp b/test/unittest/service_test/updater_service_unittest.cpp index b6ac5f58..d4aadd69 100644 --- a/test/unittest/service_test/updater_service_unittest.cpp +++ b/test/unittest/service_test/updater_service_unittest.cpp @@ -351,6 +351,6 @@ HWTEST_F(UpdaterUtilUnitTest, CheckSdcardPkgs, TestSize.Level0) upParams.updatePackage.clear(); upParams.updatePackage.push_back("/sdcard/updater/updater_full.zip"); - EXPECT_EQ(GetSdcardPkgsPath(upParams), UPDATE_SUCCESS); + EXPECT_EQ(CheckSdcardPkgs(upParams), UPDATE_SUCCESS); } } -- Gitee