feat(rcf): early work on serialization refactoring

net_components.py

@@ -19,26 +19,28 @@ class RCFFactory(object):
         """
         set the RCFMessage pointer to local data
         """
+        print("Default setter")
         #Setup data accessor
-        # data.get = load_getter(data)
+        data.get = self.load_getter(data)
-        # data.set = load_setter(data)
+        data.set = self.load_setter(data)
-        pass
+
         # TODO: Setup local pointer
   
-        pass
 
     def load_getter(self, data):
         """
         local program > rcf 
 
         """
-        pass
+        print("Default getter")
+        return None
 
     def load_setter(self, data):
         """
         rcf > local program
         """
-        pass
+        print("Default setter")
+        return None
 
     def apply(self,data):
         pass
@@ -53,7 +55,7 @@ class RCFStore(collections.MutableMapping,dict):
     def __init__(self, custom_factory=RCFFactory()):
         super().__init__() 
         self.factory = custom_factory
-        print("Init a store")
+        print("name {}".format(custom_factory.__class__.__name__))
         
     def __getitem__(self,key):
         # if self[key]:
@@ -64,13 +66,14 @@ class RCFStore(collections.MutableMapping,dict):
     def __setitem__(self, key, value):
         #test
         # TODO: test with try - except KeyError
-        if key in self:
+        # if key in self:
-            # Set dict data from external
+        #     # Set dict data from external
-            dict.__setitem__(self,key,value)
+        #     dict.__setitem__(self,key,value)
-        else:
+        # else:
-            print("need init")
+        #     print("{}".format(value))
-            self.factory.init(value.body)
+        #     self.factory.init(value)
-            dict.__setitem__(self,key,value)
+
+        dict.__setitem__(self,key,value)
            
     def __delitem__(self, key):
         dict.__delitem__(self,key)
@@ -101,8 +104,8 @@ class RCFMessage(object):
         self.body = body
         self.id = id
         self.pointer = pointer
-        self.load = None
+        self.get = None
-        self.unload = None
+        self.set = None
     def store(self, dikt):
         """Store me in a dict if I have anything to store"""
         # this currently erasing old value
@@ -147,7 +150,15 @@ class RCFMessage(object):
         ))
 
 class Client():
-    def __init__(self, context=zmq.Context(), id="default", on_recv=None, on_post_init=None, is_admin=False, factory=RCFFactory()):
+    def __init__(
+        self, 
+        context=zmq.Context(), 
+        id="default", 
+        on_recv=None, 
+        on_post_init=None, 
+        is_admin=False, 
+        factory=None):
+
         self.is_admin = is_admin
 
         # 0MQ vars
@@ -164,7 +175,7 @@ class Client():
         # Main client loop registration
         self.task = asyncio.ensure_future(self.main())
 
-        self.property_map = RCFStore()
+        self.property_map = RCFStore(custom_factory=factory)
 
         logger.info("{} client initialized".format(id))
 

net_operators.py

@@ -1,5 +1,6 @@
 import bpy
 from . import net_components
+from . import rna_translation
 import time
 import logging
 import mathutils
@@ -22,11 +23,6 @@ NATIVE_TYPES = (
 )
 
 
-class RNAFactory(net_components.RCFFactory):
-    def load_getter(self, data):
-        get, set = match_supported_types(data)
-
-
 def on_scene_evalutation(scene):
     # TODO: viewer representation
     # TODO: Live update only selected object
@@ -182,8 +178,13 @@ class session_join(bpy.types.Operator):
 
         username = str(context.scene.session_settings.username)
 
+        client_factory = rna_translation.RNAFactory()
+        print("{}".format(client_factory.__class__.__name__))
         client = net_components.Client(
-            id=username, on_recv=recv_callbacks, on_post_init=post_init_callbacks)
+            id=username, 
+            on_recv=recv_callbacks, 
+            on_post_init=post_init_callbacks,
+            factory=client_factory)
         # time.sleep(1)
 
         bpy.ops.asyncio.loop()
@@ -310,7 +311,6 @@ class session_settings(bpy.types.PropertyGroup):
         name="update_frequency", default=0.008)
 
 
-
 # TODO: Rename to match official blender convention
 classes = (
     session_join,
@@ -334,13 +334,23 @@ def register():
 
 
 def unregister():
+
+    global server
+    global client
+
+    if server:
+        server.stop()
+        del server
+        server = None
+    if client:
+        client.stop()
+        del client
+        client = None
+
     from bpy.utils import unregister_class
     for cls in reversed(classes):
         unregister_class(cls)
 
-   
-
-
     # bpy.app.handlers.depsgraph_update_post.remove(on_scene_evalutation)
 
     del bpy.types.Scene.session_settings

rna_translation.py

@@ -0,0 +1,29 @@
+from . import net_components
+import bpy
+import mathutils
+
+def set_vector(value):
+    return  [value.x, value.y, value.z]
+
+def get_vector(value):
+    return mathutils.Vector(
+            (value[0], value[1], value[2]))
+
+class RNAFactory(net_components.RCFFactory):
+    def load_getter(self, data):
+        print("load RNA getter")
+        getter = None
+        if isinstance(data.body, mathutils.Vector):
+            print("Vector")
+            getter = get_vector
+
+        return getter
+    
+    def load_setter(self,data):
+        print("load RNA setter")
+        setter = None
+        if isinstance(data.body, mathutils.Vector):
+            print("Vector")     
+            setter = set_vector
+        
+        return setter