Revert "Use file_writer_config instead of config to get text_dir for Text() (ManimCommunity#220)"

This reverts commit 7f28769.

Author: Aathish04

manim/__main__.py

@@ -8,8 +8,7 @@
 import importlib.util
 import types
 
-from .config import file_writer_config,args
-from .utils import cfg_subcmds
+from .config import file_writer_config
 from .scene.scene import Scene
 from .utils.sounds import play_error_sound
 from .utils.sounds import play_finish_sound
@@ -128,7 +127,7 @@ def get_module(file_name):
         logger.info("Enter the animation's code & end with an EOF (CTRL+D on Linux/Unix, CTRL+Z on Windows):")
         code = sys.stdin.read()
         if not code.startswith("from manim import"):
-            logger.warning("Didn't find an import statement for Manim. Importing automatically...")
+            logger.warn("Didn't find an import statement for Manim. Importing automatically...")
             code="from manim import *\n"+code
         logger.info("Rendering animation from typed code...")
         try:
@@ -151,38 +150,23 @@ def get_module(file_name):
 
 
 def main():
-    if hasattr(args,"subcommands"):
-        if "cfg" in args.subcommands:
-            if args.cfg_subcommand is not None:
-                subcommand=args.cfg_subcommand
-                if subcommand == "write":
-                    cfg_subcmds.write(args.level,args.open)
-                elif subcommand == "show":
-                    cfg_subcmds.show()
-                elif subcommand == "export":
-                    cfg_subcmds.export(args.dir)
-            else:
-                logger.error("No argument provided; Exiting...")
-
-
-    else:
-        module = get_module(file_writer_config["input_file"])
-        all_scene_classes = get_scene_classes_from_module(module)
-        scene_classes_to_render = get_scenes_to_render(all_scene_classes)
-        sound_on = file_writer_config["sound"]
-        for SceneClass in scene_classes_to_render:
-            try:
-                # By invoking, this renders the full scene
-                scene = SceneClass()
-                open_file_if_needed(scene.file_writer)
-                if sound_on:
-                    play_finish_sound()
-            except Exception:
-                print("\n\n")
-                traceback.print_exc()
-                print("\n\n")
-                if sound_on:
-                    play_error_sound()
+    module = get_module(file_writer_config["input_file"])
+    all_scene_classes = get_scene_classes_from_module(module)
+    scene_classes_to_render = get_scenes_to_render(all_scene_classes)
+    sound_on = file_writer_config["sound"]
+    for SceneClass in scene_classes_to_render:
+        try:
+            # By invoking, this renders the full scene
+            scene = SceneClass()
+            open_file_if_needed(scene.file_writer)
+            if sound_on:
+                play_finish_sound()
+        except Exception:
+            print("\n\n")
+            traceback.print_exc()
+            print("\n\n")
+            if sound_on:
+                play_error_sound()
 
 
 if __name__ == "__main__":

manim/config.py

@@ -89,8 +89,7 @@ def _parse_config(config_parser, args):
 
 args, config_parser, file_writer_config, successfully_read_files = _run_config()
 if _from_command_line():
-    logger.info(f"Read configuration files: {[os.path.abspath(cfgfile) for cfgfile in successfully_read_files]}")
-    if not(hasattr(args,"subcommands")):
-        _init_dirs(file_writer_config)
+    logger.info(f"Read configuration files: {os.path.abspath(successfully_read_files[-1])}")
+    _init_dirs(file_writer_config)
 config = _parse_config(config_parser, args)
 camera_config = config

manim/utils/cfg_subcmds.py

@@ -0,0 +1,116 @@
+"""
+cfgwriter.py
+------------
+
+Inputs the configuration files while checking it is valid. Can be executed by `manim-cfg` command.
+
+"""
+import os
+import configparser
+
+from .config_utils import _run_config, _paths_config_file
+
+from rich.console import Console
+from rich.progress import track
+from rich.style import Style
+from rich.errors import StyleSyntaxError
+
+__all__ = ["main"]
+
+INVALID_STYLE_MSG = "[red bold]Your Style is not valid. Try again.[/red bold]"
+INTRO_INSTRUCTIONS = """[red]The default colour is used by the input statement.
+If left empty, the default colour will be used.[/red]
+[magenta] For a full list of styles, visit[/magenta] https://rich.readthedocs.io/en/latest/style.html"""
+TITLE_TEXT = "[yellow bold]Manim Configuration File Writer[/yellow bold]"
+
+
+def is_valid_style(style):
+    """Checks whether the entered color is a valid color according to rich
+    Parameters
+    ----------
+    style : :class:`str`
+        The style to check whether it is valid.
+    Returns
+    -------
+    Boolean
+        Returns whether it is valid style or not according to rich.
+    """
+    try:
+        Style.parse(style)
+        return True
+    except StyleSyntaxError:
+        return False
+
+
+def replace_keys(default):
+    """Replaces _ to . and viceversa in a dictionary for rich
+    Parameters
+    ----------
+    default : :class:`dict`
+        The dictionary to check and replace
+    Returns
+    -------
+    :class:`dict`
+        The dictionary which is modified by replcaing _ with . and viceversa
+    """
+    for key in default:
+        if "_" in key:
+            temp = default[key]
+            del default[key]
+            key = key.replace("_", ".")
+            default[key] = temp
+        else:
+            temp = default[key]
+            del default[key]
+            key = key.replace(".", "_")
+            default[key] = temp
+    return default
+
+
+def main():
+    config = _run_config()[1]
+    console = Console()
+    default = config["logger"]
+    console.print(TITLE_TEXT, justify="center")
+    console.print(INTRO_INSTRUCTIONS)
+    default = replace_keys(default)
+    for key in default:
+        console.print("Enter the Style for %s" % key + ":", style=key, end="")
+        temp = input()
+        if temp:
+            while not is_valid_style(temp):
+                console.print(INVALID_STYLE_MSG)
+                console.print("Enter the Style for %s" % key + ":", style=key, end="")
+                temp = input()
+            else:
+                default[key] = temp
+    default = replace_keys(default)
+    config["logger"] = default
+    console.print(
+        "Do you want to save this as the default for this User?(y/n)[[n]]",
+        style="dim purple",
+        end="",
+    )
+    save_to_userpath = input()
+    config_paths = _paths_config_file() + [os.path.abspath("manim.cfg")]
+    if save_to_userpath.lower() == "y":
+        if not os.path.exists(os.path.abspath(os.path.join(config_paths[1], ".."))):
+            os.makedirs(os.path.abspath(os.path.join(config_paths[1], "..")))
+        with open(config_paths[1], "w") as fp:
+            config.write(fp)
+        console.print(
+            f"""A configuration file called [yellow]{config_paths[1]}[/yellow] has been created with your required changes.
+This will be used when running the manim command. If you want to override this config,
+you will have to create a manim.cfg in the local directory, where you want those changes to be overridden."""
+        )
+    else:
+        with open(config_paths[2], "w") as fp:
+            config.write(fp)
+        console.print(
+            f"""A configuration file called [yellow]{config_paths[2]}[/yellow] has been created.
+To save your theme please save that file and place it in your current working directory, from where you run the manim command."""
+        )
+
+
+if __name__ == "__main__":
+    main()