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

minor fixes

Browse Source
This commit is contained in:
Guilhem Fauré 2023-06-12 11:31:16 +02:00
parent e279365b8d
commit aef47c77c5
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spip2md/extended_models.py
View File

@ -20,7 +20,7 @@ from spip2md.config import CFG
from spip2md.regexmaps import (
ARTICLE_LINK,
BLOAT,
CONFIGLANGS,
CONFIG_LANGS,
DOCUMENT_LINK,
HTMLTAGS,
IMAGE_LINK,
@ -134,7 +134,7 @@ class WritableObject(SpipInterface):
text = old.sub("", text)
else:
for old in mapping:
text = old.replace("", text)
text = text.replace(old, "")
return text
# Warn about unknown chars & replace them with config defined replacement
@ -345,12 +345,12 @@ class RedactionalObject(WritableObject):
_text: str
# Get rid of other lang than forced in text and modify lang to forced if found
def translate_field(self, forced_lang: str, text: str) -> str:
def translate_multi(self, forced_lang: str, text: str) -> str:
LOG.debug(f"Translating <multi> blocks of `{self._title}`")
# for each <multi> blocks, keep only forced lang
lang: Optional[Match[str]] = None
for block in MULTILANG_BLOCK.finditer(text):
lang = CONFIGLANGS[forced_lang].search(block.group(1))
lang = CONFIG_LANGS[forced_lang].search(block.group(1))
if lang is not None:
# Log the translation
trans: str = lang.group(1)[:50].strip()
@ -499,11 +499,11 @@ class RedactionalObject(WritableObject):
self._title = self.titre.strip()
# Keep storage language title to store it
if CFG.storage_language is not None and CFG.storage_language != forced_lang:
self._storage_title = self.translate_field(
self._storage_title = self.translate_multi(
CFG.storage_language, self._title
)
self._storage_title = self.convert_field(self._storage_title)
self._title = self.translate_field(forced_lang, self._title)
self._title = self.translate_multi(forced_lang, self._title)
LOG.debug(f"Convert internal links of {self.lang} `{self._title}` title")
self._title = self.replace_links(self._title)
LOG.debug(f"Apply conversions to {self.lang} `{self._title}` title")
@ -522,7 +522,7 @@ class RedactionalObject(WritableObject):
LOG.debug(f"{type(self).__name__} {self._title} text is empty")
self._text = ""
return
self._text = self.translate_field(forced_lang, self.texte.strip())
self._text = self.translate_multi(forced_lang, self.texte.strip())
LOG.debug(f"Convert internal links of {self.lang} `{self._title}` text")
self._text = self.replace_links(self._text)
LOG.debug(f"Apply conversions to {self.lang} `{self._title}` text")

12
spip2md/regexmaps.py
View File

@ -13,11 +13,11 @@ SPIP_MARKDOWN = (
),
( # line break
compile(r"\r?\n_ *(?=\r?\n)|<br ?.*?>", I),
"\n", # WARNING not the real translation
"\n", # WARNING May not be the real translation
),
( # heading
compile(r"\r?\n?\r?\n?\{\{\{ *(.*?) *\}\}\}\r?\n?\r?\n?", S | I),
"\n\n## \\1\n\n", # Translate SPIP headings to h2
"\n\n## \\1\n\n", # Translate headings to h2
),
( # strong
compile(r"\{\{ *(.*?) *\}\} ?", S | I),
@ -151,13 +151,13 @@ IMAGE_REPL = r"![{}]({})" # Name and path can be further replaced with .format(
# Multi language block, to be further processed per lang
MULTILANG_BLOCK = compile(r"<multi>(.+?)<\/multi>", S | I)
MULTILANGS = compile( # Matches agains all langs of multi blocks
r"\[([a-zA-Z\-]{2,6})\]\s*(.+?)\s*(?=\[[a-zA-Z\-]{2,6}\]|$)", S | I
)
CONFIGLANGS = { # lang of configuration: (match against this lang)
CONFIG_LANGS = { # lang of configuration: (match against this lang)
lang: compile(r"\[ *" + lang + r" *\]\s*(.+?)\s*(?=\[[a-zA-Z\-]{2,6}\]|$)", S | I)
for lang in CFG.export_languages
}
# MULTILANGS = compile( # Matches agains all langs of multi blocks
# r"\[([a-zA-Z\-]{2,6})\]\s*(.+?)\s*(?=\[[a-zA-Z\-]{2,6}\]|$)", S | I
# )
# WARNING probably useless text in metadata fields, to be removed
BLOAT = (