A community-maintained Python framework for creating mathematical animations.
initial cleanup
leotrsb0370bb84ce6
diff --git a/manim/scene/scene_file_writer.py b/manim/scene/scene_file_writer.pyindex 321ab0567..a72c15265 100644--- a/manim/scene/scene_file_writer.py+++ b/manim/scene/scene_file_writer.py@@ -53,21 +53,29 @@ class SceneFileWriter(object):self.frame_count = 0self.partial_movie_files = []- # Output directories and filesdef init_output_directories(self, scene_name):+ """Initialise output directories.++ Notes+ -----+ The directories are read from ``config``, for example+ ``config['media_dir']``. If the target directories don't already+ exist, they will be created.+"""- This method initialises the directories to which video- files will be written to and read from (within MEDIA_DIR).- If they don't already exist, they will be created.- """- if config["dry_run"]:+ if config["dry_run"]: # in dry-run mode there is no outputreturnif config["input_file"]:module_directory = config["input_file"].stemelse:module_directory = ""- default_name = self.get_default_scene_name(scene_name)++ if config["output_file"]:+ default_name = config["output_file"]+ else:+ default_name = Path(scene_name)+if config["save_last_frame"] or config["save_pngs"]:if config["media_dir"] != "":if not config["custom_folders"]:@@ -150,21 +158,6 @@ class SceneFileWriter(object):)self.partial_movie_files.append(new_partial_movie_file)- def get_default_scene_name(self, scene_name):- """- This method returns the default scene name- which is the value of "output_file", if it exists and- the actual name of the class that inherited from- Scene in your animation script, if "output_file" is None.-- Returns- -------- str- The default scene name.- """- fn = config["output_file"]- return fn if fn else Path(scene_name)-def get_resolution_directory(self):"""Get the name of the resolution directory directly containingthe video file.@@ -194,32 +187,6 @@ class SceneFileWriter(object):frame_rate = config["frame_rate"]return "{}p{}".format(pixel_height, frame_rate)- # Directory getters- def get_image_file_path(self):- """- This returns the directory path to which any images will be- written to.- It is usually named "images", but can be changed by changing- "image_file_path".-- Returns- -------- str- The path of the directory.- """- return self.image_file_path-- def get_movie_file_path(self):- """- Returns the final path of the written video file.-- Returns- -------- str- The path of the movie file.- """- return self.movie_file_path-# Sounddef init_audio(self):"""@@ -353,7 +320,7 @@ class SceneFileWriter(object):image : np.arrayThe pixel array of the image to save."""- file_path = self.get_image_file_path()+ file_path = self.image_file_pathimage.save(file_path)self.print_file_ready_message(file_path)@@ -504,7 +471,7 @@ class SceneFileWriter(object):if os.name == "nt":pf_path = pf_path.replace("\\", "/")fp.write("file 'file:{}'\n".format(pf_path))- movie_file_path = self.get_movie_file_path()+ movie_file_path = self.movie_file_pathcommands = [FFMPEG_BIN,"-y", # overwrite output file if it exists@@ -615,7 +582,5 @@ class SceneFileWriter(object):)def print_file_ready_message(self, file_path):- """- Prints the "File Ready" message to STDOUT.- """+ """Prints the "File Ready" message to STDOUT."""logger.info("\nFile ready at %(file_path)s\n", {"file_path": file_path})