fixed progress bar

Author: jsonvillanueva

manim/__main__.py

@@ -1,6 +1,4 @@
-import sys
 import click
-from click.testing import CliRunner
 from click_default_group import DefaultGroup
 from manim.constants import EPILOG
 from manim.constants import CONTEXT_SETTINGS
@@ -29,5 +27,4 @@ def main(ctx):
 main.add_command(render)
 
 if __name__ == "__main__":
-    runner = CliRunner()
-    manim = runner.invoke(main, sys.argv[1:])
+    main()

manim/_config/default.cfg

@@ -40,14 +40,11 @@ show_in_file_browser = False
 verbosity = INFO
 
 # --progress_bar
-progress_bar = True
+progress_bar = show
 
 # -o, --output_file
 output_file =
 
-# --leave_progress_bars
-leave_progress_bars = False
-
 # --log_to_file
 log_to_file = False
 

manim/_config/utils.py

@@ -263,7 +263,6 @@ class MyScene(Scene):
         "images_dir",
         "input_file",
         "webgl_renderer_path",
-        "leave_progress_bars",
         "log_dir",
         "log_to_file",
         "max_files_cached",
@@ -508,9 +507,7 @@ def digest_parser(self, parser: configparser.ConfigParser) -> "ManimConfig":
             "save_as_gif",
             "preview",
             "show_in_file_browser",
-            "progress_bar",
             "sound",
-            "leave_progress_bars",
             "log_to_file",
             "disable_caching",
             "flush_cache",
@@ -575,6 +572,10 @@ def digest_parser(self, parser: configparser.ConfigParser) -> "ManimConfig":
         if val:
             setattr(self, "tex_template_file", val)
 
+        val = parser["CLI"].get("progress_bar")
+        if val:
+            setattr(self, "progress_bar", val)
+
         val = parser["ffmpeg"].get("loglevel")
         if val:
             setattr(self, "ffmpeg_loglevel", val)
@@ -621,14 +622,14 @@ def digest_args(self, args: argparse.Namespace) -> "ManimConfig":
             "preview",
             "show_in_file_browser",
             "sound",
-            "leave_progress_bars",
             "write_to_movie",
             "save_last_frame",
             "save_pngs",
             "save_as_gif",
             "write_all",
             "disable_caching",
             "flush_cache",
+            "progress_bar",
             "transparent",
             "scene_names",
             "verbosity",
@@ -756,16 +757,12 @@ def digest_file(self, filename: str) -> "ManimConfig":
 
     progress_bar = property(
         lambda self: self._d["progress_bar"],
-        lambda self, val: self._set_boolean("progress_bar", val),
+        lambda self, val: self._set_from_list(
+            "progress_bar", val, ["none", "show", "leave"]
+        ),
         doc="Whether to show progress bars while rendering animations.",
     )
 
-    leave_progress_bars = property(
-        lambda self: self._d["leave_progress_bars"],
-        lambda self, val: self._set_boolean("leave_progress_bars", val),
-        doc="Whether to leave the progress bar for each animation.",
-    )
-
     @property
     def log_to_file(self):
         """Whether to save logs to a file."""

manim/scene/scene.py

@@ -728,9 +728,9 @@ def get_time_progression(
             times,
             desc=description,
             total=n_iterations,
-            leave=config["leave_progress_bars"],
+            leave=config["progress_bar"] == "leave",
             ascii=True if platform.system() == "Windows" else None,
-            disable=not config["progress_bar"],
+            disable=config["progress_bar"] == "none",
         )
         return time_progression