Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

refactor logger to play nicely with the new config system

leotrse33d3aac4dde
diff --git a/manim/__main__.py b/manim/__main__.py
index bded3c61d..d1acc0050 100644
--- a/manim/__main__.py
+++ b/manim/__main__.py
@@ -74,9 +74,6 @@ def main():
config.digest_args(args)
init_dirs(config)
- if file_writer_config["log_to_file"]:
- set_file_logger()
-
module = get_module(config["input_file"])
all_scene_classes = get_scene_classes_from_module(module)
scene_classes_to_render = get_scenes_to_render(all_scene_classes)
diff --git a/manim/config/logger.py b/manim/config/logger.py
index d93228f4a..bc8a154c3 100644
--- a/manim/config/logger.py
+++ b/manim/config/logger.py
@@ -50,11 +50,11 @@ def make_logger(parser, verbosity):
rich_handler = RichHandler(
console=console, show_time=parser.getboolean("log_timestamps")
)
- rich_handler.setLevel(verbosity)
# finally, the logger
logger = logging.getLogger("manim")
logger.addHandler(rich_handler)
+ logger.setLevel(verbosity)
return logger, console
@@ -88,6 +88,29 @@ def parse_theme(config_logger):
return customTheme
+def set_file_logger(config, verbosity):
+ # Note: The log file name will be
+ # <name_of_animation_file>_<name_of_scene>.log, gotten from
+ # file_writer_config. So it can differ from the real name of the scene.
+ # <name_of_scene> would only appear if scene name was provided when manim
+ # was called.
+ scene_name_suffix = "".join(config["scene_names"])
+ scene_file_name = os.path.basename(config["input_file"]).split(".")[0]
+ log_file_name = (
+ f"{scene_file_name}_{scene_name_suffix}.log"
+ if scene_name_suffix
+ else f"{scene_file_name}.log"
+ )
+ log_file_path = os.path.join(config["log_dir"], log_file_name)
+ file_handler = logging.FileHandler(log_file_path, mode="w")
+ file_handler.setFormatter(JSONFormatter())
+
+ logger = logging.getLogger('manim')
+ logger.addHandler(file_handler)
+ logger.info("Log file will be saved in %(logpath)s", {"logpath": log_file_path})
+ logger.setLevel(verbosity)
+
+
class JSONFormatter(logging.Formatter):
"""Subclass of `:class:`logging.Formatter`, to build our own format of the logs (JSON)."""
diff --git a/manim/scene/scene_file_writer.py b/manim/scene/scene_file_writer.py
index 651bedb4c..ce2c5a0ff 100644
--- a/manim/scene/scene_file_writer.py
+++ b/manim/scene/scene_file_writer.py
@@ -110,7 +110,7 @@ class SceneFileWriter(object):
else:
self.partial_movie_directory = guarantee_existence(
os.path.join(
- file_writer_config["media_dir"],
+ config["media_dir"],
"temp_files",
"partial_movie_files",
scene_name,