style: format code

This commit is contained in:
2026-06-12 00:16:15 +03:00
parent 91e2c9d123
commit f368e6717c
28 changed files with 121 additions and 166 deletions

View File

@@ -3,11 +3,8 @@ from typing import NamedTuple
from fastapi import APIRouter, Request
from fastapi.responses import HTMLResponse
from fastapi.templating import Jinja2Templates
from gallery.version import __version__
from ..translation import _
from ..common.utils.template import build_templates
class Section(NamedTuple):
@@ -25,8 +22,7 @@ base_dir = Path(__file__).parent
router = APIRouter()
templates = Jinja2Templates(directory=base_dir / "templates")
templates.env.globals.update({"_": _})
templates = build_templates()
@router.get("/", response_class=HTMLResponse)
@@ -35,7 +31,6 @@ async def get_section_list(request: Request):
request=request,
name="root_index.html",
context={
"version": __version__,
"sections": SECTIONS,
},
)

View File

@@ -112,7 +112,7 @@
Created by shmyga · © 2026
</footer>
</div>
<script>
{# <script>
(function () {
const params = new URLSearchParams(window.location.search);
const widget = params.get('widget') || window.location.hostname.startsWith('weather');
@@ -120,7 +120,7 @@
document.body.classList.add('widget');
}
}());
</script>
</script> #}
</body>
</html>

View File

@@ -0,0 +1,25 @@
from pathlib import Path
from babel.dates import format_date
from fastapi.templating import Jinja2Templates
from gallery.version import __version__
from ...translation import _
def build_templates(templates_dir: Path | None = None, filters: dict | None = None) -> Jinja2Templates:
directory = [Path(__file__).parent.parent / "templates"]
if templates_dir:
directory.append(templates_dir)
templates = Jinja2Templates(directory=directory)
templates.env.globals.update(
{
"_": _,
"version": __version__,
"format_date": format_date,
}
)
if filters:
templates.env.filters.update(filters)
return templates

View File

@@ -1,34 +1,22 @@
import datetime
from pathlib import Path
from babel.dates import format_date
from fastapi import APIRouter
from fastapi.responses import HTMLResponse, RedirectResponse
from fastapi.templating import Jinja2Templates
from gallery.easel.core import AppRequest
from gallery.sketch.schedule.catalog import BUNDLE
from gallery.version import __version__
from ..common.util import TagType, TagUtil
from ..translation import _
from ..common.utils.tag import TagType, TagUtil
from ..common.utils.template import build_templates
from .filters import timedelta_format
base_dir = Path(__file__).parent
templates = Jinja2Templates(
directory=[
base_dir.parent / "common/templates",
base_dir / "templates",
]
)
templates.env.globals.update(
templates = build_templates(
Path(__file__).parent / "templates",
{
"_": _,
"version": __version__,
"format_date": format_date,
}
"timedelta_format": timedelta_format,
},
)
templates.env.filters["timedelta_format"] = timedelta_format
router = APIRouter()
@@ -42,7 +30,6 @@ async def get_schedule_list(request: AppRequest):
request=request,
name="index.html",
context={
"version": __version__,
"channels": channels_data,
},
)
@@ -57,7 +44,6 @@ async def get_schedule_tag(request: AppRequest, tag: str, live: bool = False):
request=request,
name="schedule.html",
context={
"version": __version__,
"tag_util": TagUtil,
"datetime": datetime,
"response": results[0],
@@ -84,7 +70,6 @@ async def get_channel_tag(request: AppRequest, channel: str, tag: str):
request=request,
name="channel.html",
context={
"version": __version__,
"tag_util": TagUtil,
"datetime": datetime,
"response": response,

View File

@@ -5,9 +5,7 @@ from fastapi import Cookie, Header, Request
from gallery.util import root_path
_translation: ContextVar[gettext.GNUTranslations | gettext.NullTranslations] = (
ContextVar("translation")
)
_translation: ContextVar[gettext.GNUTranslations | gettext.NullTranslations] = ContextVar("translation")
async def set_language(
@@ -19,9 +17,7 @@ async def set_language(
lang = language or accept_language.split(",")[0].split("-")[0]
try:
t = gettext.translation(
"messages", localedir=root_path / "locales", languages=[lang]
)
t = gettext.translation("messages", localedir=root_path / "locales", languages=[lang])
except FileNotFoundError:
t = gettext.NullTranslations()

View File

@@ -3,33 +3,21 @@ from pathlib import Path
from fastapi import APIRouter
from fastapi.responses import HTMLResponse, RedirectResponse
from fastapi.templating import Jinja2Templates
from babel.dates import format_date
from gallery.easel.core import AppRequest
from gallery.sketch.weather.model import WeatherResponse
from gallery.version import __version__
from ..common.util import TagType, TagUtil
from ..translation import _
from ..common.utils.tag import TagType, TagUtil
from ..common.utils.template import build_templates
from .filters import cloudness_icon, wind_direction_icon
base_dir = Path(__file__).parent
templates = Jinja2Templates(
directory=[
base_dir.parent / "common/templates",
base_dir / "templates",
]
)
templates.env.globals.update(
templates = build_templates(
Path(__file__).parent / "templates",
{
"_": _,
"version": __version__,
"format_date": format_date,
}
"wind_direction_icon": wind_direction_icon,
"cloudness_icon": cloudness_icon,
},
)
templates.env.filters["wind_direction_icon"] = wind_direction_icon
templates.env.filters["cloudness_icon"] = cloudness_icon
def build_weather_response(request: AppRequest, response: WeatherResponse):