refactor(nvs): nvs_tool.py integrity check refactor

components/nvs_flash/nvs_partition_tool/nvs_check.py

@@ -4,17 +4,21 @@
 from typing import Dict, List
 
 from nvs_logger import NVS_Logger
-from nvs_parser import NVS_Entry, NVS_Partition, nvs_const
+from nvs_parser import nvs_const
+from nvs_parser import NVS_Entry
+from nvs_parser import NVS_Page
+from nvs_parser import NVS_Partition
 
 
-def integrity_check(nvs_partition: NVS_Partition, nvs_log: NVS_Logger) -> None:
+EMPTY_ENTRY = NVS_Entry(-1, bytearray(32), 'Erased')
+
 used_namespaces: Dict[int, None] = {}
 found_namespaces: Dict[int, str] = {}
 blobs: Dict = {}
 blob_chunks: List[NVS_Entry] = []
-    empty_entry = NVS_Entry(-1, bytearray(32), 'Erased')
 
-    # Partition size check
+
+def check_partition_size(nvs_partition: NVS_Partition, nvs_log: NVS_Logger) -> None:
     if len(nvs_partition.pages) < 3:
         nvs_log.info(
             nvs_log.yellow(
@@ -22,7 +26,8 @@ def integrity_check(nvs_partition: NVS_Partition, nvs_log: NVS_Logger) -> None:
             )
         )
 
