From 01faa94a9a369641f809f337ec5be01a14bcd767 Mon Sep 17 00:00:00 2001 From: Swann Date: Mon, 23 Mar 2020 15:29:34 +0100 Subject: [PATCH] fix: resolve error --- multi_user/bl_types/bl_datablock.py | 2 +- multi_user/bl_types/bl_object.py | 2 +- multi_user/libs/dump_anything.py | 10 +++++----- multi_user/operators.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/multi_user/bl_types/bl_datablock.py b/multi_user/bl_types/bl_datablock.py index a645488..3a5d8b3 100644 --- a/multi_user/bl_types/bl_datablock.py +++ b/multi_user/bl_types/bl_datablock.py @@ -94,7 +94,7 @@ class BlDatablock(ReplicatedDatablock): self.diff_method = DIFF_BINARY - def resolve(self): + def _resolve(self): datablock_ref = None datablock_root = getattr(bpy.data, self.bl_id) datablock_ref = utils.find_from_attr('uuid', self.uuid, datablock_root) diff --git a/multi_user/bl_types/bl_object.py b/multi_user/bl_types/bl_object.py index 0387a65..2abb6ad 100644 --- a/multi_user/bl_types/bl_object.py +++ b/multi_user/bl_types/bl_object.py @@ -52,7 +52,7 @@ class BlObject(BlDatablock): instance.uuid = self.uuid return instance - # Object specific constructor... + # TODO: refactoring if "data" not in data: pass elif data["data"] in bpy.data.meshes.keys(): diff --git a/multi_user/libs/dump_anything.py b/multi_user/libs/dump_anything.py index bd72dea..051e0e9 100644 --- a/multi_user/libs/dump_anything.py +++ b/multi_user/libs/dump_anything.py @@ -196,7 +196,7 @@ class Dumper: return False getattr(default, p) except AttributeError as err: - logger.error(err) + logger.debug(err) return False if p.startswith("__"): return False @@ -306,7 +306,7 @@ class Loader: for i in range(len(dump)): element.read()[i] = dump[i] except AttributeError as err: - logger.error(err) + logger.debug(err) if not self.occlude_read_only: raise err @@ -340,7 +340,7 @@ class Loader: constructor_parameters = [dumped_element[name] for name in constructor[1]] except KeyError: - logger.error("Collection load error, missing parameters.") + logger.debug("Collection load error, missing parameters.") continue # TODO handle error new_element = getattr(element.read(), constructor[0])( *constructor_parameters) @@ -397,11 +397,11 @@ class Loader: for k in self._ordered_keys(dump.keys()): v = dump[k] if not hasattr(default.read(), k): - logger.error(f"Load default, skipping {default} : {k}") + logger.debug(f"Load default, skipping {default} : {k}") try: self._load_any(default.extend(k), v) except Exception as err: - logger.error(f"Cannot load {k}: {err}") + logger.debug(f"Cannot load {k}: {err}") @property def match_subset_all(self): diff --git a/multi_user/operators.py b/multi_user/operators.py index 22ac9cb..1d302c1 100644 --- a/multi_user/operators.py +++ b/multi_user/operators.py @@ -488,7 +488,7 @@ def sanitize_deps_graph(dummy): if client and client.state['STATE'] in [STATE_ACTIVE]: for node_key in client.list(): - client.get(node_key).resolve() + client.get(node_key)._resolve() @persistent