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

refactor: _init_ cleanuo

Browse Source
This commit is contained in:
Swann
2019-09-24 13:26:51 +02:00
parent 177b4c6d8c
commit 4ee094ec9a
1 changed files with 31 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
__init__.py
View File

@ -78,31 +78,6 @@ def randomColor():
b = random.random() b = random.random()
return [r, v, b] return [r, v, b]
def save_session_config(self,context):
config = environment.load_config()
if "supported_types" not in config:
config = generate_supported_types()
config["username"] = self.username
config["ip"] = self.ip
config["port"] = self.port
config["start_empty"] = self.start_empty
config["enable_presence"] = self.enable_presence
config["client_color"] = [self.client_color.r,self.client_color.g,self.client_color.b]
rep_type = {}
for bloc in self.supported_datablock:
config["supported_types"][bloc.type_name]['bl_delay_refresh'] = bloc.bl_delay_refresh
config["supported_types"][bloc.type_name]['bl_delay_apply'] = bloc.bl_delay_apply
config["supported_types"][bloc.type_name]['use_as_filter'] = bloc.use_as_filter
config["supported_types"][bloc.type_name]['icon'] = bloc.icon
config["supported_types"][bloc.type_name]['auto_push'] = bloc.auto_push
config["supported_types"][bloc.type_name]['bl_name'] = bloc.bl_name
# Save out the configuration file
environment.save_config(config)
class ReplicatedDatablock(bpy.types.PropertyGroup): class ReplicatedDatablock(bpy.types.PropertyGroup):
'''name = StringProperty() ''' '''name = StringProperty() '''
type_name: bpy.props.StringProperty() type_name: bpy.props.StringProperty()
@ -116,14 +91,12 @@ 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(utils.random_string_digits()), default="user_{}".format(utils.random_string_digits())
update=save_session_config
) )
ip: bpy.props.StringProperty( ip: bpy.props.StringProperty(
name="ip", name="ip",
description='Distant host ip', description='Distant host ip',
default="127.0.0.1", default="127.0.0.1"
update=save_session_config
) )
user_uuid: bpy.props.StringProperty( user_uuid: bpy.props.StringProperty(
name="user_uuid", name="user_uuid",
@ -132,20 +105,25 @@ class SessionProps(bpy.types.PropertyGroup):
port: bpy.props.IntProperty( port: bpy.props.IntProperty(
name="port", name="port",
description='Distant host port', description='Distant host port',
default=5555, default=5555
update=save_session_config
) )
add_property_depth: bpy.props.IntProperty( add_property_depth: bpy.props.IntProperty(
name="add_property_depth", name="add_property_depth",
default=1 default=1
) )
outliner_filter: bpy.props.StringProperty(name="None") outliner_filter: bpy.props.StringProperty(name="None")
is_admin: bpy.props.BoolProperty(name="is_admin", default=False) is_admin: bpy.props.BoolProperty(
init_scene: bpy.props.BoolProperty(name="init_scene", default=True) name="is_admin",
default=False
)
init_scene: bpy.props.BoolProperty(
name="init_scene",
default=True
)
start_empty: bpy.props.BoolProperty( start_empty: bpy.props.BoolProperty(
name="start_empty", name="start_empty",
default=True, default=True
update=save_session_config) )
active_object: bpy.props.PointerProperty( active_object: bpy.props.PointerProperty(
name="active_object", type=bpy.types.Object) name="active_object", type=bpy.types.Object)
session_mode: bpy.props.EnumProperty( session_mode: bpy.props.EnumProperty(
@ -158,8 +136,7 @@ class SessionProps(bpy.types.PropertyGroup):
client_color: bpy.props.FloatVectorProperty( client_color: bpy.props.FloatVectorProperty(
name="client_instance_color", name="client_instance_color",
subtype='COLOR', subtype='COLOR',
default=randomColor(), default=randomColor())
update=save_session_config)
clients: bpy.props.EnumProperty( clients: bpy.props.EnumProperty(
name="clients", name="clients",
description="client enum", description="client enum",
@ -167,8 +144,7 @@ class SessionProps(bpy.types.PropertyGroup):
enable_presence: bpy.props.BoolProperty( enable_presence: bpy.props.BoolProperty(
name="Presence overlay", name="Presence overlay",
description='Enable overlay drawing module', description='Enable overlay drawing module',
default=True, default=True
update=save_session_config
) )
supported_datablock: bpy.props.CollectionProperty( supported_datablock: bpy.props.CollectionProperty(
type=ReplicatedDatablock, type=ReplicatedDatablock,
@ -208,11 +184,13 @@ class SessionProps(bpy.types.PropertyGroup):
rep_value = self.supported_datablock.add() rep_value = self.supported_datablock.add()
rep_value.name = datablock rep_value.name = datablock
rep_value.type_name = datablock rep_value.type_name = datablock
rep_value.bl_delay_refresh = config["supported_types"][datablock]['bl_delay_refresh']
rep_value.bl_delay_apply = config["supported_types"][datablock]['bl_delay_apply'] config_block = config["supported_types"][datablock]
rep_value.icon = config["supported_types"][datablock]['icon'] rep_value.bl_delay_refresh = config_block['bl_delay_refresh']
rep_value.auto_push = config["supported_types"][datablock]['auto_push'] rep_value.bl_delay_apply = config_block['bl_delay_apply']
rep_value.bl_name = config["supported_types"][datablock]['bl_name'] rep_value.icon = config_block['icon']
rep_value.auto_push = config_block['auto_push']
rep_value.bl_name = config_block['bl_name']
def save(self,context): def save(self,context):
config = environment.load_config() config = environment.load_config()
@ -226,12 +204,13 @@ class SessionProps(bpy.types.PropertyGroup):
for bloc in self.supported_datablock: for bloc in self.supported_datablock:
config["supported_types"][bloc.type_name]['bl_delay_refresh'] = bloc.bl_delay_refresh config_block = config["supported_types"][bloc.type_name]
config["supported_types"][bloc.type_name]['bl_delay_apply'] = bloc.bl_delay_apply config_block['bl_delay_refresh'] = bloc.bl_delay_refresh
config["supported_types"][bloc.type_name]['use_as_filter'] = bloc.use_as_filter config_block['bl_delay_apply'] = bloc.bl_delay_apply
config["supported_types"][bloc.type_name]['icon'] = bloc.icon config_block['use_as_filter'] = bloc.use_as_filter
config["supported_types"][bloc.type_name]['auto_push'] = bloc.auto_push config_block['icon'] = bloc.icon
config["supported_types"][bloc.type_name]['bl_name'] = bloc.bl_name config_block['auto_push'] = bloc.auto_push
config_block['bl_name'] = bloc.bl_name
environment.save_config(config) environment.save_config(config)
@ -247,10 +226,6 @@ libs = os.path.dirname(os.path.abspath(__file__))+"\\libs\\replication"
def load_handler(dummy): def load_handler(dummy):
import bpy import bpy
bpy.context.window_manager.session.load() bpy.context.window_manager.session.load()
# Generate ordered replicate types
save_session_config(bpy.context.window_manager.session,bpy.context)
def register(): def register():
if libs not in sys.path: if libs not in sys.path:
@ -267,8 +242,9 @@ def register():
bpy.types.WindowManager.session = bpy.props.PointerProperty( bpy.types.WindowManager.session = bpy.props.PointerProperty(
type=SessionProps) type=SessionProps)
bpy.types.ID.uuid = bpy.props.StringProperty(default="") bpy.types.ID.uuid = bpy.props.StringProperty(default="")
bpy.context.window_manager.session.load() bpy.context.window_manager.session.load()
save_session_config(bpy.context.window_manager.session,bpy.context)
operators.register() operators.register()
ui.register() ui.register()
bpy.app.handlers.load_post.append(load_handler) bpy.app.handlers.load_post.append(load_handler)