From 85a32a19cc772d079e2368e6718efcbf20fdbc9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Ke=C3=9Fler?= Date: Sun, 6 Feb 2022 20:43:49 +0100 Subject: [PATCH] fix builder class --- PyTeX/build/build/builder.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/PyTeX/build/build/builder.py b/PyTeX/build/build/builder.py index cedcced..f004ab3 100644 --- a/PyTeX/build/build/builder.py +++ b/PyTeX/build/build/builder.py @@ -5,6 +5,7 @@ from PyTeX.build.build import BuildDirSpecification from PyTeX.build.enums import PyTeXRootDirType from PyTeX.format.formatting_config import FormattingConfig from ...logger import logger +from .pytex_config import PyTeXConfig class PyTeXBuilder: @@ -14,6 +15,7 @@ class PyTeXBuilder: ): self._build_target_type: Optional[PyTeXRootDirType] = None + self._pytex_config: Optional[PyTeXConfig] = None def build_tex_sources(self): self._build_target_type = PyTeXRootDirType.TEX_SOURCE @@ -32,20 +34,27 @@ class PyTeXBuilder: raise NotImplementedError self._build() + @property + def pytex_config(self) -> PyTeXConfig: + if self._pytex_config is None: + return PyTeXConfig() + else: + return self._pytex_config + @property def target_root(self) -> Path: return { - PyTeXRootDirType.BUILD: self._build_spec.build_root, - PyTeXRootDirType.DOC: self._build_spec.doc_root, - PyTeXRootDirType.TEX_SOURCE: self._build_spec.tex_source_root, + PyTeXRootDirType.BUILD: self.pytex_config.build_dir_specification.build_root, + PyTeXRootDirType.DOC: self.pytex_config.build_dir_specification.doc_root, + PyTeXRootDirType.TEX_SOURCE: self.pytex_config.build_dir_specification.tex_source_root, }[self._build_target_type] @property def source_root(self) -> Path: return { - PyTeXRootDirType.BUILD: self._build_spec.tex_source_root, - PyTeXRootDirType.DOC: self._build_spec.tex_source_root, - PyTeXRootDirType.TEX_SOURCE: self._build_spec.pytex_source_root, + PyTeXRootDirType.BUILD: self.pytex_config.build_dir_specification.tex_source_root, + PyTeXRootDirType.DOC: self.pytex_config.build_dir_specification.tex_source_root, + PyTeXRootDirType.TEX_SOURCE: self.pytex_config.build_dir_specification.pytex_source_root, }[self._build_target_type] def get_git_version_info(self):