mirror of
https://github.com/3b1b/manim.git
synced 2025-08-05 16:49:03 +00:00
Change how ModuleLoader receives is_reload information
Use on the fly import of reload_manager rather than altering the args
This commit is contained in:
parent
dd251ab8c2
commit
d357e21c1d
2 changed files with 4 additions and 5 deletions
|
@ -215,7 +215,7 @@ def get_indent(line: str):
|
||||||
|
|
||||||
|
|
||||||
def get_module_with_inserted_embed_line(
|
def get_module_with_inserted_embed_line(
|
||||||
file_name: str, scene_name: str, line_marker: str, is_during_reload
|
file_name: str, scene_name: str, line_marker: str
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
This is hacky, but convenient. When user includes the argument "-e", it will try
|
This is hacky, but convenient. When user includes the argument "-e", it will try
|
||||||
|
@ -277,7 +277,8 @@ def get_module_with_inserted_embed_line(
|
||||||
with open(new_file, 'w') as fp:
|
with open(new_file, 'w') as fp:
|
||||||
fp.writelines(new_lines)
|
fp.writelines(new_lines)
|
||||||
|
|
||||||
module = ModuleLoader.get_module(new_file, is_during_reload)
|
from manimlib.reload_manager import reload_manager
|
||||||
|
module = ModuleLoader.get_module(new_file, is_during_reload=reload_manager.is_reload)
|
||||||
# This is to pretend the module imported from the edited lines
|
# This is to pretend the module imported from the edited lines
|
||||||
# of code actually comes from the original file.
|
# of code actually comes from the original file.
|
||||||
module.__file__ = file_name
|
module.__file__ = file_name
|
||||||
|
@ -291,9 +292,8 @@ def get_scene_module(args: Namespace) -> Module:
|
||||||
if args.embed is None:
|
if args.embed is None:
|
||||||
return ModuleLoader.get_module(args.file)
|
return ModuleLoader.get_module(args.file)
|
||||||
else:
|
else:
|
||||||
is_reload = args.is_reload if hasattr(args, "is_reload") else False
|
|
||||||
return get_module_with_inserted_embed_line(
|
return get_module_with_inserted_embed_line(
|
||||||
args.file, args.scene_names[0], args.embed, is_reload
|
args.file, args.scene_names[0], args.embed
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,6 @@ class ReloadManager:
|
||||||
self.args.embed = str(overwrite_start_at_line)
|
self.args.embed = str(overwrite_start_at_line)
|
||||||
|
|
||||||
# Args to Config
|
# Args to Config
|
||||||
self.args.is_reload = self.is_reload # Where is this used?
|
|
||||||
scene_config = manimlib.config.get_scene_config(self.args)
|
scene_config = manimlib.config.get_scene_config(self.args)
|
||||||
run_config = manimlib.config.get_run_config(self.args)
|
run_config = manimlib.config.get_run_config(self.args)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue