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

refactor: porcail api

Browse Source
This commit is contained in:
Swann
2021-04-22 10:04:38 +02:00
parent 0e73af4d49
commit 93d50ac56b
1 changed files with 70 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
multi_user/operators.py
View File

@ -59,6 +59,7 @@ background_execution_queue = Queue()
deleyables = [] deleyables = []
stop_modal_executor = False stop_modal_executor = False
def session_callback(name): def session_callback(name):
""" Session callback wrapper """ Session callback wrapper
@ -140,7 +141,8 @@ def on_connection_end(reason="none"):
if isinstance(handler, logging.FileHandler): if isinstance(handler, logging.FileHandler):
logger.removeHandler(handler) logger.removeHandler(handler)
if reason != "user": if reason != "user":
bpy.ops.session.notify('INVOKE_DEFAULT', message=f"Disconnected from session. Reason: {reason}. ") bpy.ops.session.notify(
'INVOKE_DEFAULT', message=f"Disconnected from session. Reason: {reason}. ")
# OPERATORS # OPERATORS
@ -205,78 +207,61 @@ class SessionStartOperator(bpy.types.Operator):
else: else:
python_binary_path = bpy.app.binary_path_python python_binary_path = bpy.app.binary_path_python
# Host a session # HOST
if self.host: if self.host:
if settings.init_method == 'EMPTY': if settings.init_method == 'EMPTY':
utils.clean_scene() utils.clean_scene()
try: # Start the server locally
server = porcelain.serve(port=settings.port,
timeout=settings.connection_timeout,
admin_password=admin_pass,
log_directory=settings.cache_directory)
# Init repository # Init repository
repo = porcelain.init(bare=False,
data_protocol=bpy_protocol)
# Add the existing scenes
for scene in bpy.data.scenes: for scene in bpy.data.scenes:
porcelain.add(repo, scene) porcelain.add(repo, scene)
# Create an empty repository porcelain.remote_add(repo,
repo = Repository( 'server',
data_protocol=bpy_protocol) '127.0.0.1',
settings.port)
session.host( porcelain.sync(repo, 'server')
repository= repo, porcelain.push(repo, 'server')
id=settings.username, # JOIN
port=settings.port,
timeout=settings.connection_timeout,
password=admin_pass,
cache_directory=settings.cache_directory,
server_log_level=logging.getLevelName(
logging.getLogger().level),
)
except Exception as e:
self.report({'ERROR'}, repr(e))
logging.error(f"Error: {e}")
traceback.print_exc()
# Join a session
else: else:
if not runtime_settings.admin:
utils.clean_scene() utils.clean_scene()
# regular session, no password needed
admin_pass = None
try: repo = porcelain.clone(settings.ip, settings.ip)
session.connect(
repository= repo,
id=settings.username,
address=settings.ip,
port=settings.port,
timeout=settings.connection_timeout,
password=admin_pass
)
except Exception as e:
self.report({'ERROR'}, str(e))
logging.error(str(e))
# Background client updates service # Background client updates service
deleyables.append(timers.ClientUpdate()) # deleyables.append(timers.ClientUpdate())
deleyables.append(timers.DynamicRightSelectTimer()) # deleyables.append(timers.DynamicRightSelectTimer())
deleyables.append(timers.ApplyTimer(timeout=settings.depsgraph_update_rate)) # deleyables.append(timers.ApplyTimer(
# timeout=settings.depsgraph_update_rate))
# deleyables.append(timers.PushTimer( # deleyables.append(timers.PushTimer(
# queue=stagging, # queue=stagging,
# timeout=settings.depsgraph_update_rate # timeout=settings.depsgraph_update_rate
# )) # ))
session_update = timers.SessionStatusUpdate() # session_update = timers.SessionStatusUpdate()
session_user_sync = timers.SessionUserSync() # session_user_sync = timers.SessionUserSync()
session_background_executor = timers.MainThreadExecutor( # session_background_executor = timers.MainThreadExecutor(
execution_queue=background_execution_queue) # execution_queue=background_execution_queue)
session_listen = timers.SessionListenTimer(timeout=0.001) # session_listen = timers.SessionListenTimer(timeout=0.001)
session_listen.register() # session_listen.register()
session_update.register() # session_update.register()
session_user_sync.register() # session_user_sync.register()
session_background_executor.register() # session_background_executor.register()
deleyables.append(session_background_executor)
deleyables.append(session_update)
deleyables.append(session_user_sync)
deleyables.append(session_listen)
# deleyables.append(session_background_executor)
# deleyables.append(session_update)
# deleyables.append(session_user_sync)
# deleyables.append(session_listen)
self.report( self.report(
{'INFO'}, {'INFO'},
@ -628,6 +613,7 @@ class SessionCommit(bpy.types.Operator):
self.report({'ERROR'}, repr(e)) self.report({'ERROR'}, repr(e))
return {"CANCELED"} return {"CANCELED"}
class ApplyArmatureOperator(bpy.types.Operator): class ApplyArmatureOperator(bpy.types.Operator):
"""Operator which runs its self from a timer""" """Operator which runs its self from a timer"""
bl_idname = "session.apply_armature_operator" bl_idname = "session.apply_armature_operator"
@ -699,6 +685,7 @@ class SessionClearCache(bpy.types.Operator):
row = self.layout row = self.layout
row.label(text=f" Do you really want to remove local cache ? ") row.label(text=f" Do you really want to remove local cache ? ")
class SessionPurgeOperator(bpy.types.Operator): class SessionPurgeOperator(bpy.types.Operator):
"Remove node with lost references" "Remove node with lost references"
bl_idname = "session.purge" bl_idname = "session.purge"
@ -743,7 +730,6 @@ class SessionNotifyOperator(bpy.types.Operator):
layout = self.layout layout = self.layout
layout.row().label(text=self.message) layout.row().label(text=self.message)
def invoke(self, context, event): def invoke(self, context, event):
return context.window_manager.invoke_props_dialog(self) return context.window_manager.invoke_props_dialog(self)
@ -789,6 +775,7 @@ class SessionSaveBackupOperator(bpy.types.Operator, ExportHelper):
def poll(cls, context): def poll(cls, context):
return session.state == STATE_ACTIVE return session.state == STATE_ACTIVE
class SessionStopAutoSaveOperator(bpy.types.Operator): class SessionStopAutoSaveOperator(bpy.types.Operator):
bl_idname = "session.cancel_autosave" bl_idname = "session.cancel_autosave"
bl_label = "Cancel auto-save" bl_label = "Cancel auto-save"
@ -836,8 +823,6 @@ class SessionLoadSaveOperator(bpy.types.Operator, ImportHelper):
logging.info(f"{len(nodes)} Nodes to load") logging.info(f"{len(nodes)} Nodes to load")
# init the factory with supported types # init the factory with supported types
bpy_protocol = DataTranslationProtocol() bpy_protocol = DataTranslationProtocol()
for type in io_bpy.types_to_register(): for type in io_bpy.types_to_register():
@ -846,7 +831,6 @@ class SessionLoadSaveOperator(bpy.types.Operator, ImportHelper):
type_impl_name = 'Bl'+''.join(name) type_impl_name = 'Bl'+''.join(name)
type_module_class = getattr(type_module, type_impl_name) type_module_class = getattr(type_module, type_impl_name)
bpy_protocol.register_type( bpy_protocol.register_type(
type_module_class.bl_class, type_module_class.bl_class,
type_module_class) type_module_class)
@ -879,15 +863,16 @@ class SessionLoadSaveOperator(bpy.types.Operator, ImportHelper):
for node in graph.list_ordered(): for node in graph.list_ordered():
graph[node].apply() graph[node].apply()
return {'FINISHED'} return {'FINISHED'}
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
return True return True
def menu_func_import(self, context): def menu_func_import(self, context):
self.layout.operator(SessionLoadSaveOperator.bl_idname, text='Multi-user session snapshot (.db)') self.layout.operator(SessionLoadSaveOperator.bl_idname,
text='Multi-user session snapshot (.db)')
classes = ( classes = (
@ -910,6 +895,7 @@ classes = (
SessionPurgeOperator, SessionPurgeOperator,
) )
def update_external_dependencies(): def update_external_dependencies():
nodes_ids = session.list(filter=io_bpy.bl_file.BlFile) nodes_ids = session.list(filter=io_bpy.bl_file.BlFile)
for node_id in nodes_ids: for node_id in nodes_ids:
@ -919,6 +905,7 @@ def update_external_dependencies():
porcelain.commit(session.repository, node_id) porcelain.commit(session.repository, node_id)
session.push(node_id, check_data=False) session.push(node_id, check_data=False)
def sanitize_deps_graph(remove_nodes: bool = False): def sanitize_deps_graph(remove_nodes: bool = False):
""" Cleanup the replication graph """ Cleanup the replication graph
""" """
@ -950,6 +937,7 @@ def resolve_deps_graph(dummy):
if session and session.state == STATE_ACTIVE: if session and session.state == STATE_ACTIVE:
sanitize_deps_graph(remove_nodes=True) sanitize_deps_graph(remove_nodes=True)
@persistent @persistent
def load_pre_handler(dummy): def load_pre_handler(dummy):
if session and session.state in [STATE_ACTIVE, STATE_SYNCING]: if session and session.state in [STATE_ACTIVE, STATE_SYNCING]:
@ -1008,13 +996,14 @@ def depsgraph_evaluation(scene):
scn_uuid = porcelain.add(session.repository, update.id) scn_uuid = porcelain.add(session.repository, update.id)
porcelain.commit(session.repository, scn_uuid) porcelain.commit(session.repository, scn_uuid)
porcelain.push(session.repository) porcelain.push(session.repository)
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.undo_post.append(resolve_deps_graph) bpy.app.handlers.undo_post.append(resolve_deps_graph)
bpy.app.handlers.redo_post.append(resolve_deps_graph) bpy.app.handlers.redo_post.append(resolve_deps_graph)