A community-maintained Python framework for creating mathematical animations.
add images_dir to --custom_folders
leotrs2ab815fc807e
diff --git a/manim/default.cfg b/manim/default.cfgindex beb4e47c2..ccc64b1a8 100644--- a/manim/default.cfg+++ b/manim/default.cfg@@ -155,6 +155,7 @@ streaming_console_banner = Manim is now running in streaming mode.[custom_folders]media_dir = videosvideo_dir = %(media_dir)s+images_dir = %(media_dir)stext_dir = %(media_dir)s/temp_filestex_dir = %(media_dir)s/temp_filesdiff --git a/manim/scene/scene_file_writer.py b/manim/scene/scene_file_writer.pyindex 6109e3c71..61f7b36e0 100644--- a/manim/scene/scene_file_writer.py+++ b/manim/scene/scene_file_writer.py@@ -54,11 +54,15 @@ class SceneFileWriter(object):scene_name = self.get_default_scene_name()if file_writer_config["save_last_frame"] or file_writer_config["save_pngs"]:if file_writer_config["media_dir"] != "":- image_dir = guarantee_existence(- os.path.join(- file_writer_config["media_dir"], "images", module_directory,+ if not file_writer_config["custom_folders"]:+ image_dir = guarantee_existence(+ os.path.join(+ file_writer_config["images_dir"],+ module_directory,+ ))- )+ else:+ image_dir = guarantee_existence(file_writer_config["images_dir"])self.image_file_path = os.path.join(image_dir, add_extension_if_not_present(scene_name, ".png"))diff --git a/manim/utils/config_utils.py b/manim/utils/config_utils.pyindex 4107bdd86..5f4ca5c0c 100644--- a/manim/utils/config_utils.py+++ b/manim/utils/config_utils.py@@ -70,7 +70,7 @@ def _parse_file_writer_config(config_parser, args):for str_opt in ["media_dir", "log_dir"]:attr = getattr(args, str_opt)fw_config[str_opt] = os.path.relpath(default[str_opt]) if attr is None else attr- dir_names = {"video_dir": "videos", "tex_dir": "Tex", "text_dir": "texts"}+ dir_names = {"video_dir": "videos", "images_dir": "images", "tex_dir": "Tex", "text_dir": "texts"}for name in dir_names:fw_config[name] = os.path.join(fw_config["media_dir"], dir_names[name])@@ -79,7 +79,7 @@ def _parse_file_writer_config(config_parser, args):fw_config["custom_folders"] = args.custom_foldersif fw_config["custom_folders"]:fw_config["media_dir"] = config_parser["custom_folders"].get("media_dir")- for opt in ["video_dir", "tex_dir", "text_dir"]:+ for opt in ["video_dir", "images_dir", "tex_dir", "text_dir"]:fw_config[opt] = config_parser["custom_folders"].get(opt)# Handle the -s (--save_last_frame) flag: invalidate the -w flagdiff --git a/tests/test_cli/write_cfg_sbcmd_input.txt b/tests/test_cli/write_cfg_sbcmd_input.txtindex 98809ff1f..d06995fd2 100644--- a/tests/test_cli/write_cfg_sbcmd_input.txt+++ b/tests/test_cli/write_cfg_sbcmd_input.txt@@ -69,5 +69,6 @@ False+