Merge pull request #212 from Aathish04/cfg-subcommand

Implement a basic Subcommand structure.

Author: Aathish04

docs/source/conf.py

@@ -17,22 +17,21 @@
 
 # -- Project information -----------------------------------------------------
 
-project = 'Manim'
-copyright = '2019, EulerTour'
-author = 'EulerTour'
+project = "Manim"
+copyright = "2019, EulerTour"
+author = "EulerTour"
 
 
 # -- General configuration ---------------------------------------------------
-master_doc = 'index'
+master_doc = "index"
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = [
-]
+extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -45,9 +44,9 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'sphinx_rtd_theme'
+html_theme = "sphinx_rtd_theme"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['assets']
+html_static_path = ["assets"]

logo/logo.py

@@ -2,6 +2,7 @@
 
 NEW_BLUE = "#68a8e1"
 
+
 class Thumbnail(GraphScene):
     CONFIG = {
         "y_max": 8,
@@ -13,13 +14,15 @@ def construct(self):
 
     def show_function_graph(self):
         self.setup_axes(animate=False)
+
         def func(x):
-            return 0.1 * (x + 3-5) * (x - 3-5) * (x-5) + 5
+            return 0.1 * (x + 3 - 5) * (x - 3 - 5) * (x - 5) + 5
 
         def rect(x):
-            return 2.775*(x-1.5)+3.862
-        recta = self.get_graph(rect,x_min=-1,x_max=5)
-        graph = self.get_graph(func,x_min=0.2,x_max=9)
+            return 2.775 * (x - 1.5) + 3.862
+
+        recta = self.get_graph(rect, x_min=-1, x_max=5)
+        graph = self.get_graph(func, x_min=0.2, x_max=9)
         graph.set_color(NEW_BLUE)
         input_tracker_p1 = ValueTracker(1.5)
         input_tracker_p2 = ValueTracker(3.5)
@@ -37,29 +40,40 @@ def get_y_point(input_tracker):
             return self.coords_to_point(0, get_y_value(input_tracker))
 
         def get_graph_point(input_tracker):
-            return self.coords_to_point(get_x_value(input_tracker), get_y_value(input_tracker))
+            return self.coords_to_point(
+                get_x_value(input_tracker), get_y_value(input_tracker)
+            )
 
         def get_v_line(input_tracker):
-            return DashedLine(get_x_point(input_tracker), get_graph_point(input_tracker), stroke_width=2)
+            return DashedLine(
+                get_x_point(input_tracker),
+                get_graph_point(input_tracker),
+                stroke_width=2,
+            )
 
         def get_h_line(input_tracker):
-            return DashedLine(get_graph_point(input_tracker), get_y_point(input_tracker), stroke_width=2)
-        # 
+            return DashedLine(
+                get_graph_point(input_tracker),
+                get_y_point(input_tracker),
+                stroke_width=2,
+            )
+
+        #
         input_triangle_p1 = RegularPolygon(n=3, start_angle=TAU / 4)
         output_triangle_p1 = RegularPolygon(n=3, start_angle=0)
         for triangle in input_triangle_p1, output_triangle_p1:
             triangle.set_fill(WHITE, 1)
             triangle.set_stroke(width=0)
             triangle.scale(0.1)
-        # 
+        #
         input_triangle_p2 = RegularPolygon(n=3, start_angle=TAU / 4)
         output_triangle_p2 = RegularPolygon(n=3, start_angle=0)
         for triangle in input_triangle_p2, output_triangle_p2:
             triangle.set_fill(WHITE, 1)
             triangle.set_stroke(width=0)
             triangle.scale(0.1)
-        
-        # 
+
+        #
         x_label_p1 = TexMobject("a")
         output_label_p1 = TexMobject("f(a)")
         x_label_p2 = TexMobject("b")
@@ -83,11 +97,8 @@ def get_h_line(input_tracker):
         graph_dot_p1.move_to(get_graph_point(input_tracker_p1))
         graph_dot_p2.move_to(get_graph_point(input_tracker_p2))
 
-
         #
-        self.play(
-            ShowCreation(graph),
-        )
+        self.play(ShowCreation(graph),)
         # Animacion del punto a
         self.add_foreground_mobject(graph_dot_p1)
         self.add_foreground_mobject(graph_dot_p2)
@@ -106,7 +117,7 @@ def get_h_line(input_tracker):
             ShowCreation(h_line_p2),
             Write(output_label_p2),
             DrawBorderThenFill(output_triangle_p2),
-            run_time=0.5
+            run_time=0.5,
         )
         self.add(
             input_triangle_p2,
@@ -119,58 +130,61 @@ def get_h_line(input_tracker):
         )
         ###################
         pendiente_recta = self.get_secant_slope_group(
-            1.9, recta, dx = 1.4,
-            df_label = None,
-            dx_label = None,
-            dx_line_color = PURPLE,
-            df_line_color= ORANGE,
-            )
+            1.9,
+            recta,
+            dx=1.4,
+            df_label=None,
+            dx_label=None,
+            dx_line_color=PURPLE,
+            df_line_color=ORANGE,
+        )
         grupo_secante = self.get_secant_slope_group(
-            1.5, graph, dx = 2,
-            df_label = None,
-            dx_label = None,
-            dx_line_color = "#942357",
-            df_line_color= "#3f7d5c",
-            secant_line_color = RED,
+            1.5,
+            graph,
+            dx=2,
+            df_label=None,
+            dx_label=None,
+            dx_line_color="#942357",
+            df_line_color="#3f7d5c",
+            secant_line_color=RED,
         )
 
