From 391eef60d0bb4f5605ba0a7301aefe816c9dae32 Mon Sep 17 00:00:00 2001 From: flying Date: Sun, 18 Feb 2024 09:46:58 +0000 Subject: [PATCH 1/5] update tools/syscap_collector.py. Signed-off-by: flying --- tools/syscap_collector.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/syscap_collector.py b/tools/syscap_collector.py index e60bdc4..e9da1db 100755 --- a/tools/syscap_collector.py +++ b/tools/syscap_collector.py @@ -42,10 +42,19 @@ def dict_to_json(output_path: str, syscaps_dict: dict): print("start generate syscap json...") flags = os.O_WRONLY | os.O_CREAT modes = stat.S_IWUSR | stat.S_IRUSR + standard_product = ["default", "ipcamera", "pc", "tablet"] for product_name, syscaps_list in syscaps_dict.items(): + syscaps_list = list(set(syscaps_list)) + syscaps_list.remove("SystemCapability.HiviewDFX.Hiview") filename = os.path.join(output_path, f'{product_name}.json') with os.fdopen(os.open(filename, flags, modes), 'w') as f: - json.dump({'SysCaps': syscaps_list}, f, indent=4) + if product_name not in standard_product: + json.dump({'SysCaps': syscaps_list}, f, indent=4) + else: + for syscaps in syscaps_list: + if syscaps[-5:] == ".Lite": + syscaps_list.remove(syscaps) + json.dump({'SysCaps': syscaps_list}, f, indent=4) print("end...") -- Gitee From 03f778d047354b211b9827e8604e5c6da3dfd9a2 Mon Sep 17 00:00:00 2001 From: flying Date: Tue, 20 Feb 2024 10:15:09 +0000 Subject: [PATCH 2/5] update tools/syscap_collector.py. Signed-off-by: flying --- tools/syscap_collector.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/syscap_collector.py b/tools/syscap_collector.py index e9da1db..a58889c 100755 --- a/tools/syscap_collector.py +++ b/tools/syscap_collector.py @@ -45,7 +45,8 @@ def dict_to_json(output_path: str, syscaps_dict: dict): standard_product = ["default", "ipcamera", "pc", "tablet"] for product_name, syscaps_list in syscaps_dict.items(): syscaps_list = list(set(syscaps_list)) - syscaps_list.remove("SystemCapability.HiviewDFX.Hiview") + if "SystemCapability.HiviewDFX.Hiview" in syscaps_list: + syscaps_list.remove("SystemCapability.HiviewDFX.Hiview") filename = os.path.join(output_path, f'{product_name}.json') with os.fdopen(os.open(filename, flags, modes), 'w') as f: if product_name not in standard_product: -- Gitee From 883a4976d13323be65007891ac831d0a384f21d1 Mon Sep 17 00:00:00 2001 From: flying Date: Tue, 20 Feb 2024 10:22:40 +0000 Subject: [PATCH 3/5] update tools/syscap_collector.py. Signed-off-by: flying --- tools/syscap_collector.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/syscap_collector.py b/tools/syscap_collector.py index a58889c..6f165e7 100755 --- a/tools/syscap_collector.py +++ b/tools/syscap_collector.py @@ -31,6 +31,14 @@ def get_args(): args = parser.parse_args() return args +def adjust_syscaps_list(sys_list: str, product: str): + standard_product = ["default", "ipcamera", "pc", "tablet"] + if product in standard_product: + for syscap in sys_list: + if syscap[-5:] == ".Lite": + sys_list.remove(syscap) + return sys_list + def dict_to_json(output_path: str, syscaps_dict: dict): """ @@ -42,20 +50,14 @@ def dict_to_json(output_path: str, syscaps_dict: dict): print("start generate syscap json...") flags = os.O_WRONLY | os.O_CREAT modes = stat.S_IWUSR | stat.S_IRUSR - standard_product = ["default", "ipcamera", "pc", "tablet"] for product_name, syscaps_list in syscaps_dict.items(): syscaps_list = list(set(syscaps_list)) if "SystemCapability.HiviewDFX.Hiview" in syscaps_list: syscaps_list.remove("SystemCapability.HiviewDFX.Hiview") filename = os.path.join(output_path, f'{product_name}.json') with os.fdopen(os.open(filename, flags, modes), 'w') as f: - if product_name not in standard_product: - json.dump({'SysCaps': syscaps_list}, f, indent=4) - else: - for syscaps in syscaps_list: - if syscaps[-5:] == ".Lite": - syscaps_list.remove(syscaps) - json.dump({'SysCaps': syscaps_list}, f, indent=4) + syscaps_list = adjust_syscaps_list(syscaps_list, product_name) + json.dump({'SysCaps': syscaps_list}, f, indent=4) print("end...") -- Gitee From 97087f1f46d1b0826c42cdd7e5c1d966d7905bcc Mon Sep 17 00:00:00 2001 From: flying Date: Tue, 20 Feb 2024 10:43:42 +0000 Subject: [PATCH 4/5] update tools/syscap_collector.py. Signed-off-by: flying --- tools/syscap_collector.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/syscap_collector.py b/tools/syscap_collector.py index 6f165e7..d186a6a 100755 --- a/tools/syscap_collector.py +++ b/tools/syscap_collector.py @@ -31,12 +31,11 @@ def get_args(): args = parser.parse_args() return args -def adjust_syscaps_list(sys_list: str, product: str): + +def adjust_syscaps_list(sys_list: list, product: str): standard_product = ["default", "ipcamera", "pc", "tablet"] if product in standard_product: - for syscap in sys_list: - if syscap[-5:] == ".Lite": - sys_list.remove(syscap) + sys_list = [syscap for syscap in sys_list if not syscap.endswith(".Lite")] return sys_list -- Gitee From 696c678302579c691c5f5a6bfcc56f524fc763a5 Mon Sep 17 00:00:00 2001 From: flying Date: Wed, 21 Feb 2024 01:28:15 +0000 Subject: [PATCH 5/5] update tools/syscap_collector.py. Signed-off-by: flying --- tools/syscap_collector.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/syscap_collector.py b/tools/syscap_collector.py index d186a6a..cacada4 100755 --- a/tools/syscap_collector.py +++ b/tools/syscap_collector.py @@ -33,6 +33,7 @@ def get_args(): def adjust_syscaps_list(sys_list: list, product: str): + #调整syscaps_list:如果产品属于standard类，则去掉其中以.Lite结尾的syscap standard_product = ["default", "ipcamera", "pc", "tablet"] if product in standard_product: sys_list = [syscap for syscap in sys_list if not syscap.endswith(".Lite")] @@ -51,8 +52,6 @@ def dict_to_json(output_path: str, syscaps_dict: dict): modes = stat.S_IWUSR | stat.S_IRUSR for product_name, syscaps_list in syscaps_dict.items(): syscaps_list = list(set(syscaps_list)) - if "SystemCapability.HiviewDFX.Hiview" in syscaps_list: - syscaps_list.remove("SystemCapability.HiviewDFX.Hiview") filename = os.path.join(output_path, f'{product_name}.json') with os.fdopen(os.open(filename, flags, modes), 'w') as f: syscaps_list = adjust_syscaps_list(syscaps_list, product_name) -- Gitee