From 6b354118e6aa6be8128085bd1606365b5019dc64 Mon Sep 17 00:00:00 2001 From: Doaa Muhammad Date: Wed, 6 Dec 2023 12:17:20 -0500 Subject: [PATCH 1/3] Worked on issue 3471, fixing rendered file names to inherit section name --- manim/scene/scene_file_writer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manim/scene/scene_file_writer.py b/manim/scene/scene_file_writer.py index d9e509de89..bc440f080f 100644 --- a/manim/scene/scene_file_writer.py +++ b/manim/scene/scene_file_writer.py @@ -191,7 +191,7 @@ def next_section(self, name: str, type: str, skip_animations: bool) -> None: and not skip_animations ): # relative to index file - section_video = f"{self.output_name}_{len(self.sections):04}{config.movie_file_extension}" + section_video = f"{self.output_name}_{name}{config.movie_file_extension}" self.sections.append( Section( From 522f9051407a67d5be23624ba23703b8381c00b2 Mon Sep 17 00:00:00 2001 From: Doaa Muhammad Date: Sat, 9 Dec 2023 18:14:14 -0500 Subject: [PATCH 2/3] Modified file name to include section number and name --- manim/scene/scene_file_writer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manim/scene/scene_file_writer.py b/manim/scene/scene_file_writer.py index bc440f080f..f3e5c08a4a 100644 --- a/manim/scene/scene_file_writer.py +++ b/manim/scene/scene_file_writer.py @@ -191,7 +191,7 @@ def next_section(self, name: str, type: str, skip_animations: bool) -> None: and not skip_animations ): # relative to index file - section_video = f"{self.output_name}_{name}{config.movie_file_extension}" + section_video = f"{self.output_name}_{len(self.sections):04}_{name}{config.movie_file_extension}" self.sections.append( Section( From c02e87d7ae5d44e5020030a8fe89fc1d894d887e Mon Sep 17 00:00:00 2001 From: Doaa Muhammad Date: Sat, 9 Dec 2023 21:05:19 -0500 Subject: [PATCH 3/3] Modified tests for file names to include number and name, in order to pass --- .../videos_data/SceneWithEnabledSections.json | 4 ++-- .../videos_data/SceneWithSections.json | 20 +++++++++---------- .../videos_data/SceneWithSkipAnimations.json | 12 +++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/control_data/videos_data/SceneWithEnabledSections.json b/tests/control_data/videos_data/SceneWithEnabledSections.json index 7f0656b815..7b47b1919f 100644 --- a/tests/control_data/videos_data/SceneWithEnabledSections.json +++ b/tests/control_data/videos_data/SceneWithEnabledSections.json @@ -10,14 +10,14 @@ }, "section_dir_layout": [ "SquareToCircle.json", - "SquareToCircle_0000.mp4", + "SquareToCircle_0000_autocreated.mp4", "." ], "section_index": [ { "name": "autocreated", "type": "default.normal", - "video": "SquareToCircle_0000.mp4", + "video": "SquareToCircle_0000_autocreated.mp4", "codec_name": "h264", "width": 854, "height": 480, diff --git a/tests/control_data/videos_data/SceneWithSections.json b/tests/control_data/videos_data/SceneWithSections.json index 289558d2c9..575842ee38 100644 --- a/tests/control_data/videos_data/SceneWithSections.json +++ b/tests/control_data/videos_data/SceneWithSections.json @@ -10,18 +10,18 @@ }, "section_dir_layout": [ "SceneWithSections.json", - "SceneWithSections_0004.mp4", - "SceneWithSections_0003.mp4", - "SceneWithSections_0002.mp4", - "SceneWithSections_0001.mp4", - "SceneWithSections_0000.mp4", + "SceneWithSections_0004_unnamed.mp4", + "SceneWithSections_0003_Prepare For Unforeseen Consequences..mp4", + "SceneWithSections_0002_test.mp4", + "SceneWithSections_0001_unnamed.mp4", + "SceneWithSections_0000_autocreated.mp4", "." ], "section_index": [ { "name": "autocreated", "type": "default.normal", - "video": "SceneWithSections_0000.mp4", + "video": "SceneWithSections_0000_autocreated.mp4", "codec_name": "h264", "width": 854, "height": 480, @@ -32,7 +32,7 @@ { "name": "unnamed", "type": "default.normal", - "video": "SceneWithSections_0001.mp4", + "video": "SceneWithSections_0001_unnamed.mp4", "codec_name": "h264", "width": 854, "height": 480, @@ -43,7 +43,7 @@ { "name": "test", "type": "default.normal", - "video": "SceneWithSections_0002.mp4", + "video": "SceneWithSections_0002_test.mp4", "codec_name": "h264", "width": 854, "height": 480, @@ -54,7 +54,7 @@ { "name": "Prepare For Unforeseen Consequences.", "type": "default.normal", - "video": "SceneWithSections_0003.mp4", + "video": "SceneWithSections_0003_Prepare For Unforeseen Consequences..mp4", "codec_name": "h264", "width": 854, "height": 480, @@ -65,7 +65,7 @@ { "name": "unnamed", "type": "presentation.skip", - "video": "SceneWithSections_0004.mp4", + "video": "SceneWithSections_0004_unnamed.mp4", "codec_name": "h264", "width": 854, "height": 480, diff --git a/tests/control_data/videos_data/SceneWithSkipAnimations.json b/tests/control_data/videos_data/SceneWithSkipAnimations.json index 2dbb670d8d..afe9efe028 100644 --- a/tests/control_data/videos_data/SceneWithSkipAnimations.json +++ b/tests/control_data/videos_data/SceneWithSkipAnimations.json @@ -10,16 +10,16 @@ }, "section_dir_layout": [ "ElaborateSceneWithSections.json", - "ElaborateSceneWithSections_0003.mp4", - "ElaborateSceneWithSections_0001.mp4", - "ElaborateSceneWithSections_0000.mp4", + "ElaborateSceneWithSections_0003_fade out.mp4", + "ElaborateSceneWithSections_0001_transform to circle.mp4", + "ElaborateSceneWithSections_0000_create square.mp4", "." ], "section_index": [ { "name": "create square", "type": "default.normal", - "video": "ElaborateSceneWithSections_0000.mp4", + "video": "ElaborateSceneWithSections_0000_create square.mp4", "codec_name": "h264", "width": 854, "height": 480, @@ -30,7 +30,7 @@ { "name": "transform to circle", "type": "default.normal", - "video": "ElaborateSceneWithSections_0001.mp4", + "video": "ElaborateSceneWithSections_0001_transform to circle.mp4", "codec_name": "h264", "width": 854, "height": 480, @@ -41,7 +41,7 @@ { "name": "fade out", "type": "default.normal", - "video": "ElaborateSceneWithSections_0003.mp4", + "video": "ElaborateSceneWithSections_0003_fade out.mp4", "codec_name": "h264", "width": 854, "height": 480,