-    # Free/empty page check
+
+def check_empty_page_present(nvs_partition: NVS_Partition, nvs_log: NVS_Logger) -> None:
     if not any(page.header['status'] == 'Empty' for page in nvs_partition.pages):
         nvs_log.info(
             nvs_log.red(
@@ -32,42 +37,51 @@ at least one free page is required for proper function!'''
         )
         nvs_log.info(nvs_log.red('NVS partition possibly truncated?\n'))
 
-    for page in nvs_partition.pages:
-        # page: NVS_Page
 
-        # Print page header
+def check_empty_page_content(nvs_page: NVS_Page, nvs_log: NVS_Logger) -> None:
-        if page.header['status'] == 'Empty':
+    nvs_log.info(nvs_log.cyan(f'Page {nvs_page.header["status"]}'))
-            nvs_log.info(nvs_log.cyan('Page Empty'))
 
-            # Check if page is truly empty
+    if nvs_page.raw_entry_state_bitmap != bytearray({0xFF}) * nvs_const.entry_size:
-            if page.raw_entry_state_bitmap != bytearray({0xFF}) * nvs_const.entry_size:
         nvs_log.info(
             nvs_log.red(
                 'The page is reported as Empty but its entry state bitmap is not empty!'
             )
         )
-            if any([not e.is_empty for e in page.entries]):
+
+    if any([not e.is_empty for e in nvs_page.entries]):
         nvs_log.info(
             nvs_log.red('The page is reported as Empty but there are data written!')
         )
-        else:
+
-            # Check page header CRC32
+
-            if page.header['crc']['original'] == page.header['crc']['computed']:
+def check_page_crc(nvs_page: NVS_Page, nvs_log: NVS_Logger) -> None:
+    if nvs_page.header['crc']['original'] == nvs_page.header['crc']['computed']:
         nvs_log.info(
-                    nvs_log.cyan(f'Page no. {page.header["page_index"]}'), '\tCRC32: OK'
+            nvs_log.cyan(f'Page no. {nvs_page.header["page_index"]}'), '\tCRC32: OK'
         )
     else:
         nvs_log.info(
-                    nvs_log.cyan(f'Page no. {page.header["page_index"]}'),
+            nvs_log.cyan(f'Page no. {nvs_page.header["page_index"]}'),
             f'Original CRC32:',
-                    nvs_log.red(f'{page.header["crc"]["original"]:x}'),
+            nvs_log.red(f'{nvs_page.header["crc"]["original"]:x}'),
             f'Generated CRC32:',
-                    nvs_log.green(f'{page.header["crc"]["computed"]:x}'),
+            nvs_log.green(f'{nvs_page.header["crc"]["computed"]:x}'),
         )
 
-        # Check all entries
+
+def identify_entry_duplicates(entry: NVS_Entry, seen_written_entires: Dict[str, list[NVS_Entry]]) -> Dict[str, list[NVS_Entry]]:
+    if entry.state == 'Written':
+        if entry.key in seen_written_entires:
+            seen_written_entires[entry.key].append(entry)
+        else:
+            seen_written_entires[entry.key] = [entry]
+    return seen_written_entires
+
+
+def check_page_entries(nvs_page: NVS_Page, nvs_log: NVS_Logger) -> Dict[str, list[NVS_Entry]]:
     seen_written_entires: Dict[str, list[NVS_Entry]] = {}
-        for entry in page.entries:
+
+    for entry in nvs_page.entries:
         # entry: NVS_Entry
 
         # Entries stored in 'page.entries' are primitive data types, blob indexes or string/blob data
@@ -76,11 +90,7 @@ at least one free page is required for proper function!'''
         # and are stored in as entries inside string/blob data entry 'entry.children' list
 
         # Duplicate entry check (1) - same key, different index - find duplicates
-            if entry.state == 'Written':
+        seen_written_entires = identify_entry_duplicates(entry, seen_written_entires)
-                if entry.key in seen_written_entires:
-                    seen_written_entires[entry.key].append(entry)
-                else:
-                    seen_written_entires[entry.key] = [entry]
 
         # Entry state check - doesn't check variable length values (metadata such as state are meaningless as all 32 bytes are pure data)
         if entry.is_empty:
@@ -164,7 +174,7 @@ at least one free page is required for proper function!'''
             # Gather blobs & namespaces
             if entry.metadata['type'] == 'blob_index':
                 blobs[f'{entry.metadata["namespace"]:03d}{entry.key}'] = [entry] + [
-                        empty_entry
+                    EMPTY_ENTRY
                 ] * entry.data['chunk_count']
             elif entry.metadata['type'] == 'blob_data':
                 blob_chunks.append(entry)
@@ -174,8 +184,15 @@ at least one free page is required for proper function!'''
             else:
                 used_namespaces[entry.metadata['namespace']] = None
 
-        # Duplicate entry check (2) - same key, different index - print duplicates
+    return seen_written_entires
+
+
+def filter_entry_duplicates(seen_written_entires: Dict[str, list[NVS_Entry]]) -> List[List[NVS_Entry]]:
     duplicate_entries_list = [seen_written_entires[key] for key in seen_written_entires if len(seen_written_entires[key]) > 1]
+    return duplicate_entries_list
+
+
+def print_entry_duplicates(page: NVS_Page, duplicate_entries_list: List[List[NVS_Entry]], nvs_log: NVS_Logger) -> None:
     for duplicate_entries in duplicate_entries_list:
         # duplicate_entries: list[NVS_Entry]
         nvs_log.info(
@@ -191,16 +208,15 @@ with status {page.header["status"]} is used by the following entries:'''
                 )
             )
 
-    nvs_log.info()
 
-    # Blob checks
+def assemble_blobs(nvs_log: NVS_Logger) -> None:
-    # Assemble blobs
     for chunk in blob_chunks:
+        # chunk: NVS_Entry
         parent = blobs.get(
-            f'{chunk.metadata["namespace"]:03d}{chunk.key}', [empty_entry]
+            f'{chunk.metadata["namespace"]:03d}{chunk.key}', [EMPTY_ENTRY]
         )[0]
         # Blob chunk without blob index check
-        if parent is empty_entry:
+        if parent is EMPTY_ENTRY:
             nvs_log.info(
                 nvs_log.red(f'Blob {chunk.key} chunk has no blob index!'),
                 f'Namespace index: {chunk.metadata["namespace"]:03d}',
@@ -212,15 +228,19 @@ with status {page.header["status"]} is used by the following entries:'''
             chunk_index = chunk.metadata['chunk_index'] - parent.data['chunk_start']
             blobs[blob_key][chunk_index + 1] = chunk
 
-    # Blob data check
+    # return blobs
+
+
+def check_blob_data(nvs_log: NVS_Logger) -> None:
     for blob_key in blobs:
         blob_index = blobs[blob_key][0]
         blob_chunks = blobs[blob_key][1:]
         blob_size = blob_index.data['size']
 
         for i, chunk in enumerate(blob_chunks):
+            # chunk: NVS_Entry
             # Blob missing chunk check
-            if chunk is empty_entry:
+            if chunk is EMPTY_ENTRY:
                 nvs_log.info(
                     nvs_log.red(f'Blob {blob_index.key} is missing a chunk!'),
                     f'Namespace index: {blob_index.metadata["namespace"]:03d}',
@@ -237,7 +257,15 @@ with status {page.header["status"]} is used by the following entries:'''
                 f'Namespace index: {blob_index.metadata["namespace"]:03d}',
             )
 
-    # Namespace checks
+
+def check_blobs(nvs_log: NVS_Logger) -> None:
+    # Assemble blobs
+    assemble_blobs(nvs_log)
+    # Blob data check
+    check_blob_data(nvs_log)
+
+
+def check_namespaces(nvs_log: NVS_Logger) -> None:
     # Undefined namespace index check
     for used_ns in used_namespaces:
         key = found_namespaces.pop(used_ns, '')
@@ -255,3 +283,38 @@ with status {page.header["status"]} is used by the following entries:'''
             f'Namespace index: {unused_ns:03d}',
             f'[{found_namespaces[unused_ns]}]',
         )
+
+
+def integrity_check(nvs_partition: NVS_Partition, nvs_log: NVS_Logger) -> None:
+    # Partition size check
+    check_partition_size(nvs_partition, nvs_log)
+
+    # Free/empty page check
+    check_empty_page_present(nvs_partition, nvs_log)
+
+    for page in nvs_partition.pages:
+        # page: NVS_Page
+
+        # Print page header
+        if page.header['status'] == 'Empty':
+            # Check if page is truly empty
+            check_empty_page_content(page, nvs_log)
+        else:
+            # Check page header CRC32
+            check_page_crc(page, nvs_log)
+
+        # Check all entries
+        seen_written_entires = check_page_entries(page, nvs_log)
+
+        # Duplicate entry check (2) - same key, different index - print duplicates
+        duplicates = filter_entry_duplicates(seen_written_entires)
+        # Print duplicate entries
+        print_entry_duplicates(page, duplicates, nvs_log)
+
+    nvs_log.info()  # Empty line
+
+    # Blob checks
+    check_blobs(nvs_log)
+
+    # Namespace checks
+    check_namespaces(nvs_log)