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

refactor: add remote

Browse Source 
refactor: move push to porcelain
This commit is contained in:
Swann
2021-05-18 16:54:07 +02:00
parent 36c3a9ab0b
commit acd70f73bf
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
multi_user/libs/replication

Submodule multi_user/libs/replication updated: f9659b49fe...d8c51f421b

22
multi_user/operators.py
View File

@ -213,8 +213,10 @@ class SessionStartOperator(bpy.types.Operator):
else: else:
python_binary_path = bpy.app.binary_path_python python_binary_path = bpy.app.binary_path_python
repo = Repository(data_protocol=bpy_protocol) repo = Repository(
data_protocol=bpy_protocol,
username=settings.username)
# Host a session # Host a session
if self.host: if self.host:
if settings.init_method == 'EMPTY': if settings.init_method == 'EMPTY':
@ -228,10 +230,10 @@ 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)
session.host( session.host(
repository= repo, repository= repo,
id=settings.username, remote='origin',
port=settings.port,
timeout=settings.connection_timeout, timeout=settings.connection_timeout,
password=admin_pass, password=admin_pass,
cache_directory=settings.cache_directory, cache_directory=settings.cache_directory,
@ -250,11 +252,9 @@ class SessionStartOperator(bpy.types.Operator):
admin_pass = None admin_pass = None
try: try:
porcelain.remote_add(repo, 'origin', settings.ip, settings.port)
session.connect( session.connect(
repository= repo, repository= repo,
id=settings.username,
address=settings.ip,
port=settings.port,
timeout=settings.connection_timeout, timeout=settings.connection_timeout,
password=admin_pass password=admin_pass
) )
@ -631,7 +631,7 @@ class SessionCommit(bpy.types.Operator):
def execute(self, context): def execute(self, context):
try: try:
porcelain.commit(session.repository, self.target) porcelain.commit(session.repository, self.target)
session.push(self.target) porcelain.push(session.repository, 'origin', self.target)
return {"FINISHED"} return {"FINISHED"}
except Exception as e: except Exception as e:
self.report({'ERROR'}, repr(e)) self.report({'ERROR'}, repr(e))
@ -927,7 +927,7 @@ def update_external_dependencies():
node = session.repository.get_node(node_id) node = session.repository.get_node(node_id)
if node and node.owner in [session.id, RP_COMMON]: if node and node.owner in [session.id, RP_COMMON]:
porcelain.commit(session.repository, node_id) porcelain.commit(session.repository, node_id)
session.push(node_id, check_data=False) porcelain.push(session.repository,'origin', node_id)
def sanitize_deps_graph(remove_nodes: bool = False): def sanitize_deps_graph(remove_nodes: bool = False):
""" Cleanup the replication graph """ Cleanup the replication graph
@ -999,7 +999,7 @@ def depsgraph_evaluation(scene):
if node.state == UP: if node.state == UP:
try: try:
porcelain.commit(session.repository, node.uuid) porcelain.commit(session.repository, node.uuid)
session.push(node.uuid, check_data=False) porcelain.push(session.repository, 'origin', node.uuid)
except ReferenceError: except ReferenceError:
logging.debug(f"Reference error {node.uuid}") logging.debug(f"Reference error {node.uuid}")
if not node.is_valid(): if not node.is_valid():
@ -1018,7 +1018,7 @@ def depsgraph_evaluation(scene):
else: else:
scn_uuid = porcelain.add(session.repository, update.id) scn_uuid = porcelain.add(session.repository, update.id)
porcelain.commit(session.node_id, scn_uuid) porcelain.commit(session.node_id, scn_uuid)
session.push(scn_uuid, check_data=False) porcelain.push(session.repository,'origin', scn_uuid)
def register(): def register():
from bpy.utils import register_class from bpy.utils import register_class

2
multi_user/timers.py
View File

@ -170,7 +170,7 @@ class DynamicRightSelectTimer(Timer):
gp_node = session.repository.get_node(annotation_gp.uuid) gp_node = session.repository.get_node(annotation_gp.uuid)
if gp_node.has_changed(): if gp_node.has_changed():
porcelain.commit(session.repository, gp_node.uuid) porcelain.commit(session.repository, gp_node.uuid)
session.push(gp_node.uuid, check_data=False) porcelain.push(session.repository, 'origin', gp_node.uuid)
elif self._annotating: elif self._annotating:
session.change_owner( session.change_owner(