protobin 0.0.34__tar.gz → 0.0.36__tar.gz

{protobin-0.0.34 → protobin-0.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: protobin
-Version: 0.0.34
+Version: 0.0.36
 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.34 → protobin-0.0.36}/protobin/protocol.py

@@ -67,6 +67,7 @@ class Protocol:
     crc16 = None
     crc_byteorder = None
     crc_size = 2
+    fake_prefix = None
 
     def __init__(self, server: bool = None, file=None, js=None):
         self.server = server
@@ -87,6 +88,7 @@ class Protocol:
         if 'crc' in js:
             self.config_crc(js['crc'])
             self.length = js['length']
+        self.fake_prefix = js.get('fake_prefix')
         formats = js['formats']
         self.formats = {}
         for name in formats.keys():
@@ -112,22 +114,33 @@ class Protocol:
             raise InputError(f'{format_key} is not available format, these are the all availables formats {self.formats.keys()}')
         format = self.formats[format_key]
         binary = format.encode(data)
-        if format.crc and self.crc16:
+        if self.fake_prefix and format.header:
+            binary = bytes(self.fake_prefix) + binary + self.get_crc(binary)
+        elif format.crc and self.crc16:
             binary = len(binary).to_bytes(self.length, 'big', signed=False) + binary + self.get_crc(binary)
+
         return binary
 
     def get_header(self, binary):
         n = binary.find(b'=')
         if n == -1:
+            # posiciones sin =, calcular la longitud de la trama con sus primero bytes
             binary = self.check_crc(binary)
             h = binary[:1]
             binary = binary[1:]
             format = self.get_codec(h)
         else:
             if n > 4:
-                binary = self.check_crc(binary)
+                # comandos de pantalla con = o que tengan un igual más adelante por casualidad
+                if self.fake_prefix and binary[:4] == bytes(self.fake_prefix):
+                    # comandos
+                    binary = binary[4:]
+                else:
+                    # codec8
+                    binary = self.check_crc(binary)
                 n = binary.find(b'=')
                 if n > 4 or n == -1:
+                    # si el igual está adelante no es parte del comando
                     h = binary[:1]
                     binary = binary[1:]
                     format = self.get_codec(h)
@@ -141,6 +154,7 @@ class Protocol:
         if codec is None:
             format, binary = self.get_header(binary)
         else:
+            # codec 8 u otro ya se sabe el codec
             format = self.formats[codec]
             if format.crc and self.crc16:
                 binary = self.check_crc(binary)

{protobin-0.0.34 → protobin-0.0.36}/pyproject.toml

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

{protobin-0.0.34 → protobin-0.0.36}/tests/codec8.json

@@ -1,5 +1,6 @@
 {
     "length": 8,
+    "fake_prefix": [0, 0, 0, 1],
     "crc": {"poly":  "0x18005", "init":  "0x0000", "reverse": true, "byte_order":  "big", "size": 4},
     "formats": {
         "login": {

{protobin-0.0.34 → protobin-0.0.36}/tests/teltonika.json

@@ -1,6 +1,7 @@
 {
     "length": 8,
     "crc": {"poly":  "0x18005", "init":  "0x0000", "reverse": true, "byte_order":  "big", "size":  4},
+    "fake_prefix": [0, 0, 0, 1],
     "formats": {
         "login": {
             "crc": false,

{protobin-0.0.34 → protobin-0.0.36}/tests/tests.py

@@ -569,6 +569,7 @@ report:
         self.assertEqual(recv, {'serial': '356307042441013'})
         binary2 = client.encode(recv, 'login')
         self.assertEqual(binary, binary2)
+        print(binary2)
 
     def test_position_binary(self):
         data = {'positions':
@@ -644,7 +645,7 @@ report:
         data = {'status': 'E', 'direction': 'A', 'next_next_control': '', 'next_next_time': '     ', 'next_control': '', 'next_time': '     ', 'previous_control': '', 'delay': 0, 'front_control': '', 'back_control': '', 'back_back_control': '', 'datero_bus_-1': 0, 'datero_dif_-1': 0, 'datero_bus_0': 0, 'datero_dif_0': 0, 'datero_bus_1': 0, 'datero_dif_1': 0, 'datero_bus_2': 0, 'datero_dif_2': 0, 'datero_bus_3': 256, 'datero_dif_3': 0, 'datero_bus_4': 0, 'datero_dif_4': 0, 'datero_bus_5': 0, 'datero_dif_5': 0}
         client = Protocol(file='codec8.json')
         binary = client.encode(data, 'status3')
-        self.assertEqual(b'\x00\x00\x00\x00\x00\x00\x00*s=EA\x00     \x00     \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb6\xd6', binary)
+        self.assertEqual(b'\x00\x00\x00\x01s=EA\x00     \x00     \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb6\xd6', binary)
         header, recv = client.decode(binary)
         self.assertEqual(data, recv)
 
@@ -711,3 +712,11 @@ report:
         header, recv = client.decode(binary)
         print(recv)
 
+    def test_status_teltonika(self):
+        pesquero = b'\x00\x00\x00\x01S=RA\x07IQUITOS14:05\x06LOBATO\x04\x07IGLESIA\x00f\x08\x00n\x05\x00\x96\x03\x01m\x08\x00\xb5\r\x01w\t\x00\x00o\xb4'
+        client = Protocol(file='teltonika.json', server=None)
+        header, recv = client.decode(pesquero)
+        print(recv)
+        binary = client.encode(recv, header)
+        print(binary)
+        self.assertEqual(pesquero, binary)