From 7be88a5c76cd293241e908d82077c6550dae071e Mon Sep 17 00:00:00 2001 From: z30054037 Date: Fri, 27 Oct 2023 06:34:55 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30054037 Change-Id: Ib945cb6a0402986241d699b248c90f0dd42a8996 --- tools/backup_tool/src/tools_op_restore_async.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/backup_tool/src/tools_op_restore_async.cpp b/tools/backup_tool/src/tools_op_restore_async.cpp index 3a07337b6..07da6b963 100644 --- a/tools/backup_tool/src/tools_op_restore_async.cpp +++ b/tools/backup_tool/src/tools_op_restore_async.cpp @@ -180,11 +180,18 @@ static int32_t ChangeBundleInfo(const string &pathCapFile, const vector BJsonCachedEntity cachedEntity(move(fd)); auto cache = cachedEntity.Structuralize(); vector bundleInfos; + auto bundleInfos = cache.GetBundleInfos(); for (auto name : bundleNames) { string versionName = string(BConstants::DEFAULT_VERSION_NAME); uint32_t versionCode = static_cast(BConstants::DEFAULT_VERSION_CODE); - bundleInfos.emplace_back(BJsonEntityCaps::BundleInfo { - .name = name, .needToInstall = false, .versionCode = versionCode, .versionName = versionName}); + for (auto &&bundleInfo : bundleInfos) { + if (bundleInfo.name != name) { + continue; + } + bundleInfos.emplace_back(BJsonEntityCaps::BundleInfo { + .name = name, .needToInstall = false, .versionCode = versionCode, .versionName = versionName, + .extensionName = spaceOccupied.extensionName, .spaceOccupied = bundleInfo.spaceOccupied}); + } } cache.SetBundleInfos(bundleInfos); cachedEntity.Persist(); -- Gitee From a20970669093f22929309ee86be734948b129624 Mon Sep 17 00:00:00 2001 From: z30054037 Date: Fri, 27 Oct 2023 06:39:11 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30054037 Change-Id: Ia0d93115cedf07c51e167c4497bdd8481220c8b5 --- tools/backup_tool/src/tools_op_restore_async.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/backup_tool/src/tools_op_restore_async.cpp b/tools/backup_tool/src/tools_op_restore_async.cpp index 07da6b963..5e8bfa1ec 100644 --- a/tools/backup_tool/src/tools_op_restore_async.cpp +++ b/tools/backup_tool/src/tools_op_restore_async.cpp @@ -190,7 +190,7 @@ static int32_t ChangeBundleInfo(const string &pathCapFile, const vector } bundleInfos.emplace_back(BJsonEntityCaps::BundleInfo { .name = name, .needToInstall = false, .versionCode = versionCode, .versionName = versionName, - .extensionName = spaceOccupied.extensionName, .spaceOccupied = bundleInfo.spaceOccupied}); + .extensionName = bundleInfo.extensionName, .spaceOccupied = bundleInfo.spaceOccupied}); } } cache.SetBundleInfos(bundleInfos); -- Gitee From 5d9638412d4f42a5803ceecf98fa814ada205b23 Mon Sep 17 00:00:00 2001 From: z30054037 Date: Fri, 27 Oct 2023 06:57:56 +0000 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30054037 Change-Id: Id4408ff3c257960c147aac7c95c7dbe0d2a55286 --- tools/backup_tool/src/tools_op_restore_async.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/backup_tool/src/tools_op_restore_async.cpp b/tools/backup_tool/src/tools_op_restore_async.cpp index 5e8bfa1ec..e891e6680 100644 --- a/tools/backup_tool/src/tools_op_restore_async.cpp +++ b/tools/backup_tool/src/tools_op_restore_async.cpp @@ -189,7 +189,7 @@ static int32_t ChangeBundleInfo(const string &pathCapFile, const vector continue; } bundleInfos.emplace_back(BJsonEntityCaps::BundleInfo { - .name = name, .needToInstall = false, .versionCode = versionCode, .versionName = versionName, + .name = name, .needToInstall = false, .versionCode = versionCode, .versionName = versionName, .extensionName = bundleInfo.extensionName, .spaceOccupied = bundleInfo.spaceOccupied}); } } -- Gitee From f172e563ecf66edc6c06ab5e5186b43f5cdf656f Mon Sep 17 00:00:00 2001 From: z30054037 Date: Fri, 27 Oct 2023 09:20:45 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30054037 Change-Id: Ice9773e4ea91a92c93a010434a395841299ab3bd --- tools/backup_tool/src/tools_op_restore_async.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/backup_tool/src/tools_op_restore_async.cpp b/tools/backup_tool/src/tools_op_restore_async.cpp index e891e6680..95bca6d5d 100644 --- a/tools/backup_tool/src/tools_op_restore_async.cpp +++ b/tools/backup_tool/src/tools_op_restore_async.cpp @@ -189,8 +189,8 @@ static int32_t ChangeBundleInfo(const string &pathCapFile, const vector continue; } bundleInfos.emplace_back(BJsonEntityCaps::BundleInfo { - .name = name, .needToInstall = false, .versionCode = versionCode, .versionName = versionName, - .extensionName = bundleInfo.extensionName, .spaceOccupied = bundleInfo.spaceOccupied}); + .name = name, .versionCode = versionCode, .versionName = versionName, .spaceOccupied = bundleInfo.spaceOccupied, + .allToBackup = bundleInfo.allToBackup, .extensionName = bundleInfo.extensionName, .needToInstall = false}); } } cache.SetBundleInfos(bundleInfos); -- Gitee From 2966b1ff0fced7859e6d854201636e4052c500d1 Mon Sep 17 00:00:00 2001 From: z30054037 Date: Fri, 27 Oct 2023 09:35:33 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30054037 Change-Id: I97b0f5a19fd8eecfdb3e4ca0d14da2dcc2328726 --- tools/backup_tool/src/tools_op_restore_async.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/backup_tool/src/tools_op_restore_async.cpp b/tools/backup_tool/src/tools_op_restore_async.cpp index 95bca6d5d..625a787a7 100644 --- a/tools/backup_tool/src/tools_op_restore_async.cpp +++ b/tools/backup_tool/src/tools_op_restore_async.cpp @@ -180,11 +180,11 @@ static int32_t ChangeBundleInfo(const string &pathCapFile, const vector BJsonCachedEntity cachedEntity(move(fd)); auto cache = cachedEntity.Structuralize(); vector bundleInfos; - auto bundleInfos = cache.GetBundleInfos(); + auto cacheBundleInfos = cache.GetBundleInfos(); for (auto name : bundleNames) { string versionName = string(BConstants::DEFAULT_VERSION_NAME); uint32_t versionCode = static_cast(BConstants::DEFAULT_VERSION_CODE); - for (auto &&bundleInfo : bundleInfos) { + for (auto &&bundleInfo : cacheBundleInfos) { if (bundleInfo.name != name) { continue; } -- Gitee From 2a1f8544e48daeb1fe40c703801d8932944ed076 Mon Sep 17 00:00:00 2001 From: z30054037 Date: Sat, 28 Oct 2023 06:18:47 +0000 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30054037 Change-Id: I509a4b0c7d3bd2d926d59a82b2420cd07a65d5b9 --- tools/backup_tool/src/tools_op_restore_async.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/backup_tool/src/tools_op_restore_async.cpp b/tools/backup_tool/src/tools_op_restore_async.cpp index 625a787a7..fa815cda1 100644 --- a/tools/backup_tool/src/tools_op_restore_async.cpp +++ b/tools/backup_tool/src/tools_op_restore_async.cpp @@ -189,8 +189,9 @@ static int32_t ChangeBundleInfo(const string &pathCapFile, const vector continue; } bundleInfos.emplace_back(BJsonEntityCaps::BundleInfo { - .name = name, .versionCode = versionCode, .versionName = versionName, .spaceOccupied = bundleInfo.spaceOccupied, - .allToBackup = bundleInfo.allToBackup, .extensionName = bundleInfo.extensionName, .needToInstall = false}); + .name = name, .versionCode = versionCode, .versionName = versionName, + .spaceOccupied = bundleInfo.spaceOccupied,.allToBackup = bundleInfo.allToBackup, + .extensionName = bundleInfo.extensionName, .needToInstall = false}); } } cache.SetBundleInfos(bundleInfos); -- Gitee