protobin 0.0.45__tar.gz → 0.0.47__tar.gz

{protobin-0.0.45 → protobin-0.0.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: protobin
-Version: 0.0.45
+Version: 0.0.47
 Summary: Python library for encode and decode data in protobin format
 Project-URL: Homepage, https://github.com/drmelectronic/protobin-python
 Project-URL: Bug Tracker, https://github.com/drmelectronic/protobin-python/issues

{protobin-0.0.45 → protobin-0.0.47}/protobin/fields.py

@@ -130,6 +130,27 @@ class ArrayField(FieldBase):
         return lista, binary
 
 
+
+class BinaryField(FieldBase):
+
+    def __init__(self, k, js):
+        super().__init__(k, js)
+        self.length_size = js.get('length_size', 1)
+
+    def __repr__(self):
+        return f'BinaryField<key: {self.key}, bytes: {self.bytes}>'
+
+    def from_binary(self, binary):
+        return binary
+
+    def split(self, binary):
+        bytes = int.from_bytes(binary[:self.length_size], 'big', signed=False)
+        return binary[self.length_size:bytes + self.length_size], binary[bytes + self.length_size:]
+
+    def to_binary(self, val):
+        return len(val).to_bytes(self.length_size, 'big') + val
+
+
 class BitsField(FieldBase):
     length: int
 
@@ -159,11 +180,13 @@ class BitsField(FieldBase):
             return b'\x00'
         binary = b''
         if len(val) % 8:
-            bits = '0' * (8 - (len(val) % 8))
+            final = '0' * (8 - (len(val) % 8))
         else:
-            bits = ''
+            final = ''
+        bits = ''
         for b in val:
             bits += '1' if b else '0'
+        bits += final
         bts = int(len(bits) / 8)
         if not self.length:
             binary += len(val).to_bytes(1, 'big', signed=False)
@@ -173,10 +196,12 @@ class BitsField(FieldBase):
     def from_binary_bits(self, binary, length):
         numero = int.from_bytes(binary, 'big', signed=False)
         bits = bin(numero)[2:]
-        val = [False] * 8
-        for b in bits:
-            val.append(b == '1')
-        val = val[-length:]
+        max_length = (length // 8) * 8 + (8 if (length % 8) else 0)
+        if len(bits) < max_length:
+            bits = '0' * (max_length - len(bits)) + bits
+        val = []
+        for i in range(length):
+            val.append(bits[i] == '1')
         return val
 
 
@@ -521,6 +546,7 @@ class UnsignedField(FieldBase):
 
 FIELD_MAP = {
     'array': ArrayField,
+    'binary': BinaryField,
     'bits': BitsField,
     'bool': BoolField,
     'char': CharField,

{protobin-0.0.45 → protobin-0.0.47}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "protobin"
-version = "0.0.45"
+version = "0.0.47"
 authors = [
     { name="Daniel Robles", email="drm.electronic@gmail.com" },
 ]

{protobin-0.0.45 → protobin-0.0.47}/tests/tests.py

@@ -83,6 +83,10 @@ class BasicTest(unittest.TestCase):
                 "header": "b",
                 "fields": {'test': {'type': 'bits', 'length': 7}}
             },
+            'binary': {
+                "header": "bin",
+                "fields": {'test': {'type': 'binary'}}
+            },
             'bool': {
                 "header": "BO",
                 "fields": {'test': {'bytes': 1, 'type': 'bool'}}
@@ -177,6 +181,65 @@ class BasicTest(unittest.TestCase):
         binary = self.protocol.encode(data, 'bits')
         h, recv = self.protocol.decode(binary)
         self.assertEqual(data, recv)
+        data = {'test': [True, False]}
+        binary = self.protocol.encode(data, 'bits')
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
+
+    def test_binary(self):
+        data = {'test': b'S=RA\x05'}
+        binary = self.protocol.encode(data, 'binary')
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
+
+    def test_command_binary(self):
+        data = {'test': None}
+        with self.assertRaises(ValueError) as er:
+            self.protocol.encode(data, 'unsigned')
+
+        protocol = Protocol(js={
+            "length": 8,
+            "fake_prefix": True,
+            "crc": {"poly":  "0x18005", "init":  "0x0000", "reverse": True, "byte_order":  "big", "size":  4},
+            'formats': {
+                "command": {
+                    "codec": 12,
+                    "fields": {
+                        "#commands1": {"bytes": 1, "type": "unsigned"},
+                        "type": {"bytes": 1, "type": "unsigned"},
+                        "command": {"length_size": 4, "type": "binary"},
+                        "#commands2": {"bytes": 1, "type": "unsigned"}
+                    }
+                }
+            }})
+        binary = b'S=RA\x05CERES07:42\x08HUACHIPA2\nPZA VITART\x00>\n\x00\x07\x01\x00\x041\x00&\r\x00\x00\x00\x00\x00\x00(\xc4'
+        data = {
+            '#commands1': 1,
+            'type': 5,
+            'command': binary,
+            '#commands2': 1,
+        }
+        binary = protocol.encode(data, 'command')
+        print(binary)
+        h, recv = protocol.decode(binary)
+        print(recv)
+        self.assertEqual(data, recv)
+
+    def test_bits_false(self):
+        data = {'test': [False, False]}
+        binary = self.protocol.encode(data, 'bits')
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
+
+    def test_bits_false2(self):
+        data = {'test': [False, True]}
+        binary = self.protocol.encode(data, 'bits')
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
+        data = {'test': [False, True, False, False, False, False, False, False, False, False, False, False, False, False]}
+        binary = self.protocol.encode(data, 'bits')
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
 
     def test_bits_fixed(self):
         data = {'test': [True, False, True, False, False, True, True]}
@@ -210,10 +273,8 @@ class BasicTest(unittest.TestCase):
 
     def test_char_utf(self):
         data = {'test': 'ñ'}
-        binary = self.protocol.encode(data, 'char')
-        print('binary', binary)
-        h, recv = self.protocol.decode(binary)
-        self.assertEqual(data, recv)
+        with self.assertRaises(ValueError):
+            self.protocol.encode(data, 'char')
 
     def test_char2(self):
         data = {'test': 'FA', 'prueba': 'DO'}