Replace layout.get_newest() with rm_old_blocks()

Author: jrspruitt

ubireader/ubi/__init__.py

@@ -22,7 +22,7 @@
 from ubireader.ubi.defines import UBI_EC_HDR_MAGIC, FILE_CHUNK_SZ
 from ubireader.ubi import display
 from ubireader.ubi.image import description as image
-from ubireader.ubi.block import layout
+from ubireader.ubi.block import layout, rm_old_blocks
 
 class ubi_base(object):
     """UBI Base object
@@ -148,15 +148,17 @@ def __init__(self, ubi_file):
 
         layout_list, data_list, int_vol_list, unknown_list = sort.by_type(self.blocks)
 
-        if len(layout_list) < 2:
-            error(self, 'Fatal', 'Less than 2 layout blocks found.')
-
-        self._layout_blocks_list = layout.get_newest(self.blocks, layout_list)
+        self._layout_blocks_list = layout_list
         self._data_blocks_list = data_list
         self._int_vol_blocks_list = int_vol_list
         self._unknown_blocks_list = unknown_list
+        
+        newest_layout_list = rm_old_blocks(self.blocks, self.layout_blocks_list)
+        
+        if len(newest_layout_list) < 2:
+            error(self, 'Fatal', 'Less than 2 layout blocks found.')
 
-        layout_pairs = layout.group_pairs(self.blocks, self.layout_blocks_list)
+        layout_pairs = layout.group_pairs(self.blocks, newest_layout_list)
 
         layout_infos = layout.associate_blocks(self.blocks, layout_pairs)
 

ubireader/ubi/block/layout.py

@@ -20,33 +20,6 @@
 from ubireader.debug import log
 from ubireader.ubi.block import sort
 
-def get_newest(blocks, layout_blocks):
-    """Filter out old layout blocks from list
-
-    Arguments:
-    List:blocks        -- List of block objects
-    List:layout_blocks -- List of layout block indexes
-
-    Returns:
-    List -- Newest layout blocks in list
-    """
-
-    layout_temp = list(layout_blocks)
-    for i in range(0, len(layout_temp)):
-        for k in range(0, len(layout_blocks)):
-            if blocks[layout_temp[i]].ec_hdr.image_seq != blocks[layout_blocks[k]].ec_hdr.image_seq:
-                continue
-
-            if blocks[layout_temp[i]].leb_num != blocks[layout_blocks[k]].leb_num:
-                continue
-
-            if blocks[layout_temp[i]].vid_hdr.sqnum > blocks[layout_blocks[k]].vid_hdr.sqnum:
-                del layout_blocks[k]
-                break
-
-    return layout_blocks
-
-
 def group_pairs(blocks, layout_blocks_list):
     """Sort a list of layout blocks into pairs