From a397ad3e32cd70c054e52a0909ec6cba0e57b93f Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Sat, 25 Feb 2023 16:05:59 +0100
Subject: [PATCH] fix(playout): use package loader for liquidsoap templates

---
 playout/libretime_playout/liquidsoap/entrypoint.py          | 6 ++----
 .../liquidsoap/{ => templates}/entrypoint.liq.j2            | 0
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename playout/libretime_playout/liquidsoap/{ => templates}/entrypoint.liq.j2 (100%)

diff --git a/playout/libretime_playout/liquidsoap/entrypoint.py b/playout/libretime_playout/liquidsoap/entrypoint.py
index 6a3635804..31fb05600 100644
--- a/playout/libretime_playout/liquidsoap/entrypoint.py
+++ b/playout/libretime_playout/liquidsoap/entrypoint.py
@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Optional, Tuple
 
-from jinja2 import DictLoader, Environment
+from jinja2 import Environment, PackageLoader
 from libretime_shared.config import AudioFormat, IcecastOutput, SystemOutput
 
 from ..config import Config
@@ -10,9 +10,7 @@ from .utils import quote
 
 here = Path(__file__).parent
 
-templates_loader = DictLoader(
-    {"entrypoint.liq.j2": (here / "entrypoint.liq.j2").read_text(encoding="utf-8")}
-)
+templates_loader = PackageLoader(__name__, "templates")
 templates = Environment(  # nosec
     loader=templates_loader,
     keep_trailing_newline=True,
diff --git a/playout/libretime_playout/liquidsoap/entrypoint.liq.j2 b/playout/libretime_playout/liquidsoap/templates/entrypoint.liq.j2
similarity index 100%
rename from playout/libretime_playout/liquidsoap/entrypoint.liq.j2
rename to playout/libretime_playout/liquidsoap/templates/entrypoint.liq.j2