Fixes linting issues and regex to parse bundle IDs and library IDs

EC-DIGIT-CSIRC · Oct 7, 2024 · e91bf43 · e91bf43
1 parent c730255
commit e91bf43
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/sysdiagnose/parsers/brctl.py b/src/sysdiagnose/parsers/brctl.py
@@ -346,9 +346,9 @@ def parse_apps_monitor2json(data):
         # replace start of array string representation "{( by [
         # replace end of array string representation )}" by ]
         # remove char "
-        json_str = json_str.replace("\\", "").replace('"{(', '[').replace(')}";', '],').replace('"','')
-        # adds double quotes to all bundle IDs or App IDs
-        json_str = re.sub(r'([\w\.]+)', r'"\1"', json_str)
+        json_str = json_str.replace("\\", "").replace('"{(', '[').replace(')}";', '],').replace('"', '')
+        # adds double quotes to all bundle IDs or library IDs
+        json_str = re.sub(r'([\w\.\-]+)', r'"\1"', json_str)
 
         # ugly fixes
         last_comma_index = json_str.rfind(",")
@@ -359,7 +359,6 @@ def parse_apps_monitor2json(data):
 
         return json_str
 
-
     def parse_folder(brctl_folder):
         container_list_file = [os.path.join(brctl_folder, 'brctl-container-list.txt')]
         container_dump_file = [os.path.join(brctl_folder, 'brctl-dump.txt')]