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

refactor: carry on data_refactoring integration

Browse Source
This commit is contained in:
Swann Martinez
2019-08-05 17:58:56 +02:00
parent 1d935fced4
commit 11b6866045
4 changed files with 57 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
__init__.py
View File

@ -12,11 +12,10 @@ bl_info = {
import addon_utils import addon_utils
import logging import logging
import random import random
import string
import sys import sys
import os import os
import bpy import bpy
from . import environment from . import environment, utils
DEPENDENCIES = { DEPENDENCIES = {
@ -52,12 +51,6 @@ def client_list_callback(scene, context):
return items return items
def randomStringDigits(stringLength=6):
"""Generate a random string of letters and digits """
lettersAndDigits = string.ascii_letters + string.digits
return ''.join(random.choice(lettersAndDigits) for i in range(stringLength))
def randomColor(): def randomColor():
r = random.random() r = random.random()
v = random.random() v = random.random()
@ -95,7 +88,7 @@ class ReplicatedDatablock(bpy.types.PropertyGroup):
class SessionProps(bpy.types.PropertyGroup): class SessionProps(bpy.types.PropertyGroup):
username: bpy.props.StringProperty( username: bpy.props.StringProperty(
name="Username", name="Username",
default="user_{}".format(randomStringDigits()), default="user_{}".format(utils.random_string_digits()),
update=save_session_config update=save_session_config
) )
ip: bpy.props.StringProperty( ip: bpy.props.StringProperty(

160
operators.py
View File

@ -14,7 +14,7 @@ from bpy_extras.io_utils import ExportHelper
import mathutils import mathutils
from pathlib import Path from pathlib import Path
from . import environment, presence, ui from . import environment, presence, ui, utils
from .libs import umsgpack from .libs import umsgpack
from .libs.replication.client import Client from .libs.replication.client import Client
@ -42,7 +42,7 @@ def execute_queued_functions():
def clean_scene(elements=environment.rtypes): def clean_scene(elements=environment.rtypes):
for datablock in elements: for datablock in elements:
datablock_ref = getattr(bpy.data, helpers.BPY_TYPES[datablock]) datablock_ref = getattr(bpy.data, utils.BPY_TYPES[datablock])
for item in datablock_ref: for item in datablock_ref:
try: try:
datablock_ref.remove(item) datablock_ref.remove(item)
@ -72,7 +72,7 @@ def update_client_selected_object(context):
client_key = "Client/{}".format(username) client_key = "Client/{}".format(username)
client_data = client.get(client_key) client_data = client.get(client_key)
selected_objects = helpers.get_selected_objects(context.scene) selected_objects = utils.get_selected_objects(context.scene)
if len(selected_objects) > 0 and len(client_data) > 0: if len(selected_objects) > 0 and len(client_data) > 0:
for obj in selected_objects: for obj in selected_objects:
@ -87,11 +87,10 @@ def update_client_selected_object(context):
client.set(client_key, client_data[0][1]) client.set(client_key, client_data[0][1])
# TODO: cleanup # TODO: cleanup
def init_datablocks(): def init_datablocks():
for datatype in environment.rtypes: for datatype in environment.rtypes:
if bpy.context.window_manager.session.supported_datablock[datatype].is_replicated: if bpy.context.window_manager.session.supported_datablock[datatype].is_replicated:
for item in getattr(bpy.data, helpers.BPY_TYPES[datatype]): for item in getattr(bpy.data, utils.BPY_TYPES[datatype]):
item.id = bpy.context.window_manager.session.username item.id = bpy.context.window_manager.session.username
key = "{}/{}".format(datatype, item.name) key = "{}/{}".format(datatype, item.name)
client.set(key) client.set(key)
@ -120,47 +119,46 @@ def unregister_ticks():
# OPERATORS # OPERATORS
class SessionJoinOperator(bpy.types.Operator): class SessionStartOperator(bpy.types.Operator):
bl_idname = "session.join" bl_idname = "session.start"
bl_label = "join" bl_label = "start"
bl_description = "connect to a net server" bl_description = "connect to a net server"
bl_options = {"REGISTER"} bl_options = {"REGISTER"}
host: bpy.props.BoolProperty(default=False)
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
return True return True
def execute(self, context): def execute(self, context):
global execution_queue global execution_queue, client
net_settings = context.window_manager.session settings = context.window_manager.session
# save config # save config
net_settings.save(context) settings.save(context)
# Scene setup # Scene setup
if net_settings.start_empty: if settings.start_empty:
clean_scene() clean_scene()
# Session setup # Session setup
if net_settings.username == "DefaultUser": if settings.username == "DefaultUser":
net_settings.username = "{}_{}".format( settings.username = "{}_{}".format(
net_settings.username, randomStringDigits()) settings.username, utils.random_string_digits())
username = str(context.window_manager.session.username)
if len(net_settings.ip) < 1: client = Client()
net_settings.ip = "127.0.0.1" client.connect(settings.username,
settings.ip,
settings.port)
client = client.Client(execution_queue) # settings.is_running = True
client.connect(net_settings.username,
net_settings.ip,
net_settings.port)
# net_settings.is_running = True
# bpy.ops.session.refresh() # bpy.ops.session.refresh()
register_ticks() register_ticks()
# Launch drawing module # Launch drawing module
if net_settings.enable_presence: if settings.enable_presence:
presence.renderer.run() presence.renderer.run()
return {"FINISHED"} return {"FINISHED"}
@ -180,30 +178,13 @@ class SessionPropertyAddOperator(bpy.types.Operator):
return True return True
def execute(self, context): def execute(self, context):
global client
client.add(self.property_path) client.add(self.property_path)
return {"FINISHED"} return {"FINISHED"}
class SessionPropertyGetOperator(bpy.types.Operator):
bl_idname = "session.get_prop"
bl_label = "get"
bl_description = "broadcast a property to connected client_instances"
bl_options = {"REGISTER"}
@classmethod
def poll(cls, context):
return True
def execute(self, context):
global client_instance
client.get("client")
return {"FINISHED"}
class SessionPropertyRemoveOperator(bpy.types.Operator): class SessionPropertyRemoveOperator(bpy.types.Operator):
bl_idname = "session.remove_prop" bl_idname = "session.remove_prop"
bl_label = "remove" bl_label = "remove"
@ -217,6 +198,7 @@ class SessionPropertyRemoveOperator(bpy.types.Operator):
return True return True
def execute(self, context): def execute(self, context):
global client
try: try:
del client.property_map[self.property_path] del client.property_map[self.property_path]
@ -225,29 +207,6 @@ class SessionPropertyRemoveOperator(bpy.types.Operator):
return {"CANCELED"} return {"CANCELED"}
class SessionHostOperator(bpy.types.Operator):
bl_idname = "session.create"
bl_label = "create"
bl_description = "create to a net session"
bl_options = {"REGISTER"}
@classmethod
def poll(cls, context):
return True
def execute(self, context):
net_settings = context.window_manager.session
bpy.ops.session.join()
if net_settings.init_scene:
init_datablocks()
net_settings.is_admin = True
return {"FINISHED"}
class SessionStopOperator(bpy.types.Operator): class SessionStopOperator(bpy.types.Operator):
bl_idname = "session.stop" bl_idname = "session.stop"
bl_label = "close" bl_label = "close"
@ -260,7 +219,7 @@ class SessionStopOperator(bpy.types.Operator):
def execute(self, context): def execute(self, context):
net_settings = context.window_manager.session settings = context.window_manager.session
if client: if client:
client.exit() client.exit()
@ -268,7 +227,7 @@ class SessionStopOperator(bpy.types.Operator):
# del client_instance # del client_instance
# client_instance = None # client_instance = None
net_settings.is_admin = False settings.is_admin = False
unregister_ticks() unregister_ticks()
presence.renderer.stop() presence.renderer.stop()
@ -296,24 +255,24 @@ class SessionPropertyRightOperator(bpy.types.Operator):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
net_settings = context.window_manager.session settings = context.window_manager.session
col = layout.column() col = layout.column()
col.prop(net_settings, "clients") col.prop(settings, "clients")
def execute(self, context): def execute(self, context):
net_settings = context.window_manager.session settings = context.window_manager.session
if net_settings.is_admin: if settings.is_admin:
val = client.get(self.key) val = client.get(self.key)
val[0][1]['id'] = net_settings.clients val[0][1]['id'] = settings.clients
client.set(key=self.key, value=val[0][1], override=True) client.set(key=self.key, value=val[0][1], override=True)
item = helpers.resolve_bpy_path(self.key) item = utils.resolve_bpy_path(self.key)
if item: if item:
item.id = net_settings.clients item.id = settings.clients
logger.info("Updating {} rights to {}".format( logger.info("Updating {} rights to {}".format(
self.key, net_settings.clients)) self.key, settings.clients))
else: else:
print("Not admin") print("Not admin")
@ -393,11 +352,9 @@ class SessionSaveConfig(bpy.types.Operator):
classes = ( classes = (
SessionJoinOperator, SessionStartOperator,
SessionPropertyAddOperator, SessionPropertyAddOperator,
SessionPropertyGetOperator,
SessionStopOperator, SessionStopOperator,
SessionHostOperator,
SessionPropertyRemoveOperator, SessionPropertyRemoveOperator,
SessionSnapUserOperator, SessionSnapUserOperator,
SessionPropertyRightOperator, SessionPropertyRightOperator,
@ -405,27 +362,7 @@ classes = (
SessionSaveConfig, SessionSaveConfig,
) )
"""
def is_replicated(update):
object_type = update.id.bl_rna.__class__.__name__
object_name = update.id.name
# Master collection special cae
if update.id.name == 'Master Collection':
object_type = 'Scene'
object_name = bpy.context.scene.name
if 'Light' in update.id.bl_rna.name:
object_type = 'Light'
key = "{}/{}".format(object_type, object_name)
if client.exist(key):
return True
else:
logger.debug("{} Not rep".format(key))
return False
def get_datablock_from_update(update,context): def get_datablock_from_update(update,context):
item_type = update.id.__class__.__name__ item_type = update.id.__class__.__name__
item_id = update.id.name item_id = update.id.name
@ -434,8 +371,8 @@ def get_datablock_from_update(update,context):
if item_id == 'Master Collection': if item_id == 'Master Collection':
datablock_ref= bpy.context.scene datablock_ref= bpy.context.scene
elif item_type in helpers.BPY_TYPES.keys(): elif item_type in utils.BPY_TYPES.keys():
datablock_ref = getattr(bpy.data, helpers.BPY_TYPES[update.id.__class__.__name__])[update.id.name] datablock_ref = getattr(bpy.data, utils.BPY_TYPES[update.id.__class__.__name__])[update.id.name]
else: else:
if item_id in bpy.data.lights.keys(): if item_id in bpy.data.lights.keys():
datablock_ref = bpy.data.lights[item_id] datablock_ref = bpy.data.lights[item_id]
@ -444,14 +381,6 @@ def get_datablock_from_update(update,context):
return datablock_ref return datablock_ref
def toogle_update_dirty(context, update):
data_ref = get_datablock_from_update(update,context)
if data_ref:
logger.debug(update.id.bl_rna.__class__.__name__)
data_ref.is_dirty= True
def depsgraph_update(scene): def depsgraph_update(scene):
ctx = bpy.context ctx = bpy.context
@ -461,7 +390,7 @@ def depsgraph_update(scene):
username = ctx.window_manager.session.username username = ctx.window_manager.session.username
selected_objects = helpers.get_selected_objects(scene) selected_objects = utils.get_selected_objects(scene)
for update in reversed(updates): for update in reversed(updates):
if is_replicated(update): if is_replicated(update):
@ -486,20 +415,21 @@ def depsgraph_update(scene):
client.set(key) client.set(key)
else: else:
try: try:
getattr(bpy.data, helpers.BPY_TYPES[update.id.__class__.__name__]).remove(item) getattr(bpy.data, utils.BPY_TYPES[update.id.__class__.__name__]).remove(item)
except: except:
pass pass
break break
update_client_selected_object(ctx) update_client_selected_object(ctx)
"""
def register(): def register():
from bpy.utils import register_class from bpy.utils import register_class
for cls in classes: for cls in classes:
register_class(cls) register_class(cls)
bpy.app.handlers.depsgraph_update_post.append(depsgraph_update) # bpy.app.handlers.depsgraph_update_post.append(depsgraph_update)
presence.register() presence.register()
@ -508,8 +438,8 @@ def unregister():
presence.unregister() presence.unregister()
if bpy.app.handlers.depsgraph_update_post.count(depsgraph_update) > 0: # if bpy.app.handlers.depsgraph_update_post.count(depsgraph_update) > 0:
bpy.app.handlers.depsgraph_update_post.remove(depsgraph_update) # bpy.app.handlers.depsgraph_update_post.remove(depsgraph_update)
if client: if client:
client.exit() client.exit()

4
ui.py
View File

@ -66,7 +66,7 @@ class SESSION_PT_settings(bpy.types.Panel):
row.label(text="init scene:") row.label(text="init scene:")
row.prop(net_settings, "init_scene", text="") row.prop(net_settings, "init_scene", text="")
row = box.row() row = box.row()
row.operator("session.create", text="HOST") row.operator("session.start", text="HOST").host = True
else: else:
box = row.box() box = row.box()
row = box.row() row = box.row()
@ -80,7 +80,7 @@ class SESSION_PT_settings(bpy.types.Panel):
row = box.row() row = box.row()
row.operator("session.join", text="CONNECT") row.operator("session.start", text="CONNECT").host = False
# REPLICATION SETTINGS # REPLICATION SETTINGS
row = layout.row() row = layout.row()

8
helpers.py → utils.py
View File

@ -2,11 +2,13 @@ import logging
import sys import sys
from uuid import uuid4 from uuid import uuid4
import json import json
import string
import random
import bpy import bpy
import mathutils import mathutils
from . import draw, environment from . import presence, environment
from .libs import dump_anything from .libs import dump_anything
# TODO: replace hardcoded values... # TODO: replace hardcoded values...
@ -23,6 +25,10 @@ def revers(d):
return l[::-1] return l[::-1]
def random_string_digits(stringLength=6):
"""Generate a random string of letters and digits """
lettersAndDigits = string.ascii_letters + string.digits
return ''.join(random.choice(lettersAndDigits) for i in range(stringLength))
def refresh_window(): def refresh_window():
import bpy import bpy