From c5d9019b8a84bee9eb06404edf817556288806be Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Fri, 27 Oct 2023 14:14:46 -0400 Subject: [PATCH] update logos to svg versions --- docs/notebooks/figanos_docs.ipynb | 4 ++-- figanos/_logo.py | 27 +++++++++++---------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/docs/notebooks/figanos_docs.ipynb b/docs/notebooks/figanos_docs.ipynb index 833fb954..2478cd68 100644 --- a/docs/notebooks/figanos_docs.ipynb +++ b/docs/notebooks/figanos_docs.ipynb @@ -284,9 +284,9 @@ "outputs": [], "source": [ "# To set a new default logo we can simply use an existing entry\n", - "l.set_logo(l.ouranos_logo_horizontal_couleur, \"default\")\n", + "l.set_logo(l.logo-ouranos-horizontal-couleur, \"default\")\n", "print(f\"Default logo is found at: {l.default}\")\n", - "l.set_logo(l.ouranos_logo_vertical_couleur, \"my_custom_logo\")\n", + "l.set_logo(l.logo-ouranos-vertical-couleur, \"my_custom_logo\")\n", "print(f\"my_custom_logo installed at: {l.my_custom_logo}.\")\n", "\n", "# Show all installed logos\n", diff --git a/figanos/_logo.py b/figanos/_logo.py index e9d00c12..3e53bcc6 100644 --- a/figanos/_logo.py +++ b/figanos/_logo.py @@ -183,25 +183,20 @@ def install_ouranos_logos(self, *, permitted: bool = False) -> None: if permitted: for orientation in ["horizontal", "vertical"]: for colour in ["couleur", "blanc", "noir"]: - for suffix in ["png", "svg"]: - if suffix == "svg" and not ( - orientation == "horizontal" and colour == "couleur" - ): - continue - file = f"ouranos_logo_{orientation}_{colour}.{suffix}" - if not (self.config / file).exists(): - logo_url = urllib.parse.urljoin(OURANOS_LOGOS_URL, file) - try: - urllib.request.urlretrieve(logo_url, self.config / file) - self.set_logo(self.config / file) - except Exception as e: - logging.error( - f"Error downloading or setting Ouranos logo: {e}" - ) + file = f"logo-ouranos-{orientation}-{colour}.svg" + if not (self.config / file).exists(): + logo_url = urllib.parse.urljoin(OURANOS_LOGOS_URL, file) + try: + urllib.request.urlretrieve(logo_url, self.config / file) + self.set_logo(self.config / file) + except Exception as e: + logging.error( + f"Error downloading or setting Ouranos logo: {e}" + ) if Path(self.default).stem == "figanos_logo": _default_ouranos_logo = ( - self.config / "ouranos_logo_horizontal_couleur.svg" + self.config / "logo-ouranos-horizontal-couleur.svg" ) warnings.warn(f"Setting default logo to {_default_ouranos_logo}.") self.set_logo(_default_ouranos_logo, name="default")