Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: serialisation refactoring

Browse Source
This commit is contained in:
Swann Martinez 2019-04-10 18:01:55 +02:00
parent 1789a432a1
commit f3be75ce3c
No known key found for this signature in database
GPG Key ID: 414CCAFD8DA720E1
3 changed files with 122 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client.py
View File

@ -76,12 +76,12 @@ class RCFClient(object):
self.pipe.send_multipart([b"CONNECT", (address.encode() if isinstance(
address, str) else address), b'%d' % port])
def set(self, key, value):
def set(self, key):
"""Set new value in distributed hash table
Sends [SET][key][value] to the agent
"""
self.pipe.send_multipart(
[b"SET", umsgpack.packb(key), umsgpack.packb(value)])
[b"SET", umsgpack.packb(key)])
def get(self, key):
"""Lookup value in distributed hash table
@ -161,14 +161,20 @@ class RCFClientAgent(object):
logger.error("E: too many servers (max. %i)", SERVER_MAX)
elif command == b"SET":
key, value = msg
key = umsgpack.unpackb(msg[0])
value = None
value = helpers.dump(key)
if value:
logger.info(key,"dumped")
# Send key-value pair on to server
rcfmsg = message.RCFMessage(key=key, id=self.id, mtype="", body=value)
# Send key-value pair on to server
rcfmsg = message.RCFMessage(key=umsgpack.unpackb(
key), id=self.id, mtype="", body=umsgpack.unpackb(value))
rcfmsg.store(self.property_map)
rcfmsg.send(self.publisher)
rcfmsg.store(self.property_map)
rcfmsg.send(self.publisher)
else:
logger.error("Fail to dump ")
elif command == b"GET":
key = umsgpack.unpackb(msg[0])
@ -223,6 +229,7 @@ def rcf_client_agent(ctx, pipe):
rcfmsg.store(agent.property_map)
elif agent.state == State.ACTIVE:
if rcfmsg.id != agent.id:
helpers.load(rcfmsg.key,rcfmsg.body)
rcfmsg.store(agent.property_map)
action = "update" if rcfmsg.body else "delete"
logging.info("I: received from {}:{},{} {}".format(

145
helpers.py
View File

@ -1,55 +1,56 @@
import bpy
from .libs import dump_anything
def dump_datablock(datablock, depth):
if datablock:
print("sending {}".format(datablock.name))
CORRESPONDANCE = {'Collection': 'collections', 'Mesh': 'meshes', 'Object': 'objects', 'Material': 'materials',
'Texture': 'textures', 'Scene': 'scenes', 'Light': 'lights', 'Camera': 'cameras', 'Action': 'actions', 'Armature': 'armatures', 'GreasePencil': 'grease_pencils'}
dumper = dump_anything.Dumper()
dumper.type_subset = dumper.match_subset_all
dumper.depth = depth
# LOAD HELPERS
datablock_type = datablock.bl_rna.name
key = "{}/{}".format(datablock_type, datablock.name)
data = dumper.dump(datablock)
def load(key, value):
target = resolve_bpy_path(key)
target_type = target.__class__.__name__
if target:
target.is_updating = True
client.push_update(key, datablock_type, data)
if target_type == 'Object':
load_object(target=target, data=value,
create=True)
elif target_type == 'Mesh':
load_mesh(target=target, data=value,
create=True)
elif target_type == 'Collection':
load_collection(target=target, data=value,
create=True)
elif target_type == 'Material':
load_material(target=target, data=value,
create=True)
elif target_type == 'Grease Pencil':
load_gpencil(target=target, data=value,
create=True)
elif target_type == 'Scene':
load_scene(target=target, data=value,
create=True)
elif 'Light' in target_type:
load_light(target=target, data=value,
create=True)
else:
load_default(target=target, data=value,
create=True, type=target_type)
def resolve_bpy_path(path):
"""
Get bpy property value from path
"""
item = None
def dump_datablock_attibute(datablock, attributes, depth=1):
if datablock:
dumper = dump_anything.Dumper()
dumper.type_subset = dumper.match_subset_all
dumper.depth = depth
try:
path = path.split('/')
item = getattr(bpy.data, CORRESPONDANCE[path[0]])[path[1]]
datablock_type = datablock.bl_rna.name
key = "{}/{}".format(datablock_type, datablock.name)
data = {}
for attr in attributes:
try:
data[attr] = dumper.dump(getattr(datablock, attr))
except:
pass
client.push_update(key, datablock_type, data)
def upload_mesh(mesh):
if mesh.bl_rna.name == 'Mesh':
dump_datablock_attibute(
mesh, ['name', 'polygons', 'edges', 'vertices'], 6)
def upload_material(material):
if material.bl_rna.name == 'Material':
dump_datablock_attibute(material, ['name', 'node_tree'], 7)
def upload_gpencil(gpencil):
if gpencil.bl_rna.name == 'Grease Pencil':
dump_datablock_attibute(gpencil, ['name', 'layers','materials'], 9)
except:
pass
return item
def load_mesh(target=None, data=None, create=False):
import bmesh
@ -272,3 +273,63 @@ def load_default(target=None, data=None, create=False, type=None):
dump_anything.load(target, data)
except:
print("default loading error")
# DUMP HELPERS
def dump(key):
target = resolve_bpy_path(key)
target_type = target.__class__.__name__
data = None
if target_type == 'Material':
data = dump_datablock_attibute(target, ['name', 'node_tree'], 7)
elif target_type == 'Grease Pencil':
data = dump_datablock_attibute(target, ['name', 'layers','materials'], 9)
elif target_type == 'Camera':
data = dump_datablock(target, 1)
elif target_type == 'Light':
data = dump_datablock(target, 1)
elif target_type == 'Mesh':
data = dump_datablock_attibute(
target, ['name', 'polygons', 'edges', 'vertices'], 6)
elif target_type == 'Object':
data = dump_datablock(target, 1)
elif target_type == 'Collection':
data = dump_datablock(target, 4)
elif target_type == 'Scene':
data = dump_datablock(target, 4)
return data
def dump_datablock(datablock, depth):
if datablock:
dumper = dump_anything.Dumper()
dumper.type_subset = dumper.match_subset_all
dumper.depth = depth
datablock_type = datablock.bl_rna.name
key = "{}/{}".format(datablock_type, datablock.name)
data = dumper.dump(datablock)
return data
def dump_datablock_attibute(datablock, attributes, depth=1):
if datablock:
dumper = dump_anything.Dumper()
dumper.type_subset = dumper.match_subset_all
dumper.depth = depth
datablock_type = datablock.bl_rna.name
key = "{}/{}".format(datablock_type, datablock.name)
data = {}
for attr in attributes:
try:
data[attr] = dumper.dump(getattr(datablock, attr))
except:
pass
return data

23
operators.py
View File

@ -53,8 +53,7 @@ SUPPORTED_DATABLOCKS = ['collections', 'meshes', 'objects',
'materials', 'textures', 'lights', 'cameras', 'actions', 'armatures', 'grease_pencils']
SUPPORTED_TYPES = ['Mesh', 'Grease Pencil', 'Material',
'Texture', 'Light', 'Camera', 'Object', 'Action', 'Armature','Collection', 'Scene']
CORRESPONDANCE = {'Collection': 'collections', 'Mesh': 'meshes', 'Object': 'objects', 'Material': 'materials',
'Texture': 'textures', 'Scene': 'scenes', 'Light': 'lights', 'Camera': 'cameras', 'Action': 'actions', 'Armature': 'armatures', 'GreasePencil': 'grease_pencils'}
# UTILITY FUNCTIONS
@ -78,22 +77,6 @@ def randomColor():
return [r, v, b]
def resolve_bpy_path(path):
"""
Get bpy property value from path
"""
item = None
try:
path = path.split('/')
item = getattr(bpy.data, CORRESPONDANCE[path[0]])[path[1]]
except:
pass
return item
def refresh_window():
import bpy
bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1)
@ -443,8 +426,8 @@ class session_add_property(bpy.types.Operator):
def execute(self, context):
global client_instance
client_instance.set('key', 1)
print(client_instance.get('key'))
client_instance.set(self.property_path)
# print(client_instance.get('key'))
# item = resolve_bpy_path(self.property_path)
# print(item)