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

refacor: code formating

Browse Source
This commit is contained in:
Swann 2021-05-20 09:57:44 +02:00
parent 8ebba80b97
commit 8d5c8aded3
No known key found for this signature in database
GPG Key ID: E1D3641A7C43AACB
2 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
multi_user/bl_types/bl_scene.py
View File

@ -19,21 +19,22 @@
import logging import logging
from pathlib import Path from pathlib import Path
from uuid import uuid4 from uuid import uuid4
import bpy import bpy
import mathutils import mathutils
from deepdiff import DeepDiff, Delta from deepdiff import DeepDiff, Delta
from replication.constants import DIFF_JSON, MODIFIED from replication.constants import DIFF_JSON, MODIFIED
from replication.protocol import ReplicatedDatablock
from ..utils import flush_history from ..utils import flush_history, get_preferences
from .bl_action import (dump_animation_data, load_animation_data,
resolve_animation_dependencies)
from .bl_collection import (dump_collection_children, dump_collection_objects, from .bl_collection import (dump_collection_children, dump_collection_objects,
load_collection_childrens, load_collection_objects, load_collection_childrens, load_collection_objects,
resolve_collection_dependencies) resolve_collection_dependencies)
from replication.protocol import ReplicatedDatablock
from .bl_file import get_filepath
from .bl_action import dump_animation_data, load_animation_data, resolve_animation_dependencies
from .dump_anything import Dumper, Loader
from ..utils import get_preferences
from .bl_datablock import resolve_datablock_from_uuid from .bl_datablock import resolve_datablock_from_uuid
from .bl_file import get_filepath
from .dump_anything import Dumper, Loader
RENDER_SETTINGS = [ RENDER_SETTINGS = [
'dither_intensity', 'dither_intensity',
@ -289,12 +290,10 @@ def dump_sequence(sequence: bpy.types.Sequence) -> dict:
dumper.depth = 1 dumper.depth = 1
data = dumper.dump(sequence) data = dumper.dump(sequence)
# TODO: Support multiple images # TODO: Support multiple images
if sequence.type == 'IMAGE': if sequence.type == 'IMAGE':
data['filenames'] = [e.filename for e in sequence.elements] data['filenames'] = [e.filename for e in sequence.elements]
# Effect strip inputs # Effect strip inputs
input_count = getattr(sequence, 'input_count', None) input_count = getattr(sequence, 'input_count', None)
if input_count: if input_count:
@ -305,7 +304,8 @@ def dump_sequence(sequence: bpy.types.Sequence) -> dict:
return data return data
def load_sequence(sequence_data: dict, sequence_editor: bpy.types.SequenceEditor): def load_sequence(sequence_data: dict,
sequence_editor: bpy.types.SequenceEditor):
""" Load sequence from dumped data """ Load sequence from dumped data
:arg sequence_data: sequence to dump :arg sequence_data: sequence to dump
@ -347,14 +347,15 @@ def load_sequence(sequence_data: dict, sequence_editor: bpy.types.SequenceEditor
strip_channel, strip_channel,
strip_frame_start) strip_frame_start)
# load other images # load other images
if len(images_name)>1: if len(images_name) > 1:
for img_idx in range(1,len(images_name)): for img_idx in range(1, len(images_name)):
sequence.elements.append((images_name[img_idx])) sequence.elements.append((images_name[img_idx]))
else: else:
seq = {} seq = {}
for i in range(sequence_data['input_count']): for i in range(sequence_data['input_count']):
seq[f"seq{i+1}"] = sequence_editor.sequences_all.get(sequence_data.get(f"input_{i+1}", None)) seq[f"seq{i+1}"] = sequence_editor.sequences_all.get(
sequence_data.get(f"input_{i+1}", None))
sequence = sequence_editor.sequences.new_effect(name=strip_name, sequence = sequence_editor.sequences.new_effect(name=strip_name,
type=strip_type, type=strip_type,
@ -364,8 +365,8 @@ def load_sequence(sequence_data: dict, sequence_editor: bpy.types.SequenceEditor
**seq) **seq)
loader = Loader() loader = Loader()
# TODO: Support filepath updates
loader.exclure_filter = ['filepath', 'sound', 'filenames','fps'] loader.exclure_filter = ['filepath', 'sound', 'filenames', 'fps']
loader.load(sequence, sequence_data) loader.load(sequence, sequence_data)
sequence.select = False sequence.select = False
@ -414,15 +415,14 @@ class BlScene(ReplicatedDatablock):
if 'render' in data.keys(): if 'render' in data.keys():
loader.load(datablock.render, data['render']) loader.load(datablock.render, data['render'])
if 'view_settings' in data.keys(): view_settings = data.get('view_settings')
loader.load(datablock.view_settings, data['view_settings']) if view_settings:
loader.load(datablock.view_settings, view_settings)
if datablock.view_settings.use_curve_mapping and \ if datablock.view_settings.use_curve_mapping and \
'curve_mapping' in data['view_settings']: 'curve_mapping' in view_settings:
# TODO: change this ugly fix # TODO: change this ugly fix
datablock.view_settings.curve_mapping.white_level = data[ datablock.view_settings.curve_mapping.white_level = view_settings['curve_mapping']['white_level']
'view_settings']['curve_mapping']['white_level'] datablock.view_settings.curve_mapping.black_level = view_settings['curve_mapping']['black_level']
datablock.view_settings.curve_mapping.black_level = data[
'view_settings']['curve_mapping']['black_level']
datablock.view_settings.curve_mapping.update() datablock.view_settings.curve_mapping.update()
# Sequencer # Sequencer
@ -438,7 +438,7 @@ class BlScene(ReplicatedDatablock):
if seq.name not in sequences: if seq.name not in sequences:
vse.sequences.remove(seq) vse.sequences.remove(seq)
# Load existing sequences # Load existing sequences
for seq_name, seq_data in sequences.items(): for seq_data in sequences.value():
load_sequence(seq_data, vse) load_sequence(seq_data, vse)
# If the sequence is no longer used, clear it # If the sequence is no longer used, clear it
elif datablock.sequence_editor and not sequences: elif datablock.sequence_editor and not sequences:
@ -516,7 +516,6 @@ class BlScene(ReplicatedDatablock):
dumped_sequences[seq.name] = dump_sequence(seq) dumped_sequences[seq.name] = dump_sequence(seq)
data['sequences'] = dumped_sequences data['sequences'] = dumped_sequences
return data return data
@staticmethod @staticmethod
@ -563,7 +562,7 @@ class BlScene(ReplicatedDatablock):
return datablock return datablock
@staticmethod @staticmethod
def compute_delta(last_data:dict, current_data: dict)-> Delta: def compute_delta(last_data: dict, current_data: dict) -> Delta:
exclude_path = [] exclude_path = []
if not get_preferences().sync_flags.sync_render_settings: if not get_preferences().sync_flags.sync_render_settings:
@ -576,15 +575,20 @@ class BlScene(ReplicatedDatablock):
exclude_path.append("root['camera']") exclude_path.append("root['camera']")
diff_params = { diff_params = {
'exclude_paths':exclude_path, 'exclude_paths': exclude_path,
'ignore_order':True, 'ignore_order': True,
'report_repetition':True 'report_repetition': True
} }
delta_params = { delta_params = {
'mutate':True 'mutate': True
} }
return Delta(DeepDiff(last_data, current_data, cache_size=5000,**diff_params), **delta_params) return Delta(
DeepDiff(last_data,
current_data,
cache_size=5000,
**diff_params),
**delta_params)
_type = bpy.types.Scene _type = bpy.types.Scene

2
multi_user/libs/replication

@ -1 +1 @@
Subproject commit 919acd77ca625cafc9998698a39182825bcc5e02 Subproject commit 196366cdab4fd10bdc3de0200d450d43721cdc9a