From d1a87b53569f10c5ef59037f7183a3191bd22c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Ke=C3=9Fler?= <git@maximilian-kessler.de>
Date: Mon, 7 Feb 2022 00:42:03 +0100
Subject: [PATCH] fix some bugs

---
 PyTeX/format/formatting_config.py | 20 +++++++++++++++++---
 PyTeX/format/generic_text.py      |  8 ++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/PyTeX/format/formatting_config.py b/PyTeX/format/formatting_config.py
index e98134b..1ffb39d 100644
--- a/PyTeX/format/formatting_config.py
+++ b/PyTeX/format/formatting_config.py
@@ -73,7 +73,21 @@ class FormattingConfig(Config):
         self._tex_flavour: Optional[TeXFlavour] = None
 
     def set_from_json(self, content: Dict):
-        pass
+        content = FormattingConfig().to_json() | content  # Fill with none values
+
+        info = content[YAML_INFO]
+        self._author = info[YAML_AUTHOR]
+        self._naming_scheme = info[YAML_NAMING_SCHEME]
+        self._tex_flavour = info[YAML_TEX_FLAVOUR]
+        self._tex_type = info[YAML_TEX_TYPE]
+        self._description = info[YAML_DESCRIPTION]
+
+        header = content[YAML_HEADER]
+        extra = header[YAML_EXTRA]
+        self._include_extra_header = extra[YAML_INCLUDE_EXTRA_HEADER]
+        self._extra_header = GenericText(
+            extra[YAML_PATH] if extra[YAML_PATH] else extra[YAML_TEXT]
+        )
 
     @classmethod
     def from_yaml(cls, content: Path):
@@ -111,13 +125,13 @@ class FormattingConfig(Config):
             YAML_HEADER: {
                 YAML_EXTRA: {
                     YAML_INCLUDE_EXTRA_HEADER: self._include_extra_header,
-                    YAML_PATH: self._extra_header.path if self._extra_header else None,
+                    YAML_PATH: self._extra_header.pathname if self._extra_header else None,
                     YAML_TEXT: self._extra_header.real_text if self._extra_header else None
                 },
                 YAML_REPO: {
                     YAML_INCLUDE_INFO_TEXT: self._include_repo_info_text,
                     YAML_INCLUDE_VERSION: self._include_repo_version,
-                    YAML_PATH: self._repo_info_text.path if self._repo_info_text else None,
+                    YAML_PATH: self._repo_info_text.pathname if self._repo_info_text else None,
                     YAML_TEXT: self._repo_info_text.real_text if self._repo_info_text else None
                 },
                 YAML_PYTEX: {
diff --git a/PyTeX/format/generic_text.py b/PyTeX/format/generic_text.py
index d7616d2..a89e39c 100644
--- a/PyTeX/format/generic_text.py
+++ b/PyTeX/format/generic_text.py
@@ -5,11 +5,11 @@ from ..logger import logger
 
 class GenericText:
     def __init__(self, content: Optional[Union[List[str], Path]] = None):
-        if isinstance(content, List):
+        if isinstance(content, list):
             self._content: Optional[List[str]] = content
             self._path = None
             self._initialized = True
-        if isinstance(content, Path):
+        elif isinstance(content, Path):
             self._content: Optional[List[str]] = None
             self._path = content
             self._initialized = True
@@ -52,6 +52,10 @@ class GenericText:
     def path(self) -> Optional[Path]:
         return self._path
 
+    @property
+    def pathname(self) -> Optional[str]:
+        return str(self._path) if self._path else None
+
     def format(self, **kwargs) -> str:
         lines = []
         for line in self.text: