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

feat: image autosave

Browse Source
This commit is contained in:
Swann
2020-12-09 18:35:29 +01:00
parent affab2414c
commit 6e2d36cd00
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
multi_user/bl_types/bl_image.py
View File

@ -51,7 +51,7 @@ format_to_ext = {
class BlImage(BlDatablock): class BlImage(BlDatablock):
bl_id = "images" bl_id = "images"
bl_class = bpy.types.Image bl_class = bpy.types.Image
bl_delay_refresh = 1 bl_delay_refresh = 2
bl_delay_apply = 1 bl_delay_apply = 1
bl_automatic_push = True bl_automatic_push = True
bl_check_common = False bl_check_common = False
@ -96,6 +96,9 @@ class BlImage(BlDatablock):
return data return data
def diff(self): def diff(self):
if self.instance.is_dirty:
self.instance.save()
if self.instance and (self.instance.name != self.data['name']): if self.instance and (self.instance.name != self.data['name']):
return True return True
else: else:

31
multi_user/operators.py
View File

@ -42,7 +42,7 @@ from . import bl_types, delayable, environment, ui, utils
from .presence import SessionStatusWidget, renderer, view3d_find from .presence import SessionStatusWidget, renderer, view3d_find
background_execution_queue = Queue() background_execution_queue = Queue()
delayables = [] deleyables = []
stop_modal_executor = False stop_modal_executor = False
@ -80,7 +80,7 @@ def initialize_session():
node_ref.apply() node_ref.apply()
# Step 4: Register blender timers # Step 4: Register blender timers
for d in delayables: for d in deleyables:
d.register() d.register()
if settings.update_method == 'DEPSGRAPH': if settings.update_method == 'DEPSGRAPH':
@ -93,15 +93,16 @@ def initialize_session():
def on_connection_end(reason="none"): def on_connection_end(reason="none"):
"""Session connection finished handler """Session connection finished handler
""" """
global delayables, stop_modal_executor global deleyables, stop_modal_executor
settings = utils.get_preferences() settings = utils.get_preferences()
# Step 1: Unregister blender timers # Step 1: Unregister blender timers
for d in delayables: for d in deleyables:
try: try:
d.unregister() d.unregister()
except: except:
continue continue
deleyables.clear()
stop_modal_executor = True stop_modal_executor = True
@ -131,7 +132,7 @@ class SessionStartOperator(bpy.types.Operator):
return True return True
def execute(self, context): def execute(self, context):
global delayables global deleyables
settings = utils.get_preferences() settings = utils.get_preferences()
runtime_settings = context.window_manager.session runtime_settings = context.window_manager.session
@ -139,7 +140,7 @@ class SessionStartOperator(bpy.types.Operator):
admin_pass = runtime_settings.password admin_pass = runtime_settings.password
use_extern_update = settings.update_method == 'DEPSGRAPH' use_extern_update = settings.update_method == 'DEPSGRAPH'
users.clear() users.clear()
delayables.clear() deleyables.clear()
logger = logging.getLogger() logger = logging.getLogger()
if len(logger.handlers) == 1: if len(logger.handlers) == 1:
@ -191,7 +192,7 @@ class SessionStartOperator(bpy.types.Operator):
if settings.update_method == 'DEFAULT': if settings.update_method == 'DEFAULT':
if type_local_config.bl_delay_apply > 0: if type_local_config.bl_delay_apply > 0:
delayables.append( deleyables.append(
delayable.ApplyTimer( delayable.ApplyTimer(
timout=type_local_config.bl_delay_apply, timout=type_local_config.bl_delay_apply,
target_type=type_module_class)) target_type=type_module_class))
@ -207,7 +208,7 @@ class SessionStartOperator(bpy.types.Operator):
external_update_handling=use_extern_update) external_update_handling=use_extern_update)
if settings.update_method == 'DEPSGRAPH': if settings.update_method == 'DEPSGRAPH':
delayables.append(delayable.ApplyTimer( deleyables.append(delayable.ApplyTimer(
settings.depsgraph_update_rate/1000)) settings.depsgraph_update_rate/1000))
# Host a session # Host a session
@ -258,8 +259,8 @@ class SessionStartOperator(bpy.types.Operator):
logging.error(str(e)) logging.error(str(e))
# Background client updates service # Background client updates service
delayables.append(delayable.ClientUpdate()) deleyables.append(delayable.ClientUpdate())
delayables.append(delayable.DynamicRightSelectTimer()) deleyables.append(delayable.DynamicRightSelectTimer())
session_update = delayable.SessionStatusUpdate() session_update = delayable.SessionStatusUpdate()
session_user_sync = delayable.SessionUserSync() session_user_sync = delayable.SessionUserSync()
@ -270,9 +271,9 @@ class SessionStartOperator(bpy.types.Operator):
session_user_sync.register() session_user_sync.register()
session_background_executor.register() session_background_executor.register()
delayables.append(session_background_executor) deleyables.append(session_background_executor)
delayables.append(session_update) deleyables.append(session_update)
delayables.append(session_user_sync) deleyables.append(session_user_sync)
@ -332,7 +333,7 @@ class SessionStopOperator(bpy.types.Operator):
return True return True
def execute(self, context): def execute(self, context):
global delayables, stop_modal_executor global deleyables, stop_modal_executor
if session: if session:
try: try:
@ -359,7 +360,7 @@ class SessionKickOperator(bpy.types.Operator):
return True return True
def execute(self, context): def execute(self, context):
global delayables, stop_modal_executor global deleyables, stop_modal_executor
assert(session) assert(session)
try: try: