LCPQ/spip2md
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes & debugging messages

Browse Source
This commit is contained in:
Guilhem Fauré 2023-06-02 15:02:35 +02:00
parent 27fca09e18
commit 5cacf17ad1
1 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
spip2md/extended_models.py
View File

@ -40,7 +40,7 @@ from spip2md.spip_models import (
SpipDocumentsLiens, SpipDocumentsLiens,
SpipRubriques, SpipRubriques,
) )
from spip2md.style import BLUE, BOLD, CYAN, GREEN, WARNING_STYLE, YELLOW, esc from spip2md.style import BOLD, CYAN, GREEN, WARNING_STYLE, YELLOW, esc
# Define recursive list type # Define recursive list type
RecursiveList = list["str | RecursiveList"] RecursiveList = list["str | RecursiveList"]
@ -249,13 +249,18 @@ class WritableObject(SpipInterface):
# Perform all the write steps of this object # Perform all the write steps of this object
def write_all( def write_all(
self, parentdepth: int, parentdir: str, index: int, total: int self,
parentdepth: int,
parentdir: str,
index: int,
total: int,
prepend: str = "",
) -> RecursiveList: ) -> RecursiveList:
LOG.debug(f"Writing {type(self).__name__} `{self._title}`") LOG.debug(f"Writing {type(self).__name__} `{self._title}`")
output: RecursiveList = [] output: RecursiveList = []
self._depth = parentdepth + 1 self._depth = parentdepth + 1
self._parentdir = parentdir self._parentdir = parentdir
for m in self.begin_message(index, total): for m in self.begin_message(index, total, prepend):
output.append(m) output.append(m)
try: try:
output[-1] += self.end_message(self.write()) output[-1] += self.end_message(self.write())
@ -354,11 +359,6 @@ class RedactionalObject(WritableObject):
f"{lang} `{self._title}` `{convertattr}`" f"{lang} `{self._title}` `{convertattr}`"
+ f" set to `{self._translations[lang][convertattr]}`" + f" set to `{self._translations[lang][convertattr]}`"
) )
log.debug(
f"Original lang `{self.lang}` `{self._title}` `{spipattr}`"
+ f" set to `{original_translation}`"
)
return original_translation return original_translation
def replace_links( def replace_links(
@ -367,7 +367,6 @@ class RedactionalObject(WritableObject):
mapping: tuple, mapping: tuple,
obj_type: type[NormalizedSection | NormalizedArticle | NormalizedDocument], obj_type: type[NormalizedSection | NormalizedArticle | NormalizedDocument],
) -> str: ) -> str:
LOG.debug(f"Convert {type(obj_type).__name__} links of `{self._title}`")
for id_link, path_link in mapping: for id_link, path_link in mapping:
# print(f"Looking for links like {id_link}") # print(f"Looking for links like {id_link}")
for match in id_link.finditer(text): for match in id_link.finditer(text):
@ -399,47 +398,63 @@ class RedactionalObject(WritableObject):
def convert_title(self) -> str: def convert_title(self) -> str:
LOG.debug(f"Convert title of currently untitled {type(self).__name__}") LOG.debug(f"Convert title of currently untitled {type(self).__name__}")
if hasattr(self, "_title"): if hasattr(self, "_title"):
LOG.debug(f"{type(self).__name__} {self._title}._title is already set") LOG.debug(f"{type(self).__name__} {self._title} _title is already set")
return self._title return self._title
if self.titre is None: if self.titre is None:
LOG.debug(f"{type(self).__name__}.title is None") LOG.debug(f"{type(self).__name__} title is None")
return "" return ""
if len(self.titre) == 0: if len(self.titre) == 0:
LOG.debug(f"{type(self).__name__}.title is empty") LOG.debug(f"{type(self).__name__} title is empty")
return "" return ""
self._title = self.titre.strip() # Define temporary title to use in functions self._title = self.titre.strip() # Define temporary title to use in functions
self._title = self.translate_multi("titre", "_title") self._title = self.translate_multi("titre", "_title")
LOG.debug(
f"`{self.lang}` `{self._title}` title was translated to : `{self._title}`"
)
LOG.debug(f"Convert document links of `{self._title}`")
self._title = self.replace_links(self._title, DOCUMENT_LINK, Document)
LOG.debug(f"Convert article links of `{self._title}`")
self._title = self.replace_links(self._title, ARTICLE_LINK, Article)
LOG.debug(f"Convert section links of `{self._title}`")
self._title = self.replace_links(self._title, SECTION_LINK, Section)
return self.convert_field(self._title) return self.convert_field(self._title)
def convert_text(self) -> str: def convert_text(self) -> str:
LOG.debug(f"Convert text of `{self._title}`") LOG.debug(f"Convert text of `{self._title}`")
if hasattr(self, "_text"): if hasattr(self, "_text"):
LOG.debug(f"{type(self).__name__} {self._title}._text is already set") LOG.debug(f"{type(self).__name__} {self._title} _text is already set")
return self._text return self._text
if self.texte is None: if self.texte is None:
LOG.debug(f"{type(self).__name__} {self._title}.text is None") LOG.debug(f"{type(self).__name__} {self._title} text is None")
return "" return ""
if len(self.texte) == 0: if len(self.texte) == 0:
LOG.debug(f"{type(self).__name__} {self._title}.text is empty") LOG.debug(f"{type(self).__name__} {self._title} text is empty")
return "" return ""
text: str = self.translate_multi("texte", "_title") self._text = self.translate_multi("texte", "_title")
text = self.replace_links(text, DOCUMENT_LINK, Document) LOG.debug(f"Convert document links of `{self._title}`")
text = self.replace_links(text, ARTICLE_LINK, Article) self._text = self.replace_links(self._text, DOCUMENT_LINK, Document)
text = self.replace_links(text, SECTION_LINK, Section) LOG.debug(f"Convert article links of `{self._title}`")
return self.convert_field(text) self._text = self.replace_links(self._text, ARTICLE_LINK, Article)
LOG.debug(f"Convert section links of `{self._title}`")
self._text = self.replace_links(self._text, SECTION_LINK, Section)
return self.convert_field(self._text)
def convert_extra(self) -> str: def convert_extra(self) -> str:
LOG.debug(f"Convert extra of `{self._title}`") LOG.debug(f"Convert extra of `{self._title}`")
if hasattr(self, "_extra"): if hasattr(self, "_extra"):
LOG.debug(f"{type(self).__name__} {self._title} _extra is already set")
return self._extra return self._extra
if self.extra is None: if self.extra is None:
LOG.debug(f"{type(self).__name__} {self._title} extra is None")
return "" return ""
if len(self.extra) == 0: if len(self.extra) == 0:
LOG.debug(f"{type(self).__name__} {self._title} extra is empty")
return "" return ""
text: str = self.extra LOG.debug(f"Convert article links of `{self._title}`")
text = self.replace_links(text, ARTICLE_LINK, Article) self._extra = self.replace_links(self.extra, ARTICLE_LINK, Article)
text = self.replace_links(text, SECTION_LINK, Section) LOG.debug(f"Convert section links of `{self._title}`")
return self.convert_field(text) self._extra = self.replace_links(self._extra, SECTION_LINK, Section)
return self.convert_field(self._extra)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
# Initialise translation dict as empty, in the form lang: attr: value # Initialise translation dict as empty, in the form lang: attr: value
@ -449,6 +464,10 @@ class RedactionalObject(WritableObject):
self._choosen_language = self.langue_choisie == "oui" self._choosen_language = self.langue_choisie == "oui"
self._text = self.convert_text() self._text = self.convert_text()
self._extra = self.convert_extra() self._extra = self.convert_extra()
LOG.debug(
f"After __init__, `{type(self).__name__}` `{self._title}` contains"
+ f" translations: `{self._translations}`"
)
# Get related documents # Get related documents
def documents(self) -> tuple[Document]: def documents(self) -> tuple[Document]:
@ -523,6 +542,9 @@ class RedactionalObject(WritableObject):
# Replace the translated attributes of the translated object # Replace the translated attributes of the translated object
for attr, value in translated_attrs.items(): for attr, value in translated_attrs.items():
setattr(translation, attr, value) setattr(translation, attr, value)
LOG.debug(
f"{lang} `{self._title}` `{attr}`= `{getattr(translation, attr)}`"
)
return translations return translations
# Get the children of this object # Get the children of this object
@ -543,12 +565,19 @@ class RedactionalObject(WritableObject):
# Perform all the write steps of this object # Perform all the write steps of this object
def write_all( def write_all(
self, parentdepth: int, parentdir: str, index: int, total: int self,
parentdepth: int,
parentdir: str,
index: int,
total: int,
prepend: str = "",
) -> RecursiveList: ) -> RecursiveList:
output: RecursiveList = super().write_all(parentdepth, parentdir, index, total) output: RecursiveList = super().write_all(
parentdepth, parentdir, index, total, prepend
)
output.append(self.write_children()) output.append(self.write_children())
for translated in self.translations(): for i, translated in enumerate(self.translations()):
translated.write_all(parentdepth, parentdir, index, total) translated.write_all(parentdepth, parentdir, i, 0, self.lang)
return output return output