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

refactor: move unlock/lock/kick to porcelain

Browse Source
This commit is contained in:
Swann
2021-06-02 11:31:23 +02:00
parent 431fe0d840
commit c9665c4719
3 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
multi_user/libs/replication

Submodule multi_user/libs/replication updated: 15d80abe6d...baa55ea8c4

21
multi_user/operators.py
View File

@ -221,7 +221,12 @@ class SessionStartOperator(bpy.types.Operator):
for scene in bpy.data.scenes: for scene in bpy.data.scenes:
porcelain.add(repo, scene) porcelain.add(repo, scene)
porcelain.remote_add(repo, 'origin','127.0.0.1', settings.port) porcelain.remote_add(
repo,
'origin',
'127.0.0.1',
settings.port,
admin_password=admin_pass)
session.host( session.host(
repository= repo, repository= repo,
remote='origin', remote='origin',
@ -243,7 +248,12 @@ class SessionStartOperator(bpy.types.Operator):
admin_pass = None admin_pass = None
try: try:
porcelain.remote_add(repo, 'origin', settings.ip, settings.port) porcelain.remote_add(
repo,
'origin',
settings.ip,
settings.port,
admin_password=admin_pass)
session.connect( session.connect(
repository= repo, repository= repo,
timeout=settings.connection_timeout, timeout=settings.connection_timeout,
@ -257,10 +267,7 @@ class SessionStartOperator(bpy.types.Operator):
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(
# queue=stagging,
# 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(
@ -365,7 +372,7 @@ class SessionKickOperator(bpy.types.Operator):
assert(session) assert(session)
try: try:
session.kick(self.user) porcelain.kick(session.repository, self.user)
except Exception as e: except Exception as e:
self.report({'ERROR'}, repr(e)) self.report({'ERROR'}, repr(e))

45
multi_user/timers.py
View File

@ -161,11 +161,10 @@ class DynamicRightSelectTimer(Timer):
self._annotating = True self._annotating = True
logging.debug( logging.debug(
"Getting the right on the annotation GP") "Getting the right on the annotation GP")
session.change_owner( porcelain.lock(session.repository,
registered_gp.uuid, registered_gp.uuid,
settings.username, ignore_warnings=True,
ignore_warnings=True, affect_dependencies=False)
affect_dependencies=False)
if registered_gp.owner == settings.username: if registered_gp.owner == settings.username:
gp_node = session.repository.get_node(annotation_gp.uuid) gp_node = session.repository.get_node(annotation_gp.uuid)
@ -173,11 +172,10 @@ class DynamicRightSelectTimer(Timer):
porcelain.push(session.repository, 'origin', gp_node.uuid) porcelain.push(session.repository, 'origin', gp_node.uuid)
elif self._annotating: elif self._annotating:
session.change_owner( porcelain.unlock(session.repository,
registered_gp.uuid, registered_gp.uuid,
RP_COMMON, ignore_warnings=True,
ignore_warnings=True, affect_dependencies=False)
affect_dependencies=False)
current_selection = utils.get_selected_objects( current_selection = utils.get_selected_objects(
bpy.context.scene, bpy.context.scene,
@ -198,11 +196,10 @@ class DynamicRightSelectTimer(Timer):
if node.data and 'instance_type' in node.data.keys(): if node.data and 'instance_type' in node.data.keys():
recursive = node.data['instance_type'] != 'COLLECTION' recursive = node.data['instance_type'] != 'COLLECTION'
try: try:
session.change_owner( porcelain.unlock(session.repository,
node.uuid, node.uuid,
RP_COMMON, ignore_warnings=True,
ignore_warnings=True, affect_dependencies=recursive)
affect_dependencies=recursive)
except NonAuthorizedOperationError: except NonAuthorizedOperationError:
logging.warning( logging.warning(
f"Not authorized to change {node} owner") f"Not authorized to change {node} owner")
@ -217,11 +214,10 @@ class DynamicRightSelectTimer(Timer):
recursive = node.data['instance_type'] != 'COLLECTION' recursive = node.data['instance_type'] != 'COLLECTION'
try: try:
session.change_owner( porcelain.lock(session.repository,
node.uuid, node.uuid,
settings.username, ignore_warnings=True,
ignore_warnings=True, affect_dependencies=recursive)
affect_dependencies=recursive)
except NonAuthorizedOperationError: except NonAuthorizedOperationError:
logging.warning( logging.warning(
f"Not authorized to change {node} owner") f"Not authorized to change {node} owner")
@ -244,11 +240,10 @@ class DynamicRightSelectTimer(Timer):
for key in owned_keys: for key in owned_keys:
node = session.repository.get_node(key) node = session.repository.get_node(key)
try: try:
session.change_owner( porcelain.unlock(session.repository,
key, key,
RP_COMMON, ignore_warnings=True,
ignore_warnings=True, affect_dependencies=recursive)
affect_dependencies=recursive)
except NonAuthorizedOperationError: except NonAuthorizedOperationError:
logging.warning( logging.warning(
f"Not authorized to change {key} owner") f"Not authorized to change {key} owner")