[go: nahoru, domu]

Skip to content

Commit

Permalink
Fixed MoviePy being displayed as Moviepy in some places. (Zulko#1885)
Browse files Browse the repository at this point in the history
  • Loading branch information
whitetxt committed Feb 6, 2023
1 parent 858bb81 commit 3ba7329
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ clip = ColorClip((600, 400), color=(255, 100, 0), duration=2)
#### Specifications

- Python Version:
- Moviepy Version:
- MoviePy Version:
- Platform Name:
- Platform Version:
2 changes: 1 addition & 1 deletion docs/docker.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Moviepy Docker
MoviePy Docker
===============

Prerequisites
Expand Down
2 changes: 1 addition & 1 deletion docs/gallery.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Gallery

Here are a few projects using MoviePy. The gallery will fill up as more people start using MoviePy (which is currently one year old). If you have a nice project using MoviePy let us know!

Videos edited with Moviepy
Videos edited with MoviePy
---------------------------


Expand Down
6 changes: 3 additions & 3 deletions moviepy/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def subprocess_call(cmd, logger="bar"):
Set logger to None or a custom Proglog logger to avoid printings.
"""
logger = proglog.default_bar_logger(logger)
logger(message="Moviepy - Running:\n>>> " + " ".join(cmd))
logger(message="MoviePy - Running:\n>>> " + " ".join(cmd))

popen_params = cross_platform_popen_params(
{"stdout": sp.DEVNULL, "stderr": sp.PIPE, "stdin": sp.DEVNULL}
Expand All @@ -40,10 +40,10 @@ def subprocess_call(cmd, logger="bar"):
proc.stderr.close()

if proc.returncode:
logger(message="Moviepy - Command returned an error")
logger(message="MoviePy - Command returned an error")
raise IOError(err.decode("utf8"))
else:
logger(message="Moviepy - Command successful")
logger(message="MoviePy - Command successful")

del proc

Expand Down
10 changes: 5 additions & 5 deletions moviepy/video/VideoClip.py
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ def write_videofile(

# enough cpu for multiprocessing ? USELESS RIGHT NOW, WILL COME AGAIN
# enough_cpu = (multiprocessing.cpu_count() > 1)
logger(message="Moviepy - Building video %s." % filename)
logger(message="MoviePy - Building video %s." % filename)
if make_audio:
self.audio.write_audiofile(
audiofile,
Expand Down Expand Up @@ -395,7 +395,7 @@ def write_videofile(
if remove_temp and make_audio:
if os.path.exists(audiofile):
os.remove(audiofile)
logger(message="Moviepy - video ready %s" % filename)
logger(message="MoviePy - video ready %s" % filename)

@requires_duration
@use_clip_fps_by_default
Expand Down Expand Up @@ -441,7 +441,7 @@ def write_images_sequence(
"""
logger = proglog.default_bar_logger(logger)
# Fails on GitHub macos CI
# logger(message="Moviepy - Writing frames %s." % name_format)
# logger(message="MoviePy - Writing frames %s." % name_format)

timings = np.arange(0, self.duration, 1.0 / fps)

Expand All @@ -450,7 +450,7 @@ def write_images_sequence(
name = name_format % i
filenames.append(name)
self.save_frame(name, t, with_mask=with_mask)
# logger(message="Moviepy - Done writing frames %s." % name_format)
# logger(message="MoviePy - Done writing frames %s." % name_format)

return filenames

Expand Down Expand Up @@ -1353,7 +1353,7 @@ def list(arg):
# The first 5 lines are header information, not colors, so ignore
return [line.split(" ")[0] for line in lines[5:]]
else:
raise Exception("Moviepy Error: Argument must equal 'font' or 'color'")
raise Exception("MoviePy Error: Argument must equal 'font' or 'color'")

@staticmethod
def search(string, arg):
Expand Down
2 changes: 1 addition & 1 deletion moviepy/video/compositing/concatenate.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def get_mask(clip):
)
else:
raise Exception(
"Moviepy Error: The 'method' argument of "
"MoviePy Error: The 'method' argument of "
"concatenate_videoclips must be 'chain' or 'compose'"
)

Expand Down
2 changes: 1 addition & 1 deletion moviepy/video/io/ImageSequenceClip.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def __init__(
image1 = imread(image)
if size != image1.shape:
raise Exception(
"Moviepy: ImageSequenceClip requires all images to be the same size"
"MoviePy: ImageSequenceClip requires all images to be the same size"
)

self.fps = fps
Expand Down
4 changes: 2 additions & 2 deletions moviepy/video/io/ffmpeg_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def ffmpeg_write_video(
logfile = open(filename + ".log", "w+")
else:
logfile = None
logger(message="Moviepy - Writing video %s\n" % filename)
logger(message="MoviePy - Writing video %s\n" % filename)
if not pixel_format:
pixel_format = "rgba" if with_mask else "rgb24"
with FFMPEG_VideoWriter(
Expand Down Expand Up @@ -269,7 +269,7 @@ def ffmpeg_write_video(

if write_logfile:
logfile.close()
logger(message="Moviepy - Done !")
logger(message="MoviePy - Done !")


def ffmpeg_write_image(filename, image, logfile=False, pixel_format=None):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_editor.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Moviepy editor tests."""
"""MoviePy editor tests."""

import importlib
import io
Expand Down

0 comments on commit 3ba7329

Please sign in to comment.