Changeset d6535bd in ammosreader for ammosreader/AmmosSocketSource.py

Timestamp:

05/28/23 15:00:01 (2 years ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

AmmosSource

Children:

90cd378

Parents:

1de11fa

Message:

more refactoring to clean up superfluous classes

File:

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

ammosreader/AmmosSocketSource.py

@@ -11 +11 @@
 
     def read_bytes(self, bytes_to_read):
+        """
+        I read bytes_to_read bytes from my socket. Incomplete reads get discarded.
+
+        :param bytes_to_read: the number of bytes to read
+        :type bytes_to_read: int
+
+        :return: the complete byte string or None if not all the bytes are read
+        :rtype: bytes
+        """
+
+        assert bytes_to_read > 0
         byte_array = []
         logger.info("Start reading bytes from socket")
         try:
-            while len(b''.join(byte_array)) < bytes_to_read:
-                logger.info("Remaining Bytes: %s", bytes_to_read - len(b''.join(byte_array)))
-                self.source.settimeout(5)
-                new_bytes = self.source.recv(bytes_to_read - len(b''.join(byte_array)), socket.MSG_WAITALL)
+            while len(byte_array) < bytes_to_read:
+                logger.info("Remaining Bytes: %s", bytes_to_read - len(byte_array))
+                self.source.settimeout(self.timeout)
+                new_bytes = self.source.recv(bytes_to_read - len(byte_array), socket.MSG_WAITALL)
 
                 if not new_bytes:
                     raise TimeoutError("Socket timed out while reading data")
-                logger.info("Got %s bytes of %s remaining", len(new_bytes), bytes_to_read - len(b''.join(byte_array)))
+                logger.info("Got %s bytes of %s remaining", len(new_bytes), bytes_to_read - len(byte_array))
                 byte_array.append(new_bytes)
-                print(byte_array)
         except TimeoutError:
             logger.info("Timeout error while reading from socket")