Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

fix bug in ManimConfig.get_dir() and simplify the manim_directive

leotrs8dd84a4a47e6
diff --git a/docs/source/manim_directive.py b/docs/source/manim_directive.py
index 11383f7cc..f3dce4361 100644
--- a/docs/source/manim_directive.py
+++ b/docs/source/manim_directive.py
@@ -198,12 +198,6 @@ class ManimDirective(Directive):
images_dir = os.path.join(media_dir, "images")
if not os.path.exists(images_dir):
os.mkdir(images_dir)
- tex_dir = os.path.join(media_dir, "tex")
- if not os.path.exists(tex_dir):
- os.mkdir(tex_dir)
- text_dir = os.path.join(media_dir, "text")
- if not os.path.exists(text_dir):
- os.mkdir(text_dir)
video_dir = os.path.join(media_dir, "videos")
output_file = f"{clsname}-{classnamedict[clsname]}"
@@ -212,10 +206,6 @@ class ManimDirective(Directive):
f'config["pixel_height"] = {pixel_height}',
f'config["pixel_width"] = {pixel_width}',
f'config["media_dir"] = r"{media_dir}"',
- f'config["images_dir"] = r"{images_dir}"',
- f'config["tex_dir"] = r"{tex_dir}"',
- f'config["text_dir"] = r"{text_dir}"',
- f'config["video_dir"] = r"{video_dir}"',
f'config["save_last_frame"] = {save_last_frame}',
f'config["save_as_gif"] = {save_as_gif}',
f'config["output_file"] = r"{output_file}"',
diff --git a/manim/__main__.py b/manim/__main__.py
index af52329d7..ff4c657b2 100644
--- a/manim/__main__.py
+++ b/manim/__main__.py
@@ -12,7 +12,6 @@ from manim.utils.module_ops import (
)
from manim.utils.file_ops import open_file as open_media_file
from manim.grpc.impl import frame_server_impl
-from manim.config.utils import init_dirs
from manim.config.main_utils import *
diff --git a/manim/config/utils.py b/manim/config/utils.py
index 75645da07..fdc2b9713 100644
--- a/manim/config/utils.py
+++ b/manim/config/utils.py
@@ -753,16 +753,18 @@ class ManimConfig(MutableMapping):
'or {input,output}_file')
dirs.remove(key) # a path cannot contain itself
- dir_args = {k: self._d[k] for k in dirs}
- qual = constants.QUALITIES[self.quality]
- qual_arg = f'{qual["pixel_height"]}p{qual["frame_rate"]}'
+ all_args = {k: self._d[k] for k in dirs}
+ all_args.update(kwargs)
+ all_args['quality'] = f'{self.pixel_height}p{self.frame_rate}'
try:
- path = self._d[key].format(quality=qual_arg, **dir_args, **kwargs)
+ path = self._d[key].format(**all_args)
except KeyError as exc:
- raise KeyError(f'{key} requires the following keyword arguments: '
- + " ".join(exc.args)) from exc
+ raise KeyError(f'{key} {self._d[key]} requires the following '
+ + 'keyword arguments: '
+ + " ".join(exc.args)
+ + f'but quality is {self.quality}') from exc
return Path(path) if path else None