diff options
author | Nathan Lovato <nathan@gdquest.com> | 2020-05-15 03:31:18 +0300 |
---|---|---|
committer | Nathan Lovato <nathan@gdquest.com> | 2020-05-15 03:31:18 +0300 |
commit | 8f11aecde7409633595b23f24b446943225aa319 (patch) | |
tree | d3548e7c670dd1514578ef9160ed35fdbac0c506 /power_sequencer/operators/expand_to_surrounding_cuts.py | |
parent | 55b820186e64b5362f8c3e808f160cbff49621a3 (diff) |
Power Sequencer: address docstring warnings
The previous commit passed tests without warnings or errors here, but LazyDodo sent
me a log with warnings he was getting on his machine. This commit
attempts to address them.
Note: I'm not getting warnings when running unit tests here.
Diffstat (limited to 'power_sequencer/operators/expand_to_surrounding_cuts.py')
-rw-r--r-- | power_sequencer/operators/expand_to_surrounding_cuts.py | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/power_sequencer/operators/expand_to_surrounding_cuts.py b/power_sequencer/operators/expand_to_surrounding_cuts.py index d18e5bf6..1435b23c 100644 --- a/power_sequencer/operators/expand_to_surrounding_cuts.py +++ b/power_sequencer/operators/expand_to_surrounding_cuts.py @@ -25,7 +25,7 @@ class POWER_SEQUENCER_OT_expand_to_surrounding_cuts(bpy.types.Operator): *Brief* Expand selected strips to surrounding cuts Finds potential gaps surrounding each block of selected sequences and extends the corresponding - sequence handle to it. + sequence handle to it """ doc = { @@ -33,7 +33,11 @@ class POWER_SEQUENCER_OT_expand_to_surrounding_cuts(bpy.types.Operator): "demo": "", "description": doc_description(__doc__), "shortcuts": [ - ({"type": "E", "value": "PRESS", "ctrl": True}, {}, "Expand to Surrounding Cuts") + ( + {"type": "E", "value": "PRESS", "ctrl": True}, + {}, + "Expand to Surrounding Cuts", + ) ], "keymap": "Sequencer", } @@ -64,34 +68,50 @@ class POWER_SEQUENCER_OT_expand_to_surrounding_cuts(bpy.types.Operator): sequences_frame_start = min( sequences, key=lambda s: s.frame_final_start ).frame_final_start - sequences_frame_end = max(sequences, key=lambda s: s.frame_final_end).frame_final_end + sequences_frame_end = max( + sequences, key=lambda s: s.frame_final_end + ).frame_final_end frame_left, frame_right = find_closest_cuts( context, sequences_frame_start, sequences_frame_end ) - if sequences_frame_start == frame_left and sequences_frame_end == frame_right: + if ( + sequences_frame_start == frame_left + and sequences_frame_end == frame_right + ): continue - to_extend_left = [s for s in sequences if s.frame_final_start == sequences_frame_start] - to_extend_right = [s for s in sequences if s.frame_final_end == sequences_frame_end] + to_extend_left = [ + s for s in sequences if s.frame_final_start == sequences_frame_start + ] + to_extend_right = [ + s for s in sequences if s.frame_final_end == sequences_frame_end + ] for s in to_extend_left: s.frame_final_start = ( - frame_left if frame_left < sequences_frame_start else sequences_frame_start + frame_left + if frame_left < sequences_frame_start + else sequences_frame_start ) for s in to_extend_right: s.frame_final_end = ( - frame_right if frame_right > sequences_frame_end else sequences_frame_end + frame_right + if frame_right > sequences_frame_end + else sequences_frame_end ) return {"FINISHED"} def find_closest_cuts(context, frame_min, frame_max): frame_left = max( - context.sequences, key=lambda s: s.frame_final_end if s.frame_final_end <= frame_min else -1 + context.sequences, + key=lambda s: s.frame_final_end if s.frame_final_end <= frame_min else -1, ).frame_final_end frame_right = min( context.sequences, - key=lambda s: s.frame_final_start if s.frame_final_start >= frame_max else 1000000, + key=lambda s: s.frame_final_start + if s.frame_final_start >= frame_max + else 1000000, ).frame_final_start return frame_left, frame_right |