Fix tests

This commit is contained in:
Kylian Schmidt
2026-04-22 14:42:25 +02:00
parent 27ea17246c
commit bec86d0f07
8 changed files with 132 additions and 56 deletions
+12 -12
View File
@@ -3,9 +3,13 @@
import shutil
from pathlib import Path
from typing import Dict, Any, Optional
from jinja2 import Environment, FileSystemLoader
from jinja2 import Environment, FileSystemLoader, Template
from gallery.config import GalleryConfig
from gallery.utils.datetime_utils import (
datetime_from_timestamp,
strftime_filter,
)
from gallery.utils.metadata import (
load_folder_metadata,
merge_metadata,
@@ -18,7 +22,7 @@ from gallery.utils.processing import (
)
def get_template(template_dir: Optional[Path] = None):
def get_template(template_dir: Optional[Path | str] = None):
"""
Get the Jinja2 template for gallery rendering.
@@ -29,6 +33,9 @@ def get_template(template_dir: Optional[Path] = None):
Returns:
Jinja2 Template object
"""
if isinstance(template_dir, str):
template_dir = Path(template_dir)
if template_dir is None:
# Use package-included template
import gallery
@@ -37,15 +44,6 @@ def get_template(template_dir: Optional[Path] = None):
env = Environment(loader=FileSystemLoader(str(template_dir)))
def datetime_from_timestamp(timestamp: float):
"""Convert a Unix timestamp to a datetime object."""
from datetime import datetime
return datetime.fromtimestamp(timestamp)
def strftime_filter(dt, fmt: str) -> str:
"""Format a datetime object using strftime."""
return dt.strftime(fmt)
env.filters['datetime_from_timestamp'] = datetime_from_timestamp
env.filters['strftime'] = strftime_filter
@@ -54,9 +52,9 @@ def get_template(template_dir: Optional[Path] = None):
def build_gallery(
config: GalleryConfig,
template,
source_dir: Path,
web_dir: Path,
template: Template = None,
relative_path: Path = None,
inherited_metadata: Optional[Dict[str, Any]] = None,
) -> None:
@@ -75,6 +73,8 @@ def build_gallery(
relative_path: Relative path from gallery root (for navigation)
inherited_metadata: Metadata inherited from parent directories
"""
if not template:
template = Template("./templates/gallery.html")
if relative_path is None:
relative_path = Path(".")