Fix and simplify reading and seeking in olecf/thumbs

pylinting to fix various bugs and code smells

supyr_struct/__init__.py

@@ -87,8 +87,8 @@
 # ##############
 __author__ = "Sigmmma"
 #           YYYY.MM.DD
-__date__ = "2025.01.18"
-__version__ = (1, 7, 0)
+__date__ = "2020.10.30"
+__version__ = (1, 5, 4)
 __website__ = "https://github.com/Sigmmma/supyr_struct"
 
 

supyr_struct/buffer.py

@@ -194,14 +194,11 @@ def peek(self, count=None, offset=None):
         Reads and returns 'count' number of bytes without
         changing the current read/write pointer position.
         '''
-        if offset is None:
-            pos = self._pos
-        else:
-            pos = offset
+        pos = self._pos if offset is None else offset
         try:
-            if pos + count < len(self):
-                return self[pos:pos + count]
-            return self[pos:pos + len(self)]
+            len_self = len(self)
+            peek_end = pos + count
+            return self[pos: len_self if peek_end >= len_self else peek_end]
         except TypeError:
             pass
 

supyr_struct/defs/audio/wav.py

@@ -165,7 +165,7 @@ def read_write_id3_data_size(
         #   are ignored, so a 257 bytes long tag is represented as $00 00 02 01.
         if writebuffer is not None:
             buffer.write(bytes(
-                (size >> (7 * (3 - i))) & 0x7F
+                (val >> (7 * (3 - i))) & 0x7F
                 for i, val in enumerate([parent.frame_data_size] * 4)
                 ))
         else: