From c7f4814519d7b741f6134d9c551fbf2e9ae488f0 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Sun, 1 Jun 2025 07:03:43 +0200 Subject: Lettering: do not warn about fonts without jsons (#3766) --- lib/lettering/font.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/lettering/font.py') diff --git a/lib/lettering/font.py b/lib/lettering/font.py index 01971658..d1ed6154 100644 --- a/lib/lettering/font.py +++ b/lib/lettering/font.py @@ -79,20 +79,22 @@ class Font(object): variants -- A dict of FontVariants, with keys in FontVariant.VARIANT_TYPES. """ - def __init__(self, font_path): + def __init__(self, font_path, show_font_path_warning=True): self.path = font_path self.metadata = {} self.license = None self.variants = {} - self._load_metadata() + self._load_metadata(show_font_path_warning) self._load_license() - def _load_metadata(self): + def _load_metadata(self, show_font_path_warning=True): try: with open(os.path.join(self.path, "font.json"), encoding="utf-8-sig") as metadata_file: self.metadata = json.load(metadata_file) except IOError: + if not show_font_path_warning: + return path = os.path.join(self.path, "font.json") msg = _("JSON file missing. Expected a JSON file at the following location:") msg += f"\n{path}\n\n" @@ -100,6 +102,8 @@ class Font(object): msg += '\n\n' inkex.errormsg(msg) except json.decoder.JSONDecodeError as exception: + if not show_font_path_warning: + return path = os.path.join(self.path, "font.json") msg = _("Corrupt JSON file") msg += f" ({exception}):\n{path}\n\n" -- cgit v1.2.3