refactor: cleanup progression

multi_user/bl_types/bl_action.py

@@ -15,10 +15,10 @@ class BlAction(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'ACTION_TWEAK'
     
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.actions.new(data["name"])
 
-    def load(self, data, target):
+    def _load(self, data, target):
         begin_frame = 100000
         end_frame = -100000
 
@@ -90,7 +90,7 @@ class BlAction(BlDatablock):
                 target.fcurves.remove(fcurve)
         target.id_root= data['id_root']
 
-    def dump(self, pointer=None):
+    def _dump(self, pointer=None):
         assert(pointer)
         dumper = utils.dump_anything.Dumper()
         dumper.exclude_filter =[

multi_user/bl_types/bl_armature.py

@@ -17,7 +17,7 @@ class BlArmature(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'ARMATURE_DATA'
     
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.armatures.new(data["name"])
 
     def load_implementation(self, data, target):

multi_user/bl_types/bl_camera.py

@@ -22,7 +22,7 @@ class BlCamera(BlDatablock):
         if dof_settings:
             utils.dump_anything.load(target.dof, dof_settings)
 
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.cameras.new(data["name"])
 
     def dump_implementation(self, data, pointer=None):

multi_user/bl_types/bl_collection.py

@@ -13,7 +13,7 @@ class BlCollection(BlDatablock):
     bl_delay_apply = 1
     bl_automatic_push = True
 
-    def construct(self, data):
+    def _construct(self, data):
         if self.is_library:
             with bpy.data.libraries.load(filepath=bpy.data.libraries[self.data['library']].filepath, link=True) as (sourceData, targetData):
                 targetData.collections = [
@@ -28,7 +28,7 @@ class BlCollection(BlDatablock):
         instance.uuid = self.uuid
         return instance
 
-    def load(self, data, target):
+    def load_implementation(self, data, target):
         # Load other meshes metadata
         # dump_anything.load(target, data)
         target.name = data["name"]

multi_user/bl_types/bl_curve.py

@@ -15,7 +15,7 @@ class BlCurve(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'CURVE_DATA'
 
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.curves.new(data["name"], data["type"])
 
     def load_implementation(self, data, target):

multi_user/bl_types/bl_datablock.py

@@ -61,7 +61,6 @@ class BlDatablock(ReplicatedDatablock):
         bl_automatic_push : boolean
         bl_icon :           type icon (blender icon name) 
     """
-    bl_id = "scenes"
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -77,7 +76,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)
@@ -92,7 +91,7 @@ class BlDatablock(ReplicatedDatablock):
 
         self.pointer = datablock_ref
 
-    def dump(self, pointer=None):
+    def _dump(self, pointer=None):
         data = {}
         # Dump animation data
         if utils.has_action(pointer):
@@ -118,7 +117,7 @@ class BlDatablock(ReplicatedDatablock):
     def dump_implementation(self, data, target):
         raise NotImplementedError
 
-    def load(self, data, target):
+    def _load(self, data, target):
         # Load animation data
         if 'animation_data' in data.keys():
             if target.animation_data is None:
@@ -150,7 +149,7 @@ class BlDatablock(ReplicatedDatablock):
 
         if not self.is_library:
             dependencies.extend(self.resolve_deps_implementation())
-        print(dependencies)  
+
         return dependencies
 
     def resolve_deps_implementation(self):

multi_user/bl_types/bl_gpencil.py

@@ -40,7 +40,7 @@ class BlGpencil(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'GREASEPENCIL'
 
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.grease_pencils.new(data["name"])
 
     def load_implementation(self, data, target):

multi_user/bl_types/bl_image.py

@@ -35,14 +35,14 @@ class BlImage(BlDatablock):
     bl_automatic_push = False
     bl_icon = 'IMAGE_DATA'
 
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.images.new(
                 name=data['name'],
                 width=data['size'][0],
                 height=data['size'][1]
             )
 
-    def load(self, data, target):
+    def _load(self, data, target):
         image = target
         prefs = utils.get_preferences()
 
@@ -59,7 +59,7 @@ class BlImage(BlDatablock):
         image.colorspace_settings.name = data["colorspace_settings"]["name"]
 
 
-    def dump(self, data, pointer=None):
+    def _dump(self, data, pointer=None):
         assert(pointer)
         data = {}
         data['pixels'] = dump_image(pointer)

multi_user/bl_types/bl_lattice.py

@@ -18,7 +18,7 @@ class BlLattice(BlDatablock):
 
         for point in data['points']:
             utils.dump_anything.load(target.points[point], data["points"][point])
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.lattices.new(data["name"])
 
     def dump_implementation(self, data, pointer=None):

multi_user/bl_types/bl_library.py

@@ -13,11 +13,11 @@ class BlLibrary(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'LIBRARY_DATA_DIRECT'
 
-    def construct(self, data):
+    def _construct(self, data):
         with bpy.data.libraries.load(filepath=data["filepath"], link=True) as (sourceData, targetData):
             targetData = sourceData
             return sourceData
-    def load(self, data, target):
+    def _load(self, data, target):
         pass
 
     def dump(self, pointer=None):

multi_user/bl_types/bl_light.py

@@ -13,10 +13,10 @@ class BlLight(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'LIGHT_DATA'
 
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.lights.new(data["name"], data["type"])
 
-    def load(self, data, target):
+    def load_implementation(self, data, target):
         utils.dump_anything.load(target, data)
 
     def dump_implementation(self, data, pointer=None):

multi_user/bl_types/bl_lightprobe.py

@@ -18,7 +18,7 @@ class BlLightprobe(BlDatablock):
     def load_implementation(self, data, target):
         utils.dump_anything.load(target, data)
 
-    def construct(self, data):
+    def _construct(self, data):
         type = 'CUBE' if data['type'] == 'CUBEMAP' else data['type']
         # See https://developer.blender.org/D6396
         if bpy.app.version[1] >= 83:

multi_user/bl_types/bl_material.py

@@ -76,7 +76,7 @@ class BlMaterial(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'MATERIAL_DATA'
 
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.materials.new(data["name"])
 
     def load_implementation(self, data, target):

multi_user/bl_types/bl_mesh.py

@@ -86,7 +86,7 @@ class BlMesh(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'MESH_DATA'
 
-    def construct(self, data):
+    def _construct(self, data):
         instance = bpy.data.meshes.new(data["name"])
         instance.uuid = self.uuid
         return instance

multi_user/bl_types/bl_metaball.py

@@ -13,7 +13,7 @@ class BlMetaball(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'META_BALL'
 
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.metaballs.new(data["name"])
 
     def load(self, data, target):

multi_user/bl_types/bl_object.py

@@ -38,7 +38,7 @@ class BlObject(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'OBJECT_DATA'
 
-    def construct(self, data):
+    def _construct(self, data):
         pointer = None
 
         if self.is_library:

multi_user/bl_types/bl_scene.py

@@ -12,12 +12,12 @@ class BlScene(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'SCENE_DATA'
 
-    def construct(self, data):
+    def _construct(self, data):
         instance = bpy.data.scenes.new(data["name"])
         instance.uuid = self.uuid
         return instance
 
-    def load(self, data, target):
+    def load_implementation(self, data, target):
         target = self.pointer
         # Load other meshes metadata
         utils.dump_anything.load(target, data)

multi_user/bl_types/bl_speaker.py

@@ -16,7 +16,7 @@ class BlSpeaker(BlDatablock):
     def load_implementation(self, data, target):
         utils.dump_anything.load(target, data)
 
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.speakers.new(data["name"])
 
     def dump_implementation(self, data, pointer=None):

multi_user/bl_types/bl_world.py

@@ -14,10 +14,10 @@ class BlWorld(BlDatablock):
     bl_automatic_push = True
     bl_icon = 'WORLD_DATA'
 
-    def construct(self, data):
+    def _construct(self, data):
         return bpy.data.worlds.new(data["name"])
 
-    def load(self, data, target):
+    def load_implementation(self, data, target):
         if data["use_nodes"]:
             if target.node_tree is None:
                 target.use_nodes = True
@@ -101,6 +101,3 @@ class BlWorld(BlDatablock):
             deps.append(self.pointer.library)
         return deps
 
-    def is_valid(self):
-        return bpy.data.worlds.get(self.data['name'])
-