protobin 0.0.28__tar.gz → 0.0.30__tar.gz

{protobin-0.0.28 → protobin-0.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: protobin
-Version: 0.0.28
+Version: 0.0.30
 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.30/protobin/__init__.py

@@ -0,0 +1,2 @@
+from .protocol import Protocol
+from .singleton import ProtobinLoader

protobin-0.0.30/protobin/singleton.py

@@ -0,0 +1,18 @@
+from protobin import Protocol
+
+
+class ProtobinLoader(object):
+    __instance = None
+    protocols = {}
+
+    def __new__(cls, path, server=None):
+        if ProtobinLoader.__instance is None:
+            ProtobinLoader.__instance = object.__new__(cls)
+        return ProtobinLoader.__instance.get(path, server)
+
+    def get(self, path, server):
+        key = f'{path}|{server}'
+        if key not in self.protocols:
+            print('load protocol', path, server)
+            self.protocols[key] = Protocol(file=path, server=server)
+        return self.protocols[key]

{protobin-0.0.28 → protobin-0.0.30}/pyproject.toml

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

{protobin-0.0.28 → protobin-0.0.30}/tests/tests.py

@@ -5,7 +5,7 @@ import json
 import yaml
 from protobin import Protocol
 from protobin.errors import InputError, FormatError
-from protobin.singleton import ProtobinLoader
+from protobin import ProtobinLoader
 
 DATA = {
         'positions': [
@@ -646,9 +646,11 @@ report:
         print(header, recv)
 
     def test_singleton(self):
-        loader = ProtobinLoader()
-        loader.get('codec8.json')
-        loader.get('codec8.json')
-        loader.get('codec8.json')
-        loader.get('codec8.json')
-        loader.get('codec8.json')
+        protocol1 = ProtobinLoader('codec8.json')
+        protocol2 = ProtobinLoader('codec8.json')
+        protocol3 = ProtobinLoader('codec8.json')
+        protocol4 = ProtobinLoader('codec8.json')
+        protocol5 = ProtobinLoader('demo.json', server=False)
+        protocol6 = ProtobinLoader('demo.json', server=True)
+        protocol7 = ProtobinLoader('demo.json', server=True)
+        protocol8 = ProtobinLoader('demo.json', server=True)

protobin-0.0.28/protobin/__init__.py

@@ -1 +0,0 @@
-from .protocol import Protocol

protobin-0.0.28/protobin/singleton.py

@@ -1,17 +0,0 @@
-from protobin import Protocol
-
-
-class ProtobinLoader(object):
-    __instance = None
-    protocols = {}
-
-    def __new__(cls):
-        if ProtobinLoader.__instance is None:
-            ProtobinLoader.__instance = object.__new__(cls)
-        return ProtobinLoader.__instance
-
-    def get(self, path):
-        if path not in self.protocols:
-            # print('load protocol', path)
-            self.protocols[path] = Protocol(file=path)
-        return self.protocols[path]