Changeset 19ee734 in ammosreader for ammosreader/PPDWReader.py

Timestamp:

07/22/22 10:52:18 (3 years ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

AmmosSource, guix

Children:

dbcb255

Parents:

aebe4a1

Message:

return None if there is a problem when reading all frames left

File:

• ammosreader/PPDWReader.py (modified) (1 diff)

ammosreader/PPDWReader.py

@@ -15 +15 @@
 
     def read_all_frames_left(self):
-        while self.cursor <= len(self.content) - 32:
-            current_bytes = self.content[self.cursor:self.cursor+32]
-            assert len(current_bytes) == 32
-            if not current_bytes:
-                # print('End of file detected')
-                break
-            if self.cursor + 32 >= len(self.content):
-                # print('Can not read all 32 bytes of next PDW')
-                break
-            self.container.add(PDW.from_bytes(current_bytes))
-            self.cursor += 32
+        try:
+            while self.cursor <= len(self.content) - 32:
+                current_bytes = self.content[self.cursor:self.cursor+32]
+                assert len(current_bytes) == 32
+                if not current_bytes:
+                    # print('End of file detected')
+                    break
+                if self.cursor + 32 >= len(self.content):
+                    # print('Can not read all 32 bytes of next PDW')
+                    break
+                self.container.add(PDW.from_bytes(current_bytes))
+                self.cursor += 32
+        except Exception:
+            return None
         return self.container