-
         self.add(
-            input_triangle_p2,
-            graph_dot_p2,
-            v_line_p2,
-            h_line_p2,
-            output_triangle_p2,
+            input_triangle_p2, graph_dot_p2, v_line_p2, h_line_p2, output_triangle_p2,
         )
         self.play(FadeIn(grupo_secante))
 
         kwargs = {
-            "x_min" : 4,
-            "x_max" : 9,
-            "fill_opacity" : 0.75,
-            "stroke_width" : 0.25,
+            "x_min": 4,
+            "x_max": 9,
+            "fill_opacity": 0.75,
+            "stroke_width": 0.25,
         }
-        self.graph=graph
-        iteraciones=6
-
+        self.graph = graph
+        iteraciones = 6
 
         self.rect_list = self.get_riemann_rectangles_list(
-            graph, iteraciones,start_color=PURPLE,end_color=ORANGE, **kwargs
+            graph, iteraciones, start_color=PURPLE, end_color=ORANGE, **kwargs
         )
         flat_rects = self.get_riemann_rectangles(
-            self.get_graph(lambda x : 0), dx = 0.5,start_color=invert_color(PURPLE),end_color=invert_color(ORANGE),**kwargs
+            self.get_graph(lambda x: 0),
+            dx=0.5,
+            start_color=invert_color(PURPLE),
+            end_color=invert_color(ORANGE),
+            **kwargs
         )
         rects = self.rect_list[0]
         self.transform_between_riemann_rects(
-            flat_rects, rects, 
-            replace_mobject_with_target_in_scene = True,
-            run_time=0.9
+            flat_rects, rects, replace_mobject_with_target_in_scene=True, run_time=0.9
         )
 
         # adding manim
         picture = Group(*self.mobjects)
         picture.scale(0.6).to_edge(LEFT, buff=SMALL_BUFF)
-        manim = TextMobject("Manim").set_height(1.5) \
-                                    .next_to(picture, RIGHT) \
-                                    .shift(DOWN * 0.7)
+        manim = (
+            TextMobject("Manim")
+            .set_height(1.5)
+            .next_to(picture, RIGHT)
+            .shift(DOWN * 0.7)
+        )
         self.add(manim)

manim/__main__.py

@@ -8,7 +8,8 @@
 import importlib.util
 import types
 
-from .config import file_writer_config
+from .config import file_writer_config, args
+from .utils import cfg_subcmds
 from .scene.scene import Scene
 from .utils.sounds import play_error_sound
 from .utils.sounds import play_finish_sound
@@ -156,23 +157,37 @@ def get_module(file_name):
 
 
 def main():
-    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 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()
 
 
 if __name__ == "__main__":

manim/config.py

@@ -90,8 +90,9 @@ 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(successfully_read_files[-1])}"
+        f"Read configuration files: {[os.path.abspath(cfgfile) for cfgfile in successfully_read_files]}"
     )
-    _init_dirs(file_writer_config)
+    if not (hasattr(args, "subcommands")):
+        _init_dirs(file_writer_config)
 config = _parse_config(config_parser, args)
 camera_config = config