refactor: move unlock/lock/kick to porcelain
This commit is contained in:
Submodule multi_user/libs/replication updated: 15d80abe6d...baa55ea8c4
@ -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))
|
||||||
|
|
||||||
|
@ -161,9 +161,8 @@ 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)
|
||||||
|
|
||||||
@ -173,9 +172,8 @@ 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)
|
||||||
|
|
||||||
@ -198,9 +196,8 @@ 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:
|
||||||
@ -217,9 +214,8 @@ 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:
|
||||||
@ -244,9 +240,8 @@ 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:
|
||||||
|
Reference in New Issue
Block a user