From 56c4981340eba230ba6c136b7c3b81b7f885d940 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Wed, 19 Mar 2025 23:59:19 -0400 Subject: [PATCH] chore: better template files list --- joj3_config_generator/loader.py | 7 +------ joj3_config_generator/models/answer.py | 9 ++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/joj3_config_generator/loader.py b/joj3_config_generator/loader.py index cbb3ee3..fa20876 100644 --- a/joj3_config_generator/loader.py +++ b/joj3_config_generator/loader.py @@ -1,4 +1,3 @@ -from importlib import resources from pathlib import Path from typing import Tuple, Type, cast @@ -17,11 +16,7 @@ def load_joj3_task_toml_answers() -> answer.Answers: language = cast(Type[answer.LanguageInterface], language) if inquirer.confirm("Load content from templates?", default=True): answers = inquirer.prompt(language.get_template_questions()) - templates_dir = resources.files(f"joj3_config_generator.templates").joinpath( - language.name - ) - template_file_path = answers["template_file"] - template_file_content = Path(templates_dir / template_file_path).read_text() + template_file_content: str = answers["template_file_content"] return answer.Answers( name=name, language=language, template_file_content=template_file_content ) diff --git a/joj3_config_generator/models/answer.py b/joj3_config_generator/models/answer.py index 3be9fd7..78cc2de 100644 --- a/joj3_config_generator/models/answer.py +++ b/joj3_config_generator/models/answer.py @@ -33,16 +33,15 @@ class LanguageInterface(ABC): @classmethod def get_template_questions(cls) -> List[Any]: - templates_dir = resources.files(f"joj3_config_generator.templates").joinpath( - cls.name - ) + anchor = "joj3_config_generator.templates" + templates_dir = resources.files(anchor).joinpath(cls.name) choices = [] for entry in templates_dir.iterdir(): if entry.is_file() and entry.name.endswith(".toml"): - choices.append(entry.name) + choices.append((entry.name, entry.read_text())) return [ inquirer.List( - "template_file", + "template_file_content", message="Which template file do you want?", choices=choices, ),