Sourcery refactored master branch #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Comment on lines
-70
to
+78
| # Coming soon: smart error handling for debugging at this point | ||
| if self.memoize: | ||
| if t == self.memoized_t: | ||
| return self.memoized_frame | ||
| else: | ||
| frame = self.make_frame(t) | ||
| self.memoized_t = t | ||
| self.memoized_frame = frame | ||
| return frame | ||
| else: | ||
| if not self.memoize: | ||
| # print(t) | ||
| return self.make_frame(t) | ||
| if t == self.memoized_t: | ||
| return self.memoized_frame | ||
| frame = self.make_frame(t) | ||
| self.memoized_t = t | ||
| self.memoized_frame = frame | ||
| return frame |
There was a problem hiding this comment.
Function Clip.get_frame refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
This removes the following comments ( why? ):
# Coming soon: smart error handling for debugging at this point
Comment on lines
+283
to
-288
| elif self.duration is None: | ||
| raise ValueError("Cannot change clip start when new duration is None") | ||
| else: | ||
| if self.duration is None: | ||
| raise ValueError("Cannot change clip start when new duration is None") |
There was a problem hiding this comment.
Function Clip.with_duration refactored with the following changes:
- Merge else clause's nested if statement into elif (
merge-else-if-into-elif) - Lift code into else after jump in control flow (
reintroduce-else)
Comment on lines
-361
to
+373
| if isinstance(t, np.ndarray): | ||
| # is the whole list of t outside the clip ? | ||
| tmin, tmax = t.min(), t.max() | ||
|
|
||
| if (self.end is not None) and (tmin >= self.end): | ||
| return False | ||
|
|
||
| if tmax < self.start: | ||
| return False | ||
| if not isinstance(t, np.ndarray): | ||
| return (t >= self.start) and ((self.end is None) or (t < self.end)) | ||
| # is the whole list of t outside the clip ? | ||
| tmin, tmax = t.min(), t.max() | ||
|
|
||
| # If we arrive here, a part of t falls in the clip | ||
| result = 1 * (t >= self.start) | ||
| if self.end is not None: | ||
| result *= t <= self.end | ||
| return result | ||
| if (self.end is not None) and (tmin >= self.end): | ||
| return False | ||
|
|
||
| else: | ||
| if tmax < self.start: | ||
| return False | ||
|
|
||
| return (t >= self.start) and ((self.end is None) or (t < self.end)) | ||
| # If we arrive here, a part of t falls in the clip | ||
| result = 1 * (t >= self.start) | ||
| if self.end is not None: | ||
| result *= t <= self.end | ||
| return result |
There was a problem hiding this comment.
Function Clip.is_playing refactored with the following changes:
- Add guard clause (
last-if-guard)
Comment on lines
-564
to
+561
| # Make sure that each frame is the same | ||
| for frame1, frame2 in zip(self.iter_frames(), other.iter_frames()): | ||
| if not np.array_equal(frame1, frame2): | ||
| return False | ||
|
|
||
| return True | ||
| return all( | ||
| np.array_equal(frame1, frame2) | ||
| for frame1, frame2 in zip(self.iter_frames(), other.iter_frames()) | ||
| ) |
There was a problem hiding this comment.
Function Clip.__eq__ refactored with the following changes:
- Use any() instead of for loop (
use-any) - Invert any/all to simplify comparisons (
invert-any-all)
This removes the following comments ( why? ):
# Make sure that each frame is the same
Comment on lines
-72
to
+77
| if hasattr(clip, "audio"): | ||
| new_clip = clip.copy() | ||
| if clip.audio is not None: | ||
| new_clip.audio = func(clip.audio, *args, **kwargs) | ||
| return new_clip | ||
| else: | ||
| if not hasattr(clip, "audio"): | ||
| return func(clip, *args, **kwargs) | ||
| new_clip = clip.copy() | ||
| if clip.audio is not None: | ||
| new_clip.audio = func(clip.audio, *args, **kwargs) | ||
| return new_clip |
There was a problem hiding this comment.
Function audio_video_fx refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
| if self.is_mask: | ||
| new_clip = self.image_transform( | ||
| lambda pic: np.dstack(3 * [255 * pic]).astype("uint8") | ||
| ) | ||
| new_clip.is_mask = False | ||
| return new_clip | ||
| else: | ||
| if not self.is_mask: | ||
| return self | ||
| new_clip = self.image_transform( | ||
| lambda pic: np.dstack(3 * [255 * pic]).astype("uint8") | ||
| ) | ||
| new_clip.is_mask = False | ||
| return new_clip |
There was a problem hiding this comment.
Function VideoClip.to_RGB refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-1048
to
+1047
| if img.shape[2] == 4: | ||
| if fromalpha: | ||
| img = 1.0 * img[:, :, 3] / 255 | ||
| elif is_mask: | ||
| img = 1.0 * img[:, :, 0] / 255 | ||
| elif transparent: | ||
| self.mask = ImageClip(1.0 * img[:, :, 3] / 255, is_mask=True) | ||
| img = img[:, :, :3] | ||
| elif is_mask: | ||
| if img.shape[2] == 4 and fromalpha: | ||
| img = 1.0 * img[:, :, 3] / 255 | ||
| elif img.shape[2] == 4 and is_mask or img.shape[2] != 4 and is_mask: | ||
| img = 1.0 * img[:, :, 0] / 255 | ||
|
|
||
| elif img.shape[2] == 4 and transparent: | ||
| self.mask = ImageClip(1.0 * img[:, :, 3] / 255, is_mask=True) | ||
| img = img[:, :, :3] |
There was a problem hiding this comment.
Function ImageClip.__init__ refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks) - Remove redundant conditional (
remove-redundant-if)
Comment on lines
-1256
to
+1248
| text = "@" + temptxt | ||
| text = f"@{temptxt}" | ||
| else: | ||
| # use a file instead of a text. | ||
| text = "@%" + filename | ||
| text = f"@%{filename}" |
There was a problem hiding this comment.
Function TextClip.__init__ refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
Comment on lines
-1440
to
+1431
| self.color_dict = color_dict if color_dict else self.DEFAULT_COLOR_DICT | ||
| self.color_dict = color_dict or self.DEFAULT_COLOR_DICT | ||
|
|
||
| frame_list = [] | ||
| for input_frame in bitmap_frames: | ||
| output_frame = [] | ||
| for row in input_frame: | ||
| output_frame.append([self.color_dict[color] for color in row]) | ||
| output_frame = [ | ||
| [self.color_dict[color] for color in row] for row in input_frame | ||
| ] | ||
|
|
There was a problem hiding this comment.
Function BitmapClip.__init__ refactored with the following changes:
- Simplify if expression by using or (
or-if-exp-identity) - Convert for loop into list comprehension (
list-comprehension)
| self.fps = max(fpss) if fpss else None | ||
| self.fps = max(fpss, default=None) |
There was a problem hiding this comment.
Function CompositeVideoClip.__init__ refactored with the following changes:
- Use max/min default argument instead of if statement (
max-min-default) - Use named expression to simplify assignment and conditional (
use-named-expression)
This removes the following comments ( why? ):
# compute audio
| i = max([i for i, e in enumerate(timings) if e <= t]) | ||
| i = max(i for i, e in enumerate(timings) if e <= t) |
There was a problem hiding this comment.
Function concatenate_videoclips.make_frame refactored with the following changes:
- Replace unneeded comprehension with generator (
comprehension-to-generator)
Comment on lines
-20
to
+21
| else: | ||
| fading = 1.0 * t / duration | ||
| return fading * get_frame(t) + (1 - fading) * initial_color | ||
| fading = 1.0 * t / duration | ||
| return fading * get_frame(t) + (1 - fading) * initial_color |
There was a problem hiding this comment.
Function fadein.filter refactored with the following changes:
- Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-23
to
+24
| else: | ||
| fading = 1.0 * (clip.duration - t) / duration | ||
| return fading * get_frame(t) + (1 - fading) * final_color | ||
| fading = 1.0 * (clip.duration - t) / duration | ||
| return fading * get_frame(t) + (1 - fading) * final_color |
There was a problem hiding this comment.
Function fadeout.filter refactored with the following changes:
- Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-56
to
+59
| bg = np.tile(opacity, (new_h, new_w)).astype(float).reshape(shape) | ||
| return np.tile(opacity, (new_h, new_w)).astype(float).reshape(shape) | ||
| else: | ||
| shape = (new_h, new_w, 3) | ||
| bg = np.tile(color, (new_h, new_w)).reshape(shape) | ||
| return bg | ||
| return np.tile(color, (new_h, new_w)).reshape(shape) |
There was a problem hiding this comment.
Function margin.make_bg refactored with the following changes:
- Lift return into if (
lift-return-into-if)
Comment on lines
-137
to
+149
| else: | ||
| if kw_value is not None: # if not default value | ||
| warnings.warn( | ||
| f"rotate '{kw_name}' argument is not supported" | ||
| " by your Pillow version and is being ignored. Minimum" | ||
| " Pillow version required:" | ||
| f" v{'.'.join(str(n) for n in min_version)}", | ||
| UserWarning, | ||
| ) | ||
| elif kw_value is not None: # if not default value | ||
| warnings.warn( | ||
| f"rotate '{kw_name}' argument is not supported" | ||
| " by your Pillow version and is being ignored. Minimum" | ||
| " Pillow version required:" | ||
| f" v{'.'.join(str(n) for n in min_version)}", | ||
| UserWarning, | ||
| ) | ||
|
|
||
| # PIL expects uint8 type data. However a mask image has values in the | ||
| # range [0, 1] and is of float type. To handle this we scale it up by | ||
| # a factor 'a' for use with PIL and then back again by 'a' afterwards. | ||
| if im.dtype == "float64": | ||
| # this is a mask image | ||
| a = 255.0 | ||
| else: | ||
| a = 1 | ||
|
|
||
| a = 255.0 if im.dtype == "float64" else 1 |
There was a problem hiding this comment.
Function rotate.filter refactored with the following changes:
- Merge else clause's nested if statement into elif (
merge-else-if-into-elif) - Replace if statement with if expression (
assign-if-exp)
This removes the following comments ( why? ):
# this is a mask image
Comment on lines
-450
to
+451
| logger(message="MoviePy - Building file %s with imageio." % filename) | ||
| logger(message=f"MoviePy - Building file {filename} with imageio.") |
There was a problem hiding this comment.
Function write_gif_with_image_io refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
| filename = TEMP_PREFIX + ".png" | ||
| filename = f'{TEMP_PREFIX}.png' |
There was a problem hiding this comment.
Function html_embed refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
| print("position, color : ", "%s, %s" % (str((x, y)), str(rgb))) | ||
| print("position, color : ", f"{(x, y)}, {str(rgb)}") |
There was a problem hiding this comment.
Function show refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring) - Remove unnecessary calls to
str()from formatted values in f-strings (remove-str-from-fstring)
| if fullscreen: | ||
| flags = pg.FULLSCREEN | ||
| else: | ||
| flags = 0 | ||
|
|
||
| flags = pg.FULLSCREEN if fullscreen else 0 |
There was a problem hiding this comment.
Function preview refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
| for i in range(int(line.split(" ")[1])): | ||
| texts.append(["\n", "\n"]) | ||
| texts.extend(["\n", "\n"] for _ in range(int(line.split(" ")[1]))) |
There was a problem hiding this comment.
Function CreditsClip.__init__ refactored with the following changes:
- Replace a for append loop with list extend (
for-append-to-extend) - Replace unused for index with underscore (
for-index-underscore)
Comment on lines
-502
to
+509
| if clip is not None: | ||
| end = clip.duration | ||
| else: | ||
| end = len(luminosities) * (1.0 / fps) | ||
| end = clip.duration if clip is not None else len(luminosities) * (1.0 / fps) | ||
| luminosity_diffs = abs(np.diff(luminosities)) | ||
| avg = luminosity_diffs.mean() | ||
| luminosity_jumps = ( | ||
| 1 + np.array(np.nonzero(luminosity_diffs > luminosity_threshold * avg))[0] | ||
| ) | ||
| timings = [0] + list((1.0 / fps) * luminosity_jumps) + [end] | ||
| cuts = [(t1, t2) for t1, t2 in zip(timings, timings[1:])] | ||
| cuts = list(zip(timings, timings[1:])) |
There was a problem hiding this comment.
Function detect_scenes refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp) - Replace identity comprehension with call to collection constructor (
identity-comprehension)
| if pos is None: | ||
| pos = (0, 0) # pragma: no cover | ||
| else: | ||
| # Cast to tuple in case pos is not subscriptable. | ||
| pos = tuple(pos) | ||
| pos = (0, 0) if pos is None else tuple(pos) |
There was a problem hiding this comment.
Function blit refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
This removes the following comments ( why? ):
# Cast to tuple in case pos is not subscriptable.
# pragma: no cover
Comment on lines
-91
to
+92
| if not sub: | ||
| return False | ||
| if not sub: | ||
| return False |
There was a problem hiding this comment.
Function SubtitlesClip.__init__.add_textclip_if_none refactored with the following changes:
- Hoist conditional out of nested conditional (
hoist-if-from-if)
| times = re.findall("([0-9]*:[0-9]*:[0-9]*,[0-9]*)", line) | ||
| if times: | ||
| if times := re.findall("([0-9]*:[0-9]*:[0-9]*,[0-9]*)", line): |
There was a problem hiding this comment.
Function file_to_subtitles refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression)
Comment on lines
-230
to
+233
| for t in tt[1:]: | ||
| xys.append(findAround(clip.get_frame(t), pattern, xy=xys[-1], r=radius)) | ||
| xys.extend( | ||
| findAround(clip.get_frame(t), pattern, xy=xys[-1], r=radius) | ||
| for t in tt[1:] | ||
| ) |
There was a problem hiding this comment.
Function autoTrack refactored with the following changes:
- Replace a for append loop with list extend (
for-append-to-extend)
| logfile_name = filename + ".log" | ||
| logfile_name = f'{filename}.log' |
There was a problem hiding this comment.
Function test_ffmpeg_write_video refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Swap if/else branches of if expression to remove negation (
swap-if-expression)
Comment on lines
-175
to
+176
| assert os.path.isfile(filename + ".log") | ||
| os.remove(filename + ".log") | ||
| assert os.path.isfile(f'{filename}.log') | ||
| os.remove(f'{filename}.log') |
There was a problem hiding this comment.
Function test_ffmpeg_write_image refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| bw_color_dict = {} | ||
| for num in range(0, 256): | ||
| bw_color_dict[chr(num + 255)] = (num, num, num) | ||
| bw_color_dict = {chr(num + 255): (num, num, num) for num in range(256)} |
There was a problem hiding this comment.
Function test_blackwhite refactored with the following changes:
- Convert for loop into dictionary comprehension (
dict-comprehension) - Replace range(0, x) with range(x) (
remove-zero-from-range) - Replace unused for index with underscore (
for-index-underscore)
Comment on lines
-575
to
+573
| clip_size = tuple(random.randint(3, 10) for i in range(2)) | ||
| clip_size = tuple(random.randint(3, 10) for _ in range(2)) |
There was a problem hiding this comment.
Function test_mask_and refactored with the following changes:
- Replace unused for index with underscore (
for-index-underscore)
Comment on lines
-632
to
+630
| clip_size = tuple(random.randint(3, 10) for i in range(2)) | ||
| clip_size = tuple(random.randint(3, 10) for _ in range(2)) |
There was a problem hiding this comment.
Function test_mask_or refactored with the following changes:
- Replace unused for index with underscore (
for-index-underscore)
Sourcery Code Quality Report✅ Merging this PR will increase code quality in the affected files by 0.36%.
Here are some functions in these files that still need a tune-up:
Legend and ExplanationThe emojis denote the absolute quality of the code:
The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request. Please see our documentation here for details on how these metrics are calculated. We are actively working on this report - lots more documentation and extra metrics to come! Help us improve this quality report! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branch
masterrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run:Help us improve this pull request!