ci(version): 0.8.3

.editorconfig

@@ -10,4 +10,4 @@ max_line_length = 120
 
 [*.md]
 max_line_length = off
-trim_trailing_whitespace = false
+trim_trailing_whitespace = true

.env-base

@@ -4,6 +4,7 @@ DOCKER_ROOT="$DOCKER_REPO/$DOCKER_GROUP"
 VERSION=$(grep -m 1 'version' ./pyproject.toml | grep -oP 'version\s*=\s*"\K[^"]+')
 PYTHON_VERSION=$(grep -m 1 'python' ./pyproject.toml | grep -oP 'python\s*=\s*"\^?\K[^"]+')
 DOCKER_PROJECTS=("gallery")
-DOCKER_TAG=latest
+DOCKER_TAG="${DOCKER_TAG:-latest}"
 
-OPENWEATHER_KEY="<EMPTY>"
+OPENWEATHER_KEY=""
+GISMETEO_AUTH=""

.pm.toml

@@ -0,0 +1,9 @@
+[presets.python.tasks.setup.playwright]
+conditions = ["{{ '.venv/bin/playwright' | file }}"]
+commands = [".venv/bin/playwright install chromium --with-deps --only-shell"]
+
+[presets.locales.tasks.build.locales]
+priority = 1
+conditions = ["{{ 'locales/ru/LC_MESSAGES' | file }}"]
+cwd = "locales/ru/LC_MESSAGES"
+commands = ["msgfmt messages.po"]

.pylintrc

@@ -4,23 +4,12 @@ ignore=.venv
 [MESSAGES CONTROL]
 disable=
     missing-docstring,
-    too-few-public-methods,
-    too-many-instance-attributes,
-    too-many-arguments,
-    too-many-locals,
-    too-many-boolean-expressions,
-    too-many-public-methods,
-    no-else-return,
-    singleton-comparison,
-    unused-argument,
-    unspecified-encoding,
     fixme,
+    invalid-name,
     duplicate-code,
-
-extension-pkg-allow-list=
-    lxml,
-    GeoIP,
-    pydantic
+    too-few-public-methods,
+    too-many-locals,
+    no-else-return,
 
 [MISCELLANEOUS]
 notes=FIXME,TODO

Dockerfile

@@ -23,12 +23,21 @@ COPY static ./
 RUN npm run build
 
 FROM python:3.14-slim
+
+ENV PLAYWRIGHT_BROWSERS_PATH="/opt/playwright-browsers"
+RUN  --mount=type=cache,target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,target=/var/lib/apt,sharing=locked \
+  pip install playwright && \
+  playwright install --with-deps chromium
+
 ENV PATH="/app/.venv/bin:$PATH"
+ENV TZ="Europe/Moscow"
+
 WORKDIR /app
 
-ENV TZ="Europe/Moscow"
 COPY --from=builder /app ./
 COPY --from=node-builder /app/dist ./static/dist
+
 COPY gallery gallery/
 COPY --from=builder --parents locales/**/*.mo ./
 

README.md

@@ -1,13 +1,75 @@
 # API Gallery
 
-Weather and TV program API
+Currently implemented APIs:
 
-![API Gallery](docs/screenshot.png "API Gallery")
+- Weather forecast
+- TV program
 
-## View
+## API
+
+Swagger: https://api.shmyga.ru/docs
+
+### Weather
+
+#### Providers list
+
+```
+https://api.shmyga.ru/api/weather/providers
+```
+
+#### Locations search
+
+```
+https://api.shmyga.ru/api/weather/{provider}/locations?query={query}
+```
+
+#### Weather forecast
+
+```
+https://api.shmyga.ru/api/weather/{provider}/{location_id}/day/{date}
+https://api.shmyga.ru/api/weather/{provider}/{location_id}/days/{days_count}
+```
+
+### TV program
+
+#### Providers list
+
+```
+https://api.shmyga.ru/api/schedule/providers
+```
+
+#### Channels search
+
+```
+https://api.shmyga.ru/api/schedule/{provider}/channels?query={query}
+```
+
+#### TV program
+
+```
+https://api.shmyga.ru/api/schedule/{provider}/{channel_id}/{date}
+```
+
+## Providers
+
+### Weather
+
+| Provider | Site | API sample |
+| :- | :- | :- |
+| gismeteo | https://www.gismeteo.ru | https://api.shmyga.ru/api/weather/gismeteo/orel-4432/day/today |
+| openweather | https://openweathermap.org | https://api.shmyga.ru/api/weather/openweather/52.9685433%3A36.0692477/day/today |
+| yandex | https://yandex.ru/pogoda | https://api.shmyga.ru/api/weather/yandex/10/day/today |
+| rp5 | https://rp5.ru | https://api.shmyga.ru/api/weather/rp5/Погода_в_Орле%2C_Орловская_область/day/today |
+
+### TV program
+
+| Provider | Site | API sample |
+| :- | :- | :- |
+| matchtv | https://matchtv.ru/tvguide | https://api.shmyga.ru/api/schedule/matchtv/igra/today |
+| yandextv | https://tv.yandex.ru | https://api.shmyga.ru/api/schedule/yandextv/146/today |
+
+## Demo
 
 https://api.shmyga.ru
 
-## Swagger
-
-https://api.shmyga.ru/docs
+![API Gallery](docs/screenshot.png "API Gallery")

docker-compose-develop.yaml

@@ -13,6 +13,7 @@ services:
     environment:
       - REDIS_HOST=redis
       - OPENWEATHER_KEY=$OPENWEATHER_KEY
+      - GISMETEO_AUTH=$GISMETEO_AUTH
       - DEBUG=1
     ports:
       - 8000:80

docker-compose.yaml

@@ -13,6 +13,7 @@ services:
     environment:
       - REDIS_HOST=redis
       - OPENWEATHER_KEY=$OPENWEATHER_KEY
+      - GISMETEO_AUTH=$GISMETEO_AUTH
     depends_on:
       - redis
     ports:

gallery.code-workspace

@@ -9,6 +9,7 @@
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
     "python.terminal.useEnvFile": true,
+    "python.analysis.importFormat": "relative",
     "python-envs.pythonProjects": [
       {
         "path": ".",

gallery/__init__.py

@@ -10,7 +10,7 @@ caches.set_config(
     {
         "default": {
             "cache": "aiocache.SimpleMemoryCache",
-            "serializer": {"class": "aiocache.serializers.StringSerializer"},
+            "serializer": {"class": "aiocache.serializers.PickleSerializer"},
         },
         "redis": {
             "cache": "aiocache.RedisCache",

gallery/easel/depends/date.py

@@ -0,0 +1,25 @@
+import datetime
+from typing import Annotated
+
+from fastapi import Depends, HTTPException, status
+
+
+def date_parser(date: str) -> datetime.date:
+    if date == "today":
+        return datetime.date.today()
+    elif date == "tomorrow":
+        return datetime.date.today() + datetime.timedelta(days=1)
+    elif date.startswith("day-"):
+        days = int(date.split("-")[-1])
+        return datetime.date.today() + datetime.timedelta(days=days)
+    else:
+        try:
+            return datetime.date.strptime(date, "%Y-%m-%d")
+        except ValueError as exc:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail={"date": f"{exc}"},
+            ) from exc
+
+
+DateDepends = Annotated[datetime.date, Depends(date_parser)]

gallery/easel/route/api/schedule.py

@@ -1,5 +1,3 @@
-import datetime
-
 from fastapi import APIRouter
 
 from gallery.easel.core import AppRequest
@@ -7,6 +5,8 @@ from gallery.easel.depends.schedule import ScheduleApiDepends
 from gallery.sketch.schedule.api import ScheduleApi
 from gallery.sketch.schedule.model import Channel, Schedule
 
+from ...depends.date import DateDepends
+
 router = APIRouter(prefix="/schedule", tags=["Schedule"])
 
 
@@ -22,6 +22,6 @@ async def find_api_schedule_channels(schedule_api: ScheduleApiDepends, query: st
 
 @router.get("/{provider}/{channel}/{date}")
 async def get_api_schedule_channel_schedule(
-    schedule_api: ScheduleApiDepends, channel: str, date: datetime.date
+    schedule_api: ScheduleApiDepends, channel: str, date: DateDepends
 ) -> Schedule:
     return await schedule_api.get_schedule(channel, date)

gallery/easel/route/api/weather.py

@@ -1,5 +1,3 @@
-import datetime
-
 from fastapi import APIRouter
 
 from gallery.easel.core import AppRequest
@@ -7,6 +5,8 @@ from gallery.easel.depends.weather import WeatherApiDepends
 from gallery.sketch.weather.api import WeatherApi
 from gallery.sketch.weather.model import Location, WeatherResponse
 
+from ...depends.date import DateDepends
+
 router = APIRouter(prefix="/weather", tags=["Weather"])
 
 
@@ -21,7 +21,7 @@ async def find_api_weather_locations(weather_api: WeatherApiDepends, query: str)
 
 
 @router.get("/{provider}/{location}/day/{date}")
-async def get_api_weather_day(weather_api: WeatherApiDepends, location: str, date: datetime.date) -> WeatherResponse:
+async def get_api_weather_day(weather_api: WeatherApiDepends, location: str, date: DateDepends) -> WeatherResponse:
     return await weather_api.get_day(location, date)
 
 

gallery/easel/route/view/common/templates/base.html

@@ -23,7 +23,6 @@
   <div class="app col-lg-8 mx-auto p-3 py-md-5">
     {% if not is_widget %}
     <header class="app-header pb-3 mb-5 border-bottom">
-      <div>{{request.query_params.widget}}</div>
       <div class="link-list">
         <app-link href="/"
                   icon="gear">API Gallery</app-link>

gallery/easel/route/view/common/utils/tag.py

@@ -1,57 +0,0 @@
-import datetime
-from enum import Enum
-from typing import NamedTuple
-
-
-class TagType(str, Enum):
-    DAY = "day"
-    DAYS = "days"
-
-
-class Tag(NamedTuple):
-    type: TagType
-    date: datetime.date
-    days: int = 1
-
-    def __str__(self) -> str:
-        if self.type == TagType.DAY:
-            today = datetime.date.today()
-            day = (self.date - today).days
-            return f"day-{day}"
-        elif self.type == TagType.DAYS:
-            return f"days-{self.days}"
-        else:
-            raise ValueError(self.type)
-
-
-class TagUtil:
-    @classmethod
-    def parse_tag(cls, tag: str) -> Tag:
-        if tag == "today":
-            return Tag(TagType.DAY, datetime.date.today())
-        elif tag == "tomorrow":
-            return Tag(TagType.DAY, datetime.date.today() + datetime.timedelta(days=1))
-        elif tag.startswith("day-"):
-            days = int(tag.split("-")[-1])
-            return Tag(
-                TagType.DAY,
-                datetime.date.today() + datetime.timedelta(days=days),
-            )
-        elif tag.startswith("days-"):
-            days = int(tag.split("-")[-1])
-            return Tag(TagType.DAYS, datetime.date.today(), days)
-        raise ValueError(tag)
-
-    @classmethod
-    def create_tag(
-        cls,
-        tag_type: TagType,
-        date: datetime.date,
-        day: int = 0,
-        days: int = 10,
-    ) -> Tag:
-        if tag_type == TagType.DAY:
-            return Tag(tag_type, date + datetime.timedelta(days=day))
-        if tag_type == TagType.DAYS:
-            return Tag(tag_type, date, days)
-        raise ValueError(tag_type)

gallery/easel/route/view/common/utils/template.py

@@ -1,6 +1,7 @@
 import datetime
 import typing
 from pathlib import Path
+from urllib.parse import parse_qsl, urlencode, urlsplit
 
 from babel.dates import format_date
 from fastapi import Request
@@ -10,7 +11,6 @@ from gallery.easel.core import AppRequest
 from gallery.version import __version__
 
 from ...translation import _
-from .tag import TagUtil
 
 ContextProcessor = typing.Callable[[AppRequest], dict[str, typing.Any]]
 
@@ -28,6 +28,26 @@ def base_context_processor(request: Request) -> dict:
     }
 
 
+def build_url(
+    request: Request, *, path: list[str] | None = None, up: int | None = None, query: dict | None = None
+) -> str:
+    parts = urlsplit(str(request.url))
+    if up:
+        path = [".."] * up
+    if path:
+        path_parts = parts.path.split("/")
+        for item in path:
+            if item == "..":
+                path_parts = path_parts[:-1]
+            else:
+                path_parts.append(str(item))
+        parts = parts._replace(path="/".join(path_parts))
+    if query:
+        query_dict = {**dict(parse_qsl(parts.query)), **query}
+        parts = parts._replace(query=urlencode(query_dict))
+    return "/".join([""] + parts.geturl().split("/")[3:])
+
+
 def build_templates(
     templates_dir: Path | None = None, filters: dict | None = None, context_processor: ContextProcessor | None = None
 ) -> Jinja2Templates:
@@ -44,8 +64,8 @@ def build_templates(
             "version": __version__,
             "format_date": format_date,
             "datetime": datetime,
-            "tag_util": TagUtil,
             "DATE_FORMAT": "E, d MMMM Y",
+            "build_url": build_url,
         }
     )
     if filters:

gallery/easel/route/view/schedule/__init__.py

@@ -1,70 +1 @@
-import datetime
-from pathlib import Path
-
-from fastapi import APIRouter
-from fastapi.responses import HTMLResponse, RedirectResponse
-
-from gallery.easel.core import AppRequest
-from gallery.easel.depends.api import api_resolver
-from gallery.easel.depends.schedule import ScheduleApiDepends
-from gallery.sketch.schedule.api import ScheduleApi
-
-from ..common.utils.tag import TagType, TagUtil
-from ..common.utils.template import build_templates
-from .filters import timedelta_format
-
-
-def context_procesor(request: AppRequest) -> dict:
-    return {
-        "providers": request.app.state.api.get_api_providers(ScheduleApi),
-    }
-
-
-templates = build_templates(
-    Path(__file__).parent / "templates",
-    {
-        "timedelta_format": timedelta_format,
-    },
-    context_procesor,
-)
-
-router = APIRouter(prefix="/schedule")
-
-
-@router.get("/", response_class=HTMLResponse)
-async def get_schedule_index(request: AppRequest, provider: str | None = None, query: str | None = None):
-    if query and provider:
-        schedule_api = api_resolver(ScheduleApi)(request, provider)
-        channels = await schedule_api.find_channels(query)
-    else:
-        channels = []
-    return templates.TemplateResponse(
-        request=request,
-        name="index.html",
-        context={
-            "channels": channels,
-        },
-    )
-
-
-@router.get("/{provider}/{channel}", response_class=RedirectResponse)
-async def get_channel_default(channel: str):
-    return RedirectResponse(f"{channel}/tag/today")
-
-
-@router.get("/{provider}/{channel}/tag/{tag}", response_class=HTMLResponse)
-async def get_channel_tag(request: AppRequest, schedule_api: ScheduleApiDepends, channel: str, tag: str):
-    tag_value = TagUtil.parse_tag(tag)
-    if tag_value.type == TagType.DAY:
-        response = await schedule_api.get_schedule(channel, tag_value.date)
-    else:
-        raise ValueError(tag)
-    return templates.TemplateResponse(
-        request=request,
-        name="channel.html",
-        context={
-            "tag_util": TagUtil,
-            "datetime": datetime,
-            "response": response,
-        },
-    )
+from .route import router

gallery/easel/route/view/schedule/bundle.py

@@ -0,0 +1,18 @@
+GROUP_MAP = {
+    "central": [
+        ("yandextv", "146"),  # pervyy
+        ("yandextv", "587"),  # rossya-1
+        ("yandextv", "162"),  # ntv
+        ("yandextv", "79"),  # sts
+    ],
+    "sport": [
+        ("matchtv", "matchtv"),
+        ("matchtv", "igra"),
+        ("matchtv", "arena"),
+        ("matchtv", "futbol-1"),
+        ("matchtv", "futbol-2"),
+        ("matchtv", "futbol-3"),
+        ("matchtv", "strana"),
+        ("yandextv", "1799"),  # start
+    ],
+}

gallery/easel/route/view/schedule/route.py

@@ -0,0 +1,86 @@
+import datetime
+from pathlib import Path
+from urllib import parse
+
+from fastapi import APIRouter
+from fastapi.responses import HTMLResponse, RedirectResponse
+
+from gallery.easel.core import AppRequest
+from gallery.easel.depends.api import api_resolver
+from gallery.easel.depends.date import DateDepends
+from gallery.easel.depends.schedule import ScheduleApiDepends
+from gallery.sketch.bundle import ApiBundle
+from gallery.sketch.schedule.api import ScheduleApi
+from gallery.sketch.schedule.model import Schedule
+
+from ..common.utils.template import build_templates
+from .bundle import GROUP_MAP
+from .filters import timedelta_format
+
+
+def context_procesor(request: AppRequest) -> dict:
+    return {
+        "providers": request.app.state.api.get_api_providers(ScheduleApi),
+    }
+
+
+templates = build_templates(
+    Path(__file__).parent / "templates",
+    {
+        "timedelta_format": timedelta_format,
+    },
+    context_procesor,
+)
+
+router = APIRouter(prefix="/schedule")
+
+
+@router.get("/", response_class=HTMLResponse)
+async def get_schedule_index(request: AppRequest, provider: str | None = None, query: str | None = None):
+    if query and provider:
+        schedule_api = api_resolver(ScheduleApi)(request, provider)
+        channels = await schedule_api.find_channels(query)
+    else:
+        channels = []
+    return templates.TemplateResponse(
+        request=request,
+        name="index.html",
+        context={"channels": [item.model_dump() for item in channels], "groups": GROUP_MAP.keys()},
+    )
+
+
+async def _get_group_schedule(api: ApiBundle, channels: list[tuple[str, str]], date: datetime.date) -> list[Schedule]:
+    return [
+        await api.get_api(ScheduleApi, provider).get_schedule(channel_id, date) for provider, channel_id in channels
+    ]
+
+
+@router.get("/group/{group_id}", response_class=RedirectResponse)
+async def get_group_default(group_id: str):
+    return RedirectResponse(f"{parse.quote(group_id)}/today")
+
+
+@router.get("/group/{group_id}/{date}", response_class=HTMLResponse)
+async def get_group(request: AppRequest, group_id: str, date: DateDepends):
+    channels = GROUP_MAP.get(group_id, [tuple(item.split(":")) for item in group_id.split(",")])
+    responses = await _get_group_schedule(request.app.state.api, channels, date)
+    return templates.TemplateResponse(
+        request=request,
+        name="group.html",
+        context={"responses": responses},
+    )
+
+
+@router.get("/{provider}/{channel}", response_class=RedirectResponse)
+async def get_channel_default(channel: str):
+    return RedirectResponse(f"{channel}/today")
+
+
+@router.get("/{provider}/{channel}/{date}", response_class=HTMLResponse)
+async def get_channel(request: AppRequest, schedule_api: ScheduleApiDepends, channel: str, date: DateDepends):
+    response = await schedule_api.get_schedule(channel, date)
+    return templates.TemplateResponse(
+        request=request,
+        name="channel.html",
+        context={"response": response},
+    )

gallery/easel/route/view/schedule/templates/channel.html

@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+{% set live = request.query_params.live == '1' %}
+{% set date = response.date %}
+
 {% block title %}
 {{_("TV program")}} | {{response.channel.name}} | {{format_date(response.date, DATE_FORMAT,
 locale=request.state.language)}}
@@ -10,19 +13,23 @@ locale=request.state.language)}}
 {% endblock %}
 
 {% block content %}
-<h4>
-  <a class="icon-link {{'disabled' if response.date == datetime.date.today() else ''}}"
-     href="../tag/{{tag_util.create_tag('day', response.date, -1)}}">
+<h4 class="mb-4">
+  <a class="icon-link {{'disabled' if date == datetime.date.today() else ''}}"
+     href="{{build_url(request, path=['..', date - datetime.timedelta(days=1)])}}">
     <i class="bi bi-arrow-left-square"></i>
   </a>
   <a class="icon-link"
-     href="../../..">
+     href="{{build_url(request, up=3)}}">
     <i class="bi bi-arrow-up-square"></i>
   </a>
+  <a class="icon-link {{'text-secondary' if not live else ''}}"
+     href="{{build_url(request, query={'live': 0 if live else 1})}}">
+    <i class="bi bi-cast"></i>
+  </a>
   <span class="badge rounded-pill text-bg-secondary fs-6">{{provider}}</span>
   <span>{{response.channel.name}} | {{format_date(response.date, DATE_FORMAT, locale=request.state.language)}}</span>
   <a class="icon-link"
-     href="../tag/{{tag_util.create_tag('day', response.date, 1)}}">
+     href="{{build_url(request, path=['..', date + datetime.timedelta(days=1)])}}">
     <i class="bi bi-arrow-right-square"></i>
   </a>
 </h4>
@@ -30,15 +37,14 @@ locale=request.state.language)}}
   <thead>
     <tr>
       <td></td>
-      <td></td>
+      <td style="width:100%"></td>
     </tr>
   </thead>
   <tbody>
     {% for value in response.values %}
-    <tr class="{{'table-success' if value.live else ''}}">
+    <tr class="{{'d-none' if (live and not value.live) else 'table-success' if (not live and value.live) else ''}}">
       <td>
-        <span>{{value.start.strftime('%H:%M')}}</span>
-        <span class="small ms-1">({{(value.end - value.start) | timedelta_format}})</span>
+        <span>{{value.start.strftime('%H:%M')}}</span>&nbsp;<span class="small ms-1">({{(value.end - value.start) | timedelta_format}})</span>
       </td>
       <td>{{value.label}}</td>
     </tr>

gallery/easel/route/view/schedule/templates/group.html

@@ -0,0 +1,59 @@
+{% extends "base.html" %}
+{% set live = request.query_params.live == '1' %}
+{% set date = responses[0].date %}
+
+{% block title %}
+{{_("TV program")}}
+{% endblock %}
+
+{% block header %}
+<app-link href="/schedule"
+          icon="tv">{{_("TV program")}}</app-link>
+{% endblock %}
+
+{% block content %}
+<h4 class="mb-4">
+  <a class="icon-link {{'disabled' if date == datetime.date.today() else ''}}"
+     href="{{build_url(request, path=['..', date - datetime.timedelta(days=1)])}}">
+    <i class="bi bi-arrow-left-square"></i>
+  </a>
+  <a class="icon-link"
+     href="{{build_url(request, up=3)}}">
+    <i class="bi bi-arrow-up-square"></i>
+  </a>
+  <a class="icon-link {{'text-secondary' if not live else ''}}"
+     href="{{build_url(request, query={'live': 0 if live else 1})}}">
+    <i class="bi bi-cast"></i>
+  </a>
+  <span>{{format_date(date, DATE_FORMAT, locale=request.state.language)}}</span>
+  <a class="icon-link"
+     href="{{build_url(request, path=['..', date + datetime.timedelta(days=1)])}}">
+    <i class="bi bi-arrow-right-square"></i>
+  </a>
+</h4>
+{% for response in responses %}
+<h5>
+  <span class="badge rounded-pill text-bg-secondary fs-6">{{response.channel.provider}}</span>
+  <span>{{response.channel.name}}</span>
+</h5>
+<table class="table">
+  <thead>
+    <tr>
+      <td></td>
+      <td style="width:100%"></td>
+    </tr>
+  </thead>
+  <tbody>
+    {% for value in response.values %}
+    <tr class="{{'d-none' if (live and not value.live) else 'table-success' if (not live and value.live) else ''}}">
+      <td>
+        <span>{{value.start.strftime('%H:%M')}}</span>&nbsp;<span class="small ms-1">({{(value.end - value.start) |
+          timedelta_format}})</span>
+      </td>
+      <td>{{value.label}}</td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+{% endfor %}
+{% endblock %}

gallery/easel/route/view/schedule/templates/index.html

@@ -35,17 +35,26 @@
   </div>
 </form>
 {% if channels %}
-<ul id="channels"
-    class="list-group mb-5">
-  {% for channel in channels %}
-  <schedule-channel channel="{{channel.model_dump() | tojson | forceescape}}"></schedule-channel>
-  {% endfor %}
-</ul>
-<hr>
+<div class="mb-4">
+  <schedule-channel-list value="{{channels | tojson | forceescape}}"
+                         onclick="scheduleChannelManager.store(element)"
+                         onadd="scheduleChannelManager.add(element)"></schedule-channel-list>
+  <hr>
+</div>
 {% endif %}
-<ul id="storedChannels"
-    class="list-group mb-5">
-</ul>
+<div class="mb-4">
+  <h3>{{_("Stored channels")}}</h3>
+  <schedule-channel-list id="storedChannels"
+                         onremove="scheduleChannelManager.remove(element)"></schedule-channel-list>
+</div>
+<div class="mb-4">
+  <h3>{{_("Channel groups")}}</h3>
+  <ul class="list-group">
+    {% for group in groups %}
+    <schedule-channel-group value="{{group | tojson | forceescape}}"></schedule-channel-group>
+    {% endfor %}
+  </ul>
+</div>
 <script>
   (function () {
     const params = new URLSearchParams(window.location.search);
@@ -53,9 +62,8 @@
     if (searchQuery) {
       document.querySelector('#query').value = searchQuery;
     }
-
     document.addEventListener("DOMContentLoaded", (event) => {
-      scheduleChannelManager.loadChannels('#storedChannels');
+      scheduleChannelManager.load();
     });
   })();
 </script>

gallery/easel/route/view/weather/__init__.py

@@ -1,102 +1 @@
-import datetime
-from pathlib import Path
-
-from fastapi import APIRouter
-from fastapi.responses import HTMLResponse, RedirectResponse
-
-from gallery.easel.core import AppRequest
-from gallery.easel.depends.api import api_resolver
-from gallery.easel.depends.weather import WeatherApiDepends
-from gallery.sketch.weather.api import WeatherApi
-from gallery.sketch.weather.model import WeatherResponse
-
-from ..common.utils.tag import TagType, TagUtil
-from ..common.utils.template import build_templates
-from .filters import cloudness_icon, weather_icon_svg, wind_direction_icon
-
-
-def context_procesor(request: AppRequest) -> dict:
-    return {
-        "providers": request.app.state.api.get_api_providers(WeatherApi),
-    }
-
-
-templates = build_templates(
-    Path(__file__).parent / "templates",
-    {
-        "wind_direction_icon": wind_direction_icon,
-        "cloudness_icon": cloudness_icon,
-        "weather_icon_svg": weather_icon_svg,
-    },
-    context_procesor,
-)
-
-
-def build_weather_response(request: AppRequest, response: WeatherResponse):
-    return templates.TemplateResponse(
-        request=request,
-        name="weather.html",
-        context={
-            "response": response,
-        },
-    )
-
-
-router = APIRouter(prefix="/weather")
-
-
-@router.get("/", response_class=HTMLResponse)
-async def get_weather_index(request: AppRequest, provider: str | None = None, query: str | None = None):
-    if query and provider:
-        weather_api = api_resolver(WeatherApi)(request, provider)
-        locations = await weather_api.find_locations(query)
-    else:
-        locations = []
-    return templates.TemplateResponse(
-        request=request,
-        name="index.html",
-        context={
-            "locations": locations,
-        },
-    )
-
-
-@router.get("/{provider}/{location}", response_class=RedirectResponse)
-async def get_weather(location: str):
-    return RedirectResponse(f"{location}/tag/today")
-
-
-@router.get("/{provider}/{location}/day/{date}", response_class=HTMLResponse)
-async def get_weather_day(
-    request: AppRequest,
-    weather_api: WeatherApiDepends,
-    location: str,
-    date: datetime.date,
-):
-    response = await weather_api.get_day(location, date)
-    return build_weather_response(request, response)
-
-
-@router.get("/{provider}/{location}/days/{days}", response_class=HTMLResponse)
-async def get_weather_days(request: AppRequest, weather_api: WeatherApiDepends, location: str, days: int):
-    response = await weather_api.get_days(location, days)
-    return build_weather_response(request, response)
-
-
-@router.get("/{provider}/{location}/tag/{tag}", response_class=HTMLResponse)
-async def get_weather_tag(request: AppRequest, weather_api: WeatherApiDepends, location: str, tag: str):
-    tag_value = TagUtil.parse_tag(tag)
-    if tag_value.type == TagType.DAY:
-        response = await weather_api.get_day(location, tag_value.date)
-    elif tag_value.type == TagType.DAYS:
-        response = await weather_api.get_days(location, tag_value.days)
-    else:
-        raise ValueError(tag)
-    return build_weather_response(request, response)
-
-
-@router.get("/zmiyevka-184640/tag/{tag}", response_class=RedirectResponse)
-async def get_zmiyevka_weather_compat(request: AppRequest):
-    path_parts = request.url.path.split("/")
-    path_parts.insert(2, "gismeteo")
-    return RedirectResponse("/".join(path_parts))
+from .route import router

gallery/easel/route/view/weather/route.py

@@ -0,0 +1,81 @@
+from pathlib import Path
+from typing import Literal
+
+from fastapi import APIRouter
+from fastapi.responses import HTMLResponse, RedirectResponse
+
+from gallery.easel.core import AppRequest
+from gallery.easel.depends.api import api_resolver
+from gallery.easel.depends.date import DateDepends
+from gallery.easel.depends.weather import WeatherApiDepends
+from gallery.sketch.weather.api import WeatherApi
+from gallery.sketch.weather.model import WeatherResponse
+
+from ..common.utils.template import build_templates
+from .filters import cloudness_icon, weather_icon_svg, wind_direction_icon
+
+
+def context_procesor(request: AppRequest) -> dict:
+    return {
+        "providers": request.app.state.api.get_api_providers(WeatherApi),
+    }
+
+
+templates = build_templates(
+    Path(__file__).parent / "templates",
+    {
+        "wind_direction_icon": wind_direction_icon,
+        "cloudness_icon": cloudness_icon,
+        "weather_icon_svg": weather_icon_svg,
+    },
+    context_procesor,
+)
+
+
+def build_weather_response(request: AppRequest, response: WeatherResponse):
+    return templates.TemplateResponse(
+        request=request,
+        name="weather.html",
+        context={"response": response},
+    )
+
+
+router = APIRouter(prefix="/weather")
+
+
+@router.get("/", response_class=HTMLResponse)
+async def get_weather_index(request: AppRequest, provider: str | None = None, query: str | None = None):
+    if query and provider:
+        weather_api = api_resolver(WeatherApi)(request, provider)
+        locations = await weather_api.find_locations(query)
+    else:
+        locations = []
+    return templates.TemplateResponse(
+        request=request,
+        name="index.html",
+        context={"locations": [item.model_dump() for item in locations]},
+    )
+
+
+@router.get("/{provider}/{location}", response_class=RedirectResponse)
+async def get_weather(location: str):
+    return RedirectResponse(f"{location}/day/today")
+
+
+@router.get("/{provider}/{location}/days/{days}", response_class=HTMLResponse)
+async def get_weather_days(request: AppRequest, weather_api: WeatherApiDepends, location: str, days: int):
+    response = await weather_api.get_days(location, days)
+    return build_weather_response(request, response)
+
+
+# TODO: tag mode route deprecated, used in tizen app
+@router.get("/{provider}/{location}/{mode:str}/{date}", response_class=HTMLResponse)
+async def get_weather_day(
+    request: AppRequest,
+    weather_api: WeatherApiDepends,
+    location: str,
+    date: DateDepends,
+    mode: Literal["day", "tag"],  # pylint:disable=unused-argument
+):
+    response = await weather_api.get_day(location, date)
+    return build_weather_response(request, response)

gallery/easel/route/view/weather/templates/index.html

@@ -35,17 +35,18 @@
   </div>
 </form>
 {% if locations %}
-<ul id="locations"
-    class="list-group mb-5">
-  {% for location in locations %}
-  <weather-location location="{{location.model_dump() | tojson | forceescape}}"></weather-location>
-  {% endfor %}
-</ul>
-<hr>
+<div class="mb-4">
+  <weather-location-list value="{{locations | tojson | forceescape}}"
+                         onclick="weatherLocationManager.store(element)"
+                         onadd="weatherLocationManager.add(element)"></weather-location-list>
+  <hr>
+</div>
 {% endif %}
-<ul id="storedLocations"
-    class="list-group mb-5">
-</ul>
+<div class="mb-4">
+  <h3>{{_("Stored locations")}}</h3>
+  <weather-location-list id="storedLocations"
+                         onremove="weatherLocationManager.remove(element)"></weather-location-list>
+</div>
 <script>
   (function () {
     const params = new URLSearchParams(window.location.search);
@@ -55,7 +56,7 @@
     }
 
     document.addEventListener("DOMContentLoaded", (event) => {
-      weatherLocationManager.loadLocations('#storedLocations');
+      weatherLocationManager.load();
     });
   })();
 </script>

gallery/easel/route/view/weather/templates/weather.html

@@ -1,5 +1,8 @@
 {% extends "base.html" %}
-{% block title %}{{_("Weather")}} | {{response.location}} | {{response.date.strftime('%a, %d %B %Y')}}{% endblock %}
+{% set date = response.date %}
+
+{% block title %}{{_("Weather")}} | {{response.location}} | {{format_date(response.date, DATE_FORMAT,
+locale=request.state.language)}}{% endblock %}
 
 {% block header %}
 <app-link href="/weather"
@@ -9,22 +12,23 @@
 {% block content %}
 <h4>
   {% if response.period == 'day' %}
-  <a class="icon-link {{'disabled' if response.date == datetime.date.today() else ''}}"
-     href="../tag/{{tag_util.create_tag('day', response.date, -1)}}">
+  <a class="icon-link {{'disabled' if date == datetime.date.today() else ''}}"
+     href="{{build_url(request, path=['..', date - datetime.timedelta(days=1)])}}">
     <i class="bi bi-arrow-left-square"></i>
   </a>
   <a class="icon-link"
-     href="../tag/days-10">
+     href="{{build_url(request, path=['..', '..', 'days', '10'])}}">
     <i class="bi bi-arrow-up-square"></i>
   </a>
   <span class="badge rounded-pill text-bg-secondary fs-6">{{provider}}</span>
   <span>{{response.location}} | {{format_date(response.date, DATE_FORMAT, locale=request.state.language)}}</span>
   <a class="icon-link"
-     href="../tag/{{tag_util.create_tag('day', response.date, 1)}}">
+     href="{{build_url(request, path=['..', date + datetime.timedelta(days=1)])}}">
     <i class="bi bi-arrow-right-square"></i>
   </a>
   {% endif %}
   {% if response.period == 'days' %}
+  <span class="badge rounded-pill text-bg-secondary fs-6">{{provider}}</span>
   <span>{{response.location}} | {{format_date(response.date, DATE_FORMAT, locale=request.state.language)}}</span>
   <span>- {{format_date(response.date + datetime.timedelta(days=(response.values | length - 1)), DATE_FORMAT,
     locale=request.state.language)}}</span>
@@ -46,7 +50,7 @@
         {% if response.period == 'days' %}
         <td class="date {{'now' if value.date.date() == datetime.date.today() else ''}}">
           <span class="value {{'text-danger' if value.date.weekday() in [5,6] else ''}}">
-            <a href="../tag/{{tag_util.create_tag('day', value.date.date())}}">
+            <a href="{{build_url(request, path=['..', '..', 'day', value.date.date()])}}">
               {{format_date(value.date, 'E d', locale=request.state.language)}}
             </a>
           </span>
@@ -121,7 +125,7 @@
         <td class="wind"
             style="background-color: rgba(128, 128, 128, {{value.wind_speed * 0.05}});">
           <span class="speed">{{value.wind_speed}}</span>
-          {% if value.wind_gust != value.wind_speed %}
+          {% if value.wind_gust != value.wind_speed and value.wind_gust > 0 %}
           <span class="gust">
             ({{value.wind_gust}})
           </span>
@@ -173,7 +177,7 @@
         {% for value in response.values %}
         <td class="humidity"
             style="background-color: rgba(128, 128, 255, {{value.humidity * 0.005}});">
-          <span class="value">{{value.humidity}}</span>
+          {% if value.humidity > -1%}<span class="value">{{value.humidity}}</span>{% endif %}
         </td>
         {% endfor %}
       </tr>

gallery/main.py

@@ -7,7 +7,9 @@ from gallery.easel import build_app
 from gallery.painting.gismeteo.api import GismeteoApi
 from gallery.painting.matchtv.api import MatchTvApi
 from gallery.painting.openweather.api import OpenWeatherApi
+from gallery.painting.rp5.api import RP5WeatherApi
 from gallery.painting.yandextv.api import YandexTvApi
+from gallery.painting.yandexweather.api import YandexWeatherApi
 from gallery.sketch.bundle import ApiBundle
 from gallery.sketch.schedule.cached import CachedScheduleApi
 from gallery.sketch.weather.cached import CachedWeatherApi
@@ -18,6 +20,8 @@ api = ApiBundle(
         CachedScheduleApi(MatchTvApi()),
         CachedWeatherApi(GismeteoApi()),
         CachedWeatherApi(OpenWeatherApi()),
+        CachedWeatherApi(YandexWeatherApi()),
+        CachedWeatherApi(RP5WeatherApi()),
     ]
 )
 app = build_app(api)

gallery/painting/gismeteo/api.py

@@ -1,6 +1,7 @@
 import datetime
 import json
 import logging
+from os import environ
 from typing import Any
 
 from bs4 import BeautifulSoup
@@ -9,30 +10,32 @@ from fastapi import HTTPException, status
 from gallery.sketch.source import ApiSource
 from gallery.sketch.weather.api import WeatherApi
 from gallery.sketch.weather.model import Location, WeatherResponse, WeatherValue
+from gallery.sketch.weather.util import merge_weather_values
 
-from . import datehelp
 from .parser import DAYS_PARSER, LOCATION_PARSER, ONE_DAY_PARSER, ROW_PARSERS
 
 logger = logging.getLogger("gismeteo")
 
 
+def format_date(date: datetime.date) -> str:
+    today = datetime.date.today()
+    days = (date - today).days
+    if days == 0:
+        return "today"
+    elif days == 1:
+        return "tomorrow"
+    else:
+        return f"{days + 1}-day"
+
+
 class GismeteoApi(WeatherApi):
     PROVIDER = "gismeteo"
-    SOURCE = ApiSource(
-        "https://www.gismeteo.ru",
-        cookies={
-            "cf_clearance": (
-                "zPj8qeaYZWp5BUZsWIRD7kd32s59IDWWaVvD7GGf6b4-1724254262-1.2.1.1-"
-                "R1PaHoqlm4OEgHfrOg6oAJmVmFJ7053JI_QDjIFlCAmbNY0oyw1J4QtgmEkAkTWF4C99X5hpXmZB2en."
-                "9Ey3NL0kzaE10UGBHPli5OLxHNKC3wQ34xmxTxg6GcKouXOPRgqo92lVRpQP7ghvDmvvT_"
-                "S6YXDbRonkamptWhZiAsIhsnIQg2Mt7Lk1fxSEVbaey_RXVQBvaR2ofiFgIavcbQPRFSvJ."
-                "Ct_FujmymTAZWh1XHTptK32kur81NXyPuARThetOKQm8AklaMa855Oom6Bms1a4F9b0yEHSd2inA4j3FR7uauu8hhwO0Z2goa3."
-                "ktpXXAQLz6dm.fBEWIHD7wooda15X57tCcDOely4hxhO4LK2lIH6TbOr."
-                "rZQAiRRhltHiCizP1Ou2SiF_81lb1umoDh739tQD1cnw_USnL."
-                "JwTHvkB00ZnaHRMi4FCBrsKIE0NxJO6kiv1QANqumzf5.8_pSIGRo2cKeO8xCydduDNFbStdOmLR6FU7ZKqVu"
-            )
-        },
-    )
+
+    def _build_source(self) -> ApiSource:
+        return ApiSource(
+            "https://www.gismeteo.ru",
+            cookies={"xauth": auth} if (auth := environ.get("GISMETEO_AUTH")) else None,
+        )
 
     def _parse_oneday(self, date: datetime.date, data: str) -> WeatherResponse:
         result: list[dict[str, Any]] = []
@@ -45,6 +48,12 @@ class GismeteoApi(WeatherApi):
                     result.append({})
                 result[index][parser.KEY] = value
         values = [WeatherValue(**item) for item in result]
+        # group values by 3 hours
+        if len(values) > 8:
+            n = 3
+            values = [
+                merge_weather_values(values[i].date, values[i : i + n], "average") for i in range(0, len(values), n)
+            ]
         return WeatherResponse(
             location=location or "n/a",
             date=date,
@@ -75,7 +84,7 @@ class GismeteoApi(WeatherApi):
         latitude = 52.968498
         longitude = 36.0695
         data = json.loads(
-            await self.SOURCE.request(
+            await self.source.request(
                 f"mq/city/q/?q={query}&geo={geo}&latitude={latitude}&longitude={longitude}&limit=10"
             )
         )
@@ -108,9 +117,9 @@ class GismeteoApi(WeatherApi):
             raise HTTPException(
                 status_code=status.HTTP_400_BAD_REQUEST, detail={"max_date": max_date.strftime("%Y-%m-%d")}
             )
-        data = await self.SOURCE.request(f"weather-{location_id}/{datehelp.dump(date)}")
+        data = await self.source.request(f"weather-{location_id}/{format_date(date)}")
         return self._parse_oneday(date, data)
 
     async def get_days(self, location_id: str, days: int) -> WeatherResponse:
-        data = await self.SOURCE.request(f"weather-{location_id}/{days}-days")
+        data = await self.source.request(f"weather-{location_id}/{days}-days")
         return self._parse_manydays(data)

gallery/painting/gismeteo/core.py

@@ -1,31 +0,0 @@
-from typing import Generic, Iterable, Optional, TypeVar
-
-from bs4 import Tag
-
-T = TypeVar("T")
-
-
-class WidgetParser:
-    def parse_widget(self, tag: Tag) -> Tag:
-        raise NotImplementedError
-
-
-class BaseWidgetParser(WidgetParser):
-    SELECT: str
-
-    def __init__(self, select: Optional[str] = None):
-        super().__init__()
-        self._select = select or self.SELECT
-
-    def parse_widget(self, tag: Tag) -> Tag:
-        widget = tag.select_one(self._select)
-        if widget is None:
-            raise ValueError(self._select)
-        return widget
-
-
-class RowParser(Generic[T]):
-    KEY: str
-
-    def parse_row(self, tag: Tag) -> Iterable[T]:
-        raise NotImplementedError

gallery/painting/gismeteo/datehelp.py

@@ -1,39 +0,0 @@
-import datetime
-from enum import Enum
-
-import dateparser
-import dateparser.date_parser
-
-
-class Day(str, Enum):
-    TODAY = "today"
-    TOMORROW = "tomorrow"
-    DAY_3 = "3-day"
-    DAY_4 = "4-day"
-    DAY_5 = "5-day"
-
-
-def parse(value: str) -> datetime.date:
-    if value in ["today", "mock"]:
-        return datetime.date.today()
-    elif value == "tomorrow":
-        return datetime.date.today() + datetime.timedelta(days=1)
-    elif value.endswith("-day"):
-        days = int(value.split("-")[0]) - 1
-        return datetime.date.today() + datetime.timedelta(days=days)
-    else:
-        date = dateparser.parse(value)
-        if date is None:
-            raise ValueError(value)
-        return date.date()
-
-
-def dump(date: datetime.date) -> str:
-    today = datetime.date.today()
-    days = (date - today).days
-    if days == 0:
-        return "today"
-    elif days == 1:
-        return "tomorrow"
-    else:
-        return f"{days + 1}-day"

gallery/painting/gismeteo/parser.py

@@ -1,7 +1,7 @@
 import datetime
 import logging
 import re
-from typing import Iterable
+from typing import Generic, Iterable, Optional, TypeVar
 
 import dateparser
 from bs4 import Tag
@@ -11,13 +11,40 @@ from gallery.sketch.weather.model import (
     Precipitation,
     Sky,
     WindDirection,
-    WindDirectionDeg,
 )
-
-from .core import BaseWidgetParser, RowParser
+from gallery.sketch.weather.parser import ParseError, parse_wind_direction
 
 logger = logging.getLogger("gismeteo")
 
+T = TypeVar("T")
+
+
+class WidgetParser:
+    def parse_widget(self, tag: Tag) -> Tag:
+        raise NotImplementedError
+
+
+class BaseWidgetParser(WidgetParser):
+    SELECT: str
+
+    def __init__(self, select: Optional[str] = None):
+        super().__init__()
+        self._select = select or self.SELECT
+
+    def parse_widget(self, tag: Tag) -> Tag:
+        widget = tag.select_one(self._select)
+        if widget is None:
+            raise ValueError(self._select)
+        return widget
+
+
+class RowParser(Generic[T]):
+    KEY: str
+
+    def parse_row(self, tag: Tag) -> Iterable[T]:
+        raise NotImplementedError
+
+
 ONE_DAY_PARSER = BaseWidgetParser(".widget.widget-oneday .widget-items")
 DAYS_PARSER = BaseWidgetParser(".widget.widget-days .widget-items")
 
@@ -46,9 +73,15 @@ class DateParser(RowParser[datetime.datetime]):
                 time = datetime.datetime.fromtimestamp(timestamp)
                 yield time
         else:
+            month = None
             for item in tag.select(".widget-row.widget-row-date > .row-item"):
                 date_str = item.text
                 date = dateparser.parse(date_str, languages=["ru"])
+                if date is None:
+                    raise ParseError.invalid_date(date_str)
+                if month and month > date.month:
+                    date = date.replace(month=month)
+                month = date.month
                 yield date
 
 
@@ -65,6 +98,7 @@ class SkyParser(RowParser[Sky]):
 
     PRECIPITATION_MAP: dict[str, Precipitation] = {
         "без осадков": Precipitation.NO,
+        "без существенных осадков": Precipitation.NO,
         "небольшой дождь": Precipitation.SMALL_RAIN,
         "сильный дождь": Precipitation.HEAVY_RAIN,
         "очень сильный дождь": Precipitation.HEAVY_RAIN,
@@ -82,8 +116,13 @@ class SkyParser(RowParser[Sky]):
         "град": Precipitation.HAIL,
     }
 
-    THUNDER = "гроза"
-    FOG = "дымка"
+    THUNDER = {"гроза"}
+    FOG = {"дымка", "туман"}
+
+    @classmethod
+    def _detect_flag(cls, values: set[str], flag_values: set[str]) -> tuple[set[str], bool]:
+        result_values = values - flag_values
+        return result_values, len(result_values) < len(values)
 
     def parse_row(self, tag: Tag) -> Iterable[Sky]:
         for item in tag.select(".widget-row[data-row=icon-tooltip] > .row-item"):
@@ -91,14 +130,8 @@ class SkyParser(RowParser[Sky]):
             values = {item.strip().lower() for item in sky_str.split(",")}
             cloudness = Cloudness.CLEAR
             precipitation = Precipitation.NO
-            thunder = False
-            fog = False
-            if self.THUNDER in values:
-                thunder = True
-                values.remove(self.THUNDER)
-            if self.FOG in values:
-                fog = True
-                values.remove(self.FOG)
+            values, thunder = self._detect_flag(values, self.THUNDER)
+            values, fog = self._detect_flag(values, self.FOG)
             for k, v in self.CLOUDNESS_MAP.items():
                 if k in values:
                     cloudness = v
@@ -147,24 +180,10 @@ class WindGustParser(RowParser[int]):
 class WindDirectionParser(RowParser[WindDirection]):
     KEY = "wind_direction"
 
-    WIND_DIRECTION_MAP: dict[str, WindDirection] = {
-        "—": WindDirection.CALM,
-        "": WindDirection.CALM,
-        "штиль": WindDirection.CALM,
-        "с": WindDirection.N,
-        "св": WindDirection.NE,
-        "в": WindDirection.E,
-        "юв": WindDirection.SE,
-        "ю": WindDirection.S,
-        "юз": WindDirection.SW,
-        "з": WindDirection.W,
-        "сз": WindDirection.NW,
-    }
-
     def parse_row(self, tag: Tag) -> Iterable[float]:
         for item in tag.select(".widget-row-wind > .row-item > .wind-speed > .wind-direction"):
             wind_direction_str = item.text.lower().strip()
-            yield WindDirectionDeg.from_direction(self.WIND_DIRECTION_MAP[wind_direction_str]).value
+            yield parse_wind_direction(wind_direction_str)
 
 
 class PrecipitationParser(RowParser[float]):

gallery/painting/matchtv/api.py

@@ -11,11 +11,13 @@ logger = logging.getLogger("matchtv")
 
 class MatchTvApi(ScheduleApi):
     PROVIDER = "matchtv"
-    SOURCE = ApiSource("https://matchtv.ru")
+
+    def _build_source(self) -> ApiSource:
+        return ApiSource("https://matchtv.ru")
 
     async def find_channels(self, query: str) -> list[Channel]:
         endpoint = "api/v1/channels"
-        data = json.loads(await self.SOURCE.request(endpoint))
+        data = json.loads(await self.source.request(endpoint))
         result = []
         query = query.lower()
         for item in data["result"]:
@@ -27,7 +29,7 @@ class MatchTvApi(ScheduleApi):
 
     async def get_schedule(self, channel_id: str, date: datetime.date) -> Schedule:
         endpoint = f"api/v1/channels/{channel_id}/tv-schedule?date={date:%Y%m%d}"
-        data = json.loads(await self.SOURCE.request(endpoint))
+        data = json.loads(await self.source.request(endpoint))
         channel_data = data["result"]["channels"][0]
         channel = Channel(id=channel_data["alias"], name=channel_data["name"], provider=self.provider)
         values = []

gallery/painting/openweather/api.py

@@ -18,9 +18,11 @@ from .parser import FORECAST_ITEM_PARSER
 logger = logging.getLogger("openweather")
 
 
-class OpenWeatherApi(WeatherApi):
+class OpenWeatherApi(WeatherApi[OpenWeather]):
     PROVIDER = "openweather"
-    SOURCE = OpenWeather(environ["OPENWEATHER_KEY"])
+
+    def _build_source(self) -> OpenWeather:
+        return OpenWeather(environ["OPENWEATHER_KEY"])
 
     @classmethod
     def _parse_location(cls, location_id: str) -> tuple[float, float]:
@@ -32,7 +34,7 @@ class OpenWeatherApi(WeatherApi):
         ttl=TimeUnit.DAY,
     )
     async def _get_location(self, location_id: str) -> OpenWeatherLocation:
-        return await self.SOURCE.get_location(*self._parse_location(location_id))
+        return await self.source.get_location(*self._parse_location(location_id))
 
     @cached(
         key_builder=lambda fun, self, location_id: f"api.weather.{self.provider}.source.{location_id}.forecast",
@@ -40,10 +42,10 @@ class OpenWeatherApi(WeatherApi):
         ttl=TimeUnit.HOUR,
     )
     async def _get_location_forecast(self, location_id: str) -> Forecast:
-        return await self.SOURCE.get_forecast(*self._parse_location(location_id))
+        return await self.source.get_forecast(*self._parse_location(location_id))
 
     async def find_locations(self, query: str) -> list[Location]:
-        result = await self.SOURCE.find_locations(query)
+        result = await self.source.find_locations(query)
         return [
             Location(
                 id=f"{item.lat}:{item.lon}",

gallery/painting/openweather/openweather.py

@@ -76,28 +76,28 @@ class Location(Model):
     local_names: dict[str, str] | None = None
 
 
-class OpenWeather:
+class OpenWeather(ApiSource):
     BASE_URL = "https://api.openweathermap.org"
 
     def __init__(self, api_key: str):
         self._api_key = api_key
-        self._source = ApiSource(self.BASE_URL)
+        super().__init__(self.BASE_URL)
 
     async def get_forecast(self, lat: float, lon: float) -> Forecast:
         endpoint = f"data/2.5/forecast?lat={lat}&lon={lon}&appid={self._api_key}&units=metric"
-        response = await self._source.request(endpoint)
+        response = await self.request(endpoint)
         response_data = json.loads(response)
         return Forecast.model_validate(response_data)
 
     async def find_locations(self, query: str, limit: int = 5) -> list[Location]:
         endpoint = f"geo/1.0/direct?q={query}&limit={limit}&appid={self._api_key}"
-        response = await self._source.request(endpoint)
+        response = await self.request(endpoint)
         response_data = json.loads(response)
         return [Location.model_validate(item) for item in response_data]
 
     async def get_location(self, lat: float, lon: float) -> Location:
         limit = 1
         endpoint = f"geo/1.0/reverse?lat={lat}&lon={lon}&limit={limit}&appid={self._api_key}"
-        response = await self._source.request(endpoint)
+        response = await self.request(endpoint)
         response_data = json.loads(response)
         return Location.model_validate(response_data[0])

gallery/painting/openweather/parser.py

@@ -29,7 +29,7 @@ class ForecastItemParser:
         # TODO parse temperature interval flag
         value.temperature = [round(item.main.temp)]
         # value.temperature = [round(item.main.temp_max), round(item.main.temp_min)]
-        value.pressure = [round(item.main.pressure / 133.3 * 100)]
+        value.pressure = [round(item.main.pressure * 0.75006)]
         value.humidity = item.main.humidity
         value.wind_speed = round(item.wind.speed)
         value.wind_gust = round(item.wind.gust)

gallery/painting/rp5/api.py

@@ -0,0 +1,86 @@
+import datetime
+import logging
+
+import aiohttp
+from aiocache import cached
+from bs4 import BeautifulSoup
+
+from gallery.sketch.source import ApiSource
+from gallery.sketch.weather.api import WeatherApi
+from gallery.sketch.weather.model import (
+    Location,
+    WeatherResponse,
+)
+from gallery.sketch.weather.util import merge_weather_values
+from gallery.util import TimeUnit
+
+from ...sketch.headers import build_headers
+from .parser import parse_page
+
+logger = logging.getLogger("rp5")
+
+
+class RP5WeatherApi(WeatherApi):
+    PROVIDER = "rp5"
+
+    def _build_source(self) -> ApiSource:
+        return ApiSource("https://rp5.ru", headers=build_headers("rp5.ru"))
+
+    async def find_locations(self, query: str) -> list[Location]:
+        endpoint = "docs/search/ru"
+        data = aiohttp.FormData({"searchStr": query})
+        response = await self.source.request(endpoint, method="POST", data=data)
+        soup = BeautifulSoup(response, features="html.parser")
+        table = soup.select_one(".searchResults")
+        result = []
+        for row in table.select("tr")[1:]:
+            cells = row.select("td")
+            name = cells[0].text.strip()
+            location_id = cells[0].select_one("a").attrs["href"].lstrip("/")
+            country = cells[1].text.strip()
+            district = cells[2].text.strip()
+            subdistrict = cells[3].text.strip()
+            result.append(
+                Location(
+                    id=location_id,
+                    name=name,
+                    provider=self.provider,
+                    lat=0,
+                    lon=0,
+                    country=country,
+                    country_code="ru",  # TODO: contry_code from country
+                    district=district,
+                    subdistrict=subdistrict,
+                )
+            )
+        return result
+
+    @cached(
+        key_builder=lambda fun, self, location_id: f"api.weather.{self.provider}.source.{location_id}.forecast",
+        alias="redis",
+        ttl=TimeUnit.HOUR,
+    )
+    async def _get_location_forecast(self, location_id: str) -> list[WeatherResponse]:
+        endpoint = f"{location_id}"
+        content = await self.source.request(endpoint)
+        soup = BeautifulSoup(content, features="html.parser")
+        return parse_page(soup)
+
+    async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
+        forecast = await self._get_location_forecast(location_id)
+        for response in forecast:
+            if response.date == date:
+                return response
+        if date == datetime.date.today():
+            return WeatherResponse(location=location_id, date=date, period="day", values=[])
+        raise ValueError(f"Unsupported date: {date}")
+
+    async def get_days(self, location_id: str, days: int) -> WeatherResponse:
+        forecast = await self._get_location_forecast(location_id)
+        values = [merge_weather_values(item.date, item.values) for item in forecast]
+        return WeatherResponse(
+            location=forecast[0].location,
+            date=datetime.date.today(),
+            period="days",
+            values=values,
+        )

gallery/painting/rp5/parser.py

@@ -0,0 +1,146 @@
+import re
+from enum import Enum, auto
+from typing import Iterable
+
+import dateparser
+from bs4 import BeautifulSoup, Tag
+
+from gallery.sketch.weather.model import (
+    Cloudness,
+    Precipitation,
+    WeatherResponse,
+    WeatherValue,
+)
+from gallery.sketch.weather.parser import ParseError, parse_wind_direction
+from gallery.sketch.weather.util import build_weather_value
+
+CLOUDNESS_MAP = {
+    "Ясно": Cloudness.CLEAR,
+    "Малооблачно": Cloudness.PARTLY_CLOUDY,
+    "Облачно с прояснениями": Cloudness.PARTLY_CLOUDY,
+    "Переменная облачность": Cloudness.PARTLY_CLOUDY,
+    "Небольшая облачность": Cloudness.CLOUDY,
+    "Облачно": Cloudness.CLOUDY,
+    "Значительная облачность": Cloudness.MAINLY_CLOUDY,
+    "Пасмурная погода": Cloudness.MAINLY_CLOUDY,
+}
+
+PRECIPITATION_MAP = {
+    "Явления погоды отсутствуют": Precipitation.NO,
+    "Cлабый дождь": Precipitation.SMALL_RAIN,
+}
+
+
+def _parse_wind_speed(cell: Tag) -> int:
+    element = cell.select_one(".wv_0")
+    if element:
+        return int(element.text.strip() or "0")
+    return 0
+
+
+class RowType(Enum):
+    DATE = auto()
+    TIME = auto()
+    CLOUDNESS = auto()
+    PRECIPITATION = auto()
+    TEMPERATURE = auto()
+    PRESSURE = auto()
+    WIND_SPEED = auto()
+    WIND_GUST = auto()
+    WIND_DIRECTION = auto()
+    HUMIDITY = auto()
+
+
+def _iter_table_rows(table: Tag) -> Iterable[tuple[RowType, Tag]]:
+    for row in table.select("tr"):
+        title = row.select_one("td").text.strip().lower()
+        if "сегодня" in title or "завтра" in title:
+            yield RowType.DATE, row
+        elif "местное время" in title:
+            yield RowType.TIME, row
+        elif "облачность" in title:
+            yield RowType.CLOUDNESS, row
+        elif "осадки" in title:
+            yield RowType.PRECIPITATION, row
+        elif "температура" in title:
+            yield RowType.TEMPERATURE, row
+        elif "давление" in title:
+            yield RowType.PRESSURE, row
+        elif "скорость" in title:
+            yield RowType.WIND_SPEED, row
+        elif "порывы" in title:
+            yield RowType.WIND_GUST, row
+        elif "направление" in title:
+            yield RowType.WIND_DIRECTION, row
+        elif "влажность" in title:
+            yield RowType.HUMIDITY, row
+
+
+# pylint:disable=too-many-branches
+def parse_page(page: BeautifulSoup) -> list[WeatherResponse]:
+    location = page.select(".intoLeftNavi > .verticalBottom > a")[-1].text.strip()
+    table = page.select_one("#forecastTable")
+    if table is None:
+        raise ParseError("#forecastTable not found")
+    result: list[WeatherResponse] = []
+    values: list[WeatherValue] = []
+    for row_type, row in _iter_table_rows(table):
+        match row_type:
+            case RowType.DATE:
+                for index, cell in enumerate(row.select("td")):
+                    colspan = int(cell.attrs["colspan"])
+                    if index == 0:
+                        colspan -= 1
+                    date_str = ",".join(cell.text.strip().split(",")[-2:])
+                    date = dateparser.parse(date_str, languages=["ru"])
+                    if date is None:
+                        raise ParseError.invalid_date(date_str)
+                    item_values = [build_weather_value(date) for _ in range(colspan)]
+                    result.append(
+                        WeatherResponse(
+                            location=location,
+                            date=date.date(),
+                            period="day",
+                            values=item_values,
+                        )
+                    )
+                    values += item_values
+            case RowType.TIME:
+                for index, cell in enumerate(row.select("td")[1:]):
+                    hour = int(cell.text.strip())
+                    values[index].date = values[index].date.replace(hour=hour)
+            case RowType.CLOUDNESS:
+                for index, cell in enumerate(row.select("td")[1:]):
+                    onmouseover = cell.select_one(".cc_0").next_element.attrs["onmouseover"]
+                    cloudness_str = re.compile("<b>(.*?)</b>").search(onmouseover).group(1).strip()
+                    values[index].sky.cloudness = CLOUDNESS_MAP[cloudness_str]
+            case RowType.PRECIPITATION:
+                for index, cell in enumerate(row.select("td")[1:]):
+                    onmouseover = cell.select_one(".pr_0").attrs["onmouseover"]
+                    precipitation_str = onmouseover.split(",")[1].strip(" '")
+                    precipitation_value_matched = re.compile("(\\d+\\.\\d+) мм").search(precipitation_str)
+                    if precipitation_value_matched:
+                        # one hour value
+                        values[index].precipitation = float(precipitation_value_matched.group(1)) * 6
+                    if "(" in precipitation_str:
+                        precipitation_str = precipitation_str.split(" (")[0]
+                    values[index].sky.precipitation = PRECIPITATION_MAP[precipitation_str]
+            case RowType.TEMPERATURE:
+                for index, cell in enumerate(row.select("td")[1:]):
+                    values[index].temperature = [int(cell.select_one(".t_0").text.lstrip("+").strip())]
+            case RowType.PRESSURE:
+                for index, cell in enumerate(row.select("td")[1:]):
+                    values[index].pressure = [int(cell.select_one(".p_0").text.strip())]
+            case RowType.WIND_SPEED:
+                for index, cell in enumerate(row.select("td")[1:]):
+                    values[index].wind_speed = _parse_wind_speed(cell)
+            case RowType.WIND_GUST:
+                for index, cell in enumerate(row.select("td")[1:]):
+                    values[index].wind_gust = _parse_wind_speed(cell)
+            case RowType.WIND_DIRECTION:
+                for index, cell in enumerate(row.select("td")[1:]):
+                    values[index].wind_direction = parse_wind_direction(cell.text.strip())
+            case RowType.HUMIDITY:
+                for index, cell in enumerate(row.select("td")[1:]):
+                    values[index].humidity = int(cell.text.strip())
+    return result

gallery/painting/yandextv/api.py

@@ -8,49 +8,23 @@ from gallery.sketch.schedule.api import ScheduleApi
 from gallery.sketch.schedule.model import Channel, Schedule, ScheduleValue
 from gallery.sketch.source import ApiSource
 
+from ...sketch.headers import build_headers
+
 logger = logging.getLogger("matchtv")
 
 
-HEADERS: dict[str, str] = {
-    "Accept": (
-        "text/html,"
-        "application/xhtml+xml,"
-        "application/xml;q=0.9,"
-        "image/avif,image/webp,"
-        "image/apng,*/*;q=0.8,"
-        "application/signed-exchange;v=b3;q=0.9"
-    ),
-    "Accept-Encoding": "gzip, deflate, br",
-    "Accept-Language": "en-US,en;q=0.9",
-    "Connection": "keep-alive",
-    "Host": "tv.yandex.ru",
-    "sec-ch-ua": '"Chromium";v="100", " Not A;Brand";v="99"',
-    "sec-ch-ua-mobile": "?0",
-    "sec-ch-ua-platform": '"Linux"',
-    "Sec-Fetch-Dest": "document",
-    "Sec-Fetch-Mode": "navigate",
-    "Sec-Fetch-Site": "none",
-    "Sec-Fetch-User": "?1",
-    "Upgrade-Insecure-Requests": "1",
-    "User-Agent": (
-        "Mozilla/5.0 (X11; Linux x86_64) "
-        "AppleWebKit/537.36 (KHTML, like Gecko) "
-        "Chrome/100.0.4896.133 "
-        "Safari/537.36"
-    ),
-}
-
-
 class YandexTvApi(ScheduleApi):
     PROVIDER = "yandextv"
-    SOURCE = ApiSource("https://tv.yandex.ru", headers=HEADERS)
+
+    def _build_source(self) -> ApiSource:
+        return ApiSource("https://tv.yandex.ru", headers=build_headers("tv.yandex.ru"))
 
     async def find_channels(self, query: str) -> list[Channel]:
         url = (
             "https://suggest-multi.yandex.ru/suggest-tv2?"
             f"v=4&uil=ru&lr=10&count_channels=4&count_programs=4&sn=50&part={query}"
         )
-        _, values = json.loads(await self.SOURCE.request(url))
+        _, values = json.loads(await self.source.request(url))
         result = []
         for _, name, content in values:
             if content["label"] == "Каналы":
@@ -60,7 +34,7 @@ class YandexTvApi(ScheduleApi):
 
     async def get_schedule(self, channel_id: str, date: datetime.date) -> Schedule:
         endpoint = f"channels/{channel_id}?date={date:%Y-%m-%d}"
-        data = await self.SOURCE.request(endpoint)
+        data = await self.source.request(endpoint)
         soup = BeautifulSoup(data, features="html.parser")
         if soup.select_one(".CheckboxCaptcha") is not None:
             raise RuntimeError("Captcha")

gallery/painting/yandexweather/api.py

@@ -0,0 +1,75 @@
+import datetime
+import json
+import logging
+
+from aiocache import cached
+from bs4 import BeautifulSoup
+
+from gallery.sketch.source import ApiSource
+from gallery.sketch.weather.api import WeatherApi
+from gallery.sketch.weather.model import (
+    Location,
+    WeatherResponse,
+)
+from gallery.sketch.weather.util import merge_weather_values
+from gallery.util import TimeUnit
+
+from .parser import parse_article
+
+logger = logging.getLogger("yandexweather")
+
+
+class YandexWeatherApi(WeatherApi):
+    PROVIDER = "yandex"
+
+    def _build_source(self) -> ApiSource:
+        return ApiSource("https://yandex.ru")
+
+    @cached(
+        key_builder=lambda fun, self, location_id: f"api.weather.{self.provider}.source.{location_id}.forecast",
+        alias="redis",
+        ttl=TimeUnit.HOUR,
+    )
+    async def _get_location_forecast(self, location_id: str) -> list[WeatherResponse]:
+        endpoint = f"pogoda/ru/{location_id}/details"
+        content = await self.source.request(endpoint, mode="browser")
+        soup = BeautifulSoup(content, features="html.parser")
+        location = soup.select_one("[class^=Suggest_placeholder]").text.strip()
+        articles = soup.select("article[class^=AppForecastDay]")
+        return [parse_article(article, location) for article in articles]
+
+    async def find_locations(self, query: str) -> list[Location]:
+        endpoint = f"weather/api/suggest?part={query}&lang=ru&type=weather"
+        response = await self.source.request(endpoint)
+        data = json.loads(response)
+        return [
+            Location(
+                id=str(item["geoId"]),
+                name=item["title"],
+                provider=self.provider,
+                lat=item["coords"]["lat"],
+                lon=item["coords"]["lon"],
+                country="ru",
+                country_code="ru",
+                district=item["description"],
+                subdistrict="",
+            )
+            for item in data
+        ]
+
+    async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
+        forecast = await self._get_location_forecast(location_id)
+        for response in forecast:
+            if response.date == date:
+                return response
+        raise ValueError(f"Unsupported date: {date}")
+
+    async def get_days(self, location_id: str, days: int) -> WeatherResponse:
+        forecast = await self._get_location_forecast(location_id)
+        values = [merge_weather_values(item.date, item.values) for item in forecast]
+        return WeatherResponse(
+            location=forecast[0].location,
+            date=datetime.date.today(),
+            period="days",
+            values=values,
+        )

gallery/painting/yandexweather/parser.py

@@ -0,0 +1,91 @@
+import logging
+from enum import Enum
+
+import dateparser
+from bs4 import Tag
+
+from gallery.sketch.weather.model import Cloudness, Precipitation, Sky, WeatherResponse
+from gallery.sketch.weather.parser import ParseError, parse_wind_direction
+from gallery.sketch.weather.util import build_weather_value
+
+logger = logging.getLogger("yandexweather")
+
+
+class DayPart(Enum):
+    MORNING = ("Утром", 6)
+    AFTERNOON = ("Днём", 12)
+    EVENING = ("Вечером", 18)
+    NIGHT = ("Ночью", 0)
+
+    def __init__(self, title: str, hour: int):
+        super().__init__()
+        self.title = title
+        self.hour = hour
+
+
+def parse_sky(sky: str) -> Sky:
+    cloudness = Cloudness.CLEAR
+    precipitation = Precipitation.NO
+    thunder = False
+    fog = False
+    if sky == "ясно":
+        pass
+    elif sky == "облачно с прояснениями":
+        cloudness = Cloudness.PARTLY_CLOUDY
+    elif sky == "малооблачно":
+        cloudness = Cloudness.CLOUDY
+    elif sky == "пасмурно":
+        cloudness = Cloudness.MAINLY_CLOUDY
+    elif sky == "небольшой дождь":
+        precipitation = Precipitation.SMALL_RAIN
+    elif sky == "дождь":
+        precipitation = Precipitation.RAIN
+    elif sky == "ливень":
+        precipitation = Precipitation.SHOWER
+    else:
+        logger.warning("unknown sky value: %s", sky)
+    return Sky(
+        cloudness=cloudness,
+        precipitation=precipitation,
+        thunder=thunder,
+        fog=fog,
+    )
+
+
+def parse_article(article: Tag, location: str) -> WeatherResponse:
+    date_str = article.select_one("[class^=AppForecastDayHeader_dayTitle]").text.split(",")[-1].strip()
+    date = dateparser.parse(date_str, languages=["ru"])
+    if date is None:
+        raise ParseError.invalid_date(date_str)
+    values = []
+    for day_part in DayPart:
+        value = build_weather_value(date.replace(hour=day_part.hour))
+        day_part_tag = article.find(string=day_part.title)
+        temperature_tag = day_part_tag.next_element
+        temperature = int(temperature_tag.text.strip().rstrip("°"))
+        value.temperature.append(temperature)
+        sky_tag = temperature_tag.next_element.next_element.next_element
+        sky_str = sky_tag.text.strip()
+        value.sky = parse_sky(sky_str)
+        temperature_tag = sky_tag.next_element.next_element
+        temperature = int(temperature_tag.text.strip().rstrip("°"))
+        value.temperature.append(temperature)
+        wind_speed_tag = temperature_tag.next_element.next_element
+        wind_speed = int(wind_speed_tag.text.strip())
+        value.wind_speed = wind_speed
+        wind_direction_tag = wind_speed_tag.next_element.next_element.next_element.next_element
+        wind_direction_str = wind_direction_tag.text.strip()
+        value.wind_direction = parse_wind_direction(wind_direction_str)
+        humidity_tag = wind_direction_tag.next_element.next_element.next_element.next_element
+        humidity = int(humidity_tag.text.strip().rstrip("%"))
+        value.humidity = humidity
+        pressure_tag = humidity_tag.next_element.next_element
+        pressure = int(pressure_tag.text.strip())
+        value.pressure.append(pressure)
+        values.append(value)
+    return WeatherResponse(
+        location=location,
+        date=date,
+        period="day",
+        values=values,
+    )

gallery/sketch/api.py

@@ -1,10 +1,19 @@
 from typing import TypeVar
 
+from .source import ApiSource
 
-class Api:
+S = TypeVar("S", bound=ApiSource)
+
+
+class Api[S = ApiSource]:
     TYPE: str
     PROVIDER: str
 
+    _source: S | None = None
+
+    def _build_source(self) -> S:
+        raise NotImplementedError
+
     @property
     def type(self) -> str:
         return self.TYPE
@@ -13,5 +22,11 @@ class Api:
     def provider(self) -> str:
         return self.PROVIDER
 
+    @property
+    def source(self) -> S:
+        if self._source is None:
+            self._source = self._build_source()
+        return self._source
+
 
 API = TypeVar("API", bound=Api)

gallery/sketch/cached.py

@@ -1,5 +1,6 @@
 from typing import Generic, NamedTuple
 
+from gallery.sketch.source import ApiSource
 from gallery.util import TimeUnit
 
 from .api import API, Api
@@ -19,6 +20,9 @@ class CachedApi(Api, Generic[API]):
     def __init__(self, api: API):
         self._api = api
 
+    def _build_source(self) -> ApiSource:
+        raise RuntimeError("Source not used in CachedApi")
+
     @property
     def provider(self) -> str:
         return self._api.provider

gallery/sketch/headers.py

@@ -0,0 +1,42 @@
+DEFAULT_USER_AGENT = (
+    "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/150.0.0.0 Safari/537.36"
+)
+
+DEFAULT_ACCEPT = (
+    "text/html,"
+    "application/xhtml+xml,"
+    "application/xml;q=0.9,"
+    "image/avif,"
+    "image/webp,"
+    "image/apng,"
+    "*/*;q=0.8,"
+    "application/signed-exchange;v=b3;q=0.7"
+)
+
+DEFAULT_HEADERS = {
+    "Accept": DEFAULT_ACCEPT,
+    "Accept-Encoding": "gzip, deflate, br, zstd",
+    "Accept-Language": "en-US,en;q=0.9,ru-RU;q=0.8,ru;q=0.7,uk;q=0.6",
+    "Cache-Control": "max-age=0",
+    "Connection": "keep-alive",
+    "Host": None,
+    "Referer": None,
+    "Sec-Fetch-Dest": "document",
+    "Sec-Fetch-Mode": "navigate",
+    "Sec-Fetch-Site": "none",
+    "Sec-Fetch-User": "?1",
+    "Upgrade-Insecure-Requests": "1",
+    "User-Agent": DEFAULT_USER_AGENT,
+    "sec-ch-ua": '"Not;A=Brand";v="8", "Chromium";v="150", "Google Chrome";v="150"',
+    "sec-ch-ua-mobile": "?0",
+    "sec-ch-ua-platform": '"Linux"',
+}
+
+
+def build_headers(host: str, *, user_agent: str | None = None) -> dict[str, str]:
+    result = DEFAULT_HEADERS.copy()
+    result["Host"] = host
+    result["Referer"] = f"https://{host}/"
+    if user_agent is not None:
+        result["User-Agent"] = user_agent
+    return result

gallery/sketch/schedule/api.py

@@ -1,10 +1,11 @@
 import datetime
 
 from ..api import Api
+from ..source import ApiSource
 from .model import Channel, Schedule
 
 
-class ScheduleApi(Api):
+class ScheduleApi[S = ApiSource](Api[S]):
     TYPE = "schedule"
 
     async def find_channels(self, query: str) -> list[Channel]:

gallery/sketch/source.py

@@ -1,41 +1,74 @@
+import datetime
 import logging
+from typing import Any, Literal
 
 import aiohttp
+from playwright.async_api import async_playwright
 
 logger = logging.getLogger("source")
 
+RequestMode = Literal["base", "browser"]
+
+DEFAULT_REQUEST_MODE: RequestMode = "base"
+DEFAULT_METHOD: str = "GET"
+
 
 class ApiSource:
-    DEFAULT_USER_AGENT = (
-        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36"
-    )
     DEFAULT_TIMEOUT = 30.0
 
     def __init__(
         self,
         base_url,
-        user_agent: str = DEFAULT_USER_AGENT,
         timeout: float = DEFAULT_TIMEOUT,
         cookies: dict[str, str] | None = None,
         headers: dict[str, str] | None = None,
     ):
         self._base_url = base_url
-        self._user_agent = user_agent
         self._timeout = timeout
         self._cookies = cookies
         self._headers = headers
 
-    async def request(self, endpoint: str) -> str:
+    async def _base_request(
+        self,
+        url: str,
+        method: str = DEFAULT_METHOD,
+        data: Any | None = None,
+    ) -> str:
+        async with aiohttp.ClientSession(
+            headers=self._headers,
+            cookies=self._cookies,
+            raise_for_status=True,
+        ) as session:
+            async with session.request(method, url, timeout=self._timeout, data=data) as response:
+                return await response.text()
+
+    # pylint:disable=unused-argument
+    async def _browser_request(
+        self,
+        url: str,
+        method: str = DEFAULT_METHOD,
+        data: Any | None = None,
+    ) -> str:
+        async with async_playwright() as p:
+            browser = await p.chromium.launch()
+            page = await browser.new_page()
+            await page.goto(url, timeout=datetime.timedelta(seconds=self._timeout), wait_until="networkidle")
+            content = await page.content()
+            await browser.close()
+        return content
+
+    async def request(
+        self,
+        endpoint: str,
+        /,
+        mode: RequestMode = DEFAULT_REQUEST_MODE,
+        method: str = DEFAULT_METHOD,
+        data: Any | None = None,
+    ) -> str:
         if endpoint.startswith("https:"):
             url = endpoint
         else:
             url = f"{self._base_url}/{endpoint}"
         logger.info(url)
-        headers = {"User-Agent": self._user_agent, **(self._headers or {})}
-        async with aiohttp.ClientSession(
-            headers=headers,
-            cookies=self._cookies,
-            raise_for_status=True,
-        ) as session:
-            async with session.request("GET", url, timeout=self._timeout) as response:
-                return await response.text()
+        fun = getattr(self, f"_{mode}_request")
+        return await fun(url, method, data)

gallery/sketch/weather/api.py

@@ -1,10 +1,11 @@
 import datetime
 
 from ..api import Api
+from ..source import ApiSource
 from .model import Location, WeatherResponse
 
 
-class WeatherApi(Api):
+class WeatherApi[S = ApiSource](Api[S]):
     TYPE = "weather"
 
     async def find_locations(self, query: str) -> list[Location]:

gallery/sketch/weather/model.py

@@ -2,7 +2,7 @@ import datetime
 from enum import StrEnum, auto
 from typing import Self
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 
 class Model(BaseModel):
@@ -28,6 +28,11 @@ class Cloudness(StrEnum):
     CLOUDY = auto()
     MAINLY_CLOUDY = auto()
 
+    values: list[Self]
+
+
+Cloudness.values = list(Cloudness)
+
 
 class Precipitation(StrEnum):
     NO = auto()
@@ -39,6 +44,11 @@ class Precipitation(StrEnum):
     HEAVY_SNOW = auto()
     HAIL = auto()
 
+    values: list[Self]
+
+
+Precipitation.values = list(Precipitation)
+
 
 class Sky(Model):
     cloudness: Cloudness
@@ -116,8 +126,8 @@ class WeatherValue(Model):
     wind_gust: int
     wind_direction: float
     precipitation: float
-    pressure: list[int]
-    humidity: int
+    pressure: list[int] = Field(default=[])
+    humidity: int = Field(default=-1)
 
 
 class WeatherResponse(Model):

gallery/sketch/weather/parser.py

@@ -0,0 +1,29 @@
+from typing import Self
+
+from gallery.sketch.weather.model import WindDirection, WindDirectionDeg
+
+
+class ParseError(Exception):
+    @classmethod
+    def invalid_date(cls, date_str: str) -> Self:
+        return cls("Invalid date string", date_str)
+
+
+WIND_DIRECTION_MAP: dict[str, WindDirection] = {
+    "—": WindDirection.CALM,
+    "": WindDirection.CALM,
+    "штиль": WindDirection.CALM,
+    "штл": WindDirection.CALM,
+    "с": WindDirection.N,
+    "св": WindDirection.NE,
+    "в": WindDirection.E,
+    "юв": WindDirection.SE,
+    "ю": WindDirection.S,
+    "юз": WindDirection.SW,
+    "з": WindDirection.W,
+    "сз": WindDirection.NW,
+}
+
+
+def parse_wind_direction(value: str) -> WindDirectionDeg:
+    return WindDirectionDeg.from_direction(WIND_DIRECTION_MAP[value.replace("-", "").lower()])

gallery/sketch/weather/util.py

@@ -1,8 +1,11 @@
 import datetime
 import statistics
+from typing import Literal
 
 from .model import Cloudness, Precipitation, Sky, WeatherValue, WindDirectionDeg
 
+MergeMode = Literal["interval", "average"]
+
 
 def build_weather_value(date: datetime.datetime) -> WeatherValue:
     return WeatherValue(
@@ -19,11 +22,25 @@ def build_weather_value(date: datetime.datetime) -> WeatherValue:
         wind_direction=WindDirectionDeg(-1),
         precipitation=0,
         pressure=[],
-        humidity=0,
+        humidity=-1,
     )
 
 
-def merge_weather_values(date: datetime.datetime, values: list[WeatherValue]) -> WeatherValue:
+def _merge_values(values: list[int], mode: MergeMode) -> list[int]:
+    if mode == "interval":
+        if (max_value := max(values)) == (min_value := min(values)):
+            return [max_value]
+        else:
+            return [max_value, min_value]
+    else:
+        return [round(sum(values) / len(values))]
+
+
+def merge_weather_values(
+    date: datetime.datetime,
+    values: list[WeatherValue],
+    mode: MergeMode = "interval",
+) -> WeatherValue:
     result = build_weather_value(date)
     temperatures = []
     pressures = []
@@ -44,19 +61,17 @@ def merge_weather_values(date: datetime.datetime, values: list[WeatherValue]) ->
         cloudnesses.append(value.sky.cloudness)
         precipitations.append(value.sky.precipitation)
         precipitation += value.precipitation
-    result.temperature = [max(temperatures), min(temperatures)]
-    result.pressure = [max(pressures), min(pressures)]
+    result.temperature = _merge_values(temperatures, mode)
+    result.pressure = _merge_values(pressures, mode)
     result.humidity = round(statistics.mean(humidities))
     result.wind_speed = round(statistics.mean(wind_speeds))
     result.wind_gust = round(statistics.mean(wind_gusts))
     result.wind_direction = statistics.mean(wind_directions)
-    # TODO: merge cloudnesses
     for item in cloudnesses:
-        if item != Cloudness.CLEAR:
+        if Cloudness.values.index(item) > Cloudness.values.index(result.sky.cloudness):
             result.sky.cloudness = item
-    # TODO: merge precipitations
     for item in precipitations:
-        if item != Precipitation.NO:
+        if Precipitation.values.index(item) > Precipitation.values.index(result.sky.precipitation):
             result.sky.precipitation = item
     result.precipitation = precipitation
     return result

locales/ru/LC_MESSAGES/messages.po

@@ -69,9 +69,18 @@ msgstr "Давление, мм рт. ст."
 msgid "Humidity, %"
 msgstr "Влажность, %"
 
+msgid "Stored locations"
+msgstr "Сохранённые локации"
+
 # tv
 msgid "TV program"
 msgstr "Телепрограмма"
 
 msgid "Live broadcasts"
 msgstr "Прямые трансляции"
+
+msgid "Stored channels"
+msgstr "Сохранённые каналы"
+
+msgid "Channel groups"
+msgstr "Группы каналов"

poetry.lock

@@ -853,6 +853,99 @@ files = [
     {file = "frozenlist-1.8.0.tar.gz", hash = "sha256:3ede829ed8d842f6cd48fc7081d7a41001a56f1f38603f9d49bf3020d59a31ad"},
 ]
 
+[[package]]
+name = "greenlet"
+version = "3.5.5"
+description = "Lightweight in-process concurrent programming"
+optional = false
+python-versions = ">=3.10"
+groups = ["main"]
+files = [
+    {file = "greenlet-3.5.5-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:816230f469381ad0a43abc9fa8dda5a699e32fb78958dde32ded93213b70a667"},
+    {file = "greenlet-3.5.5-cp310-cp310-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a5433cf291e0ef9114bd14d0d824db6e5e4a43033234bca48181a9597acca07b"},
+    {file = "greenlet-3.5.5-cp310-cp310-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:19d59f068887d8c5907fc177f27683413ace3011b6ed646c0b309266e74a6502"},
+    {file = "greenlet-3.5.5-cp310-cp310-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:86c5113d698cb8d927b2750bb1f1d59eefe3a37e0e0217491aee29a7f84ef52c"},
+    {file = "greenlet-3.5.5-cp310-cp310-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9ff00e12102358292087274dfb1669132387ff6e7920ebf9d85f4826ce0d3a56"},
+    {file = "greenlet-3.5.5-cp310-cp310-manylinux_2_39_riscv64.whl", hash = "sha256:c69bed34470abfcd456984fdadaa18e62169af4480335c45f3c32d1d9c12e638"},
+    {file = "greenlet-3.5.5-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:523bb8e27614d77101ea7a8cf59f8d91219b72d5c29f6a038c92b50828bfa8d0"},
+    {file = "greenlet-3.5.5-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:f1e2db190db51c17433eee424803818cf0670bf049d9cfe0dd07be111d1aa7c4"},
+    {file = "greenlet-3.5.5-cp310-cp310-win_amd64.whl", hash = "sha256:740e544169527b82695ce76af2f7ad6f030904658f2f3921a1d245771fb88cfc"},
+    {file = "greenlet-3.5.5-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:be63afcbbccfad3dd95a1ba12ada84dab2ef32031973d80b5b92df67fa763a61"},
+    {file = "greenlet-3.5.5-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8a268024ce2d7d2b04694bf1594058981a9fa663d1df4b762dee499211ed7c1c"},
+    {file = "greenlet-3.5.5-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:35cbb8bf55ace57fbccb4fb8622c4521713acd8691e77f4696d416ea7ca527da"},
+    {file = "greenlet-3.5.5-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:abc8bc8d9f935cd685457545b6a53863a877fdc12c2c0f5ee9beee18d9db139c"},
+    {file = "greenlet-3.5.5-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:74cc6df89ec5302337adc9cf096221cbed2510fd444b0e0f1586cf0470740864"},
+    {file = "greenlet-3.5.5-cp311-cp311-manylinux_2_39_riscv64.whl", hash = "sha256:3134291427bb0f3526e9d90311988caf336eb43730e95244997a4fb15f45144f"},
+    {file = "greenlet-3.5.5-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6d9b454c5fc48aeaa7c4337813dbf513a6870468e426438a04d922c6d0fe63db"},
+    {file = "greenlet-3.5.5-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:03551ed792cb1b4fc0277a0c60dfd8c343894a0ba06fe60dcd22f568b433da39"},
+    {file = "greenlet-3.5.5-cp311-cp311-win_amd64.whl", hash = "sha256:ab3df3dffb58bf70564e93a5cec7941e4d9faa5a36cc4234a10d3131afe04f53"},
+    {file = "greenlet-3.5.5-cp311-cp311-win_arm64.whl", hash = "sha256:2b70a766135540c472ac1393d57c2e1b4a2eb85bf526a1e41e6d096173a8cee5"},
+    {file = "greenlet-3.5.5-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:49520f0c95a48b42cf55414b8e8479beb274ea70431afc33e3f79903c71f4380"},
+    {file = "greenlet-3.5.5-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:55272212cbc5f43d1d723725ab931f1939969b7e9523882ca58b55061769d053"},
+    {file = "greenlet-3.5.5-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:655bca754a2ef4efcb0eb48a94d3f4593536d0f3d48f8ed44343c01d16a92f95"},
+    {file = "greenlet-3.5.5-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6ca5d6ae0739e5764f2cfcfaa562ac5a990cbdaedca93251c5e3cf07c362371f"},
+    {file = "greenlet-3.5.5-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:147b25a42e5ca5be3d42356e8f608b37af715a1c196e9bf9d1627f3341adfe1d"},
+    {file = "greenlet-3.5.5-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:1b5ed9162c0c098e0bbc2cf88a94f433c1b8926f831745252e099e5d83e17759"},
+    {file = "greenlet-3.5.5-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:27493374cff1d1b7919dc8126547f2aea582737e3046147b434b1e12de56389b"},
+    {file = "greenlet-3.5.5-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:12e2ee66c2aba86133f10fd99d6a8856c6d351ffb7be0e4d52ef2cc5fbb705b2"},
+    {file = "greenlet-3.5.5-cp312-cp312-win_amd64.whl", hash = "sha256:49ddacd36af37735fab103846f4ee4d18a492dde72730d1699c0c8ebe30d9f18"},
+    {file = "greenlet-3.5.5-cp312-cp312-win_arm64.whl", hash = "sha256:5f1b1ff4828cdc1aba4266aff814085d04a1d07959287219af021b838b265d52"},
+    {file = "greenlet-3.5.5-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:b79fd2a5bc099b5e744f34c4c9a58954a5f4cb7529fb4b6e8446057d61b6edaa"},
+    {file = "greenlet-3.5.5-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:634cf15a233a949136879dd388e25d3296e16f3f1e217d2456797b8579ebc6ed"},
+    {file = "greenlet-3.5.5-cp313-cp313-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:499adea519f748407fc6806d20eedabac2884fd73b9f38d81236e190ba20dfef"},
+    {file = "greenlet-3.5.5-cp313-cp313-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:f7278591501941bb2456af102bb9cd59aab48c6cfd6e2dd68fa1290bb0c49a42"},
+    {file = "greenlet-3.5.5-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2eabb980975cba5b93a95f6f69287d05fc05ac955bfd6a320a7c083eeb52c0b0"},
+    {file = "greenlet-3.5.5-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:4dfc7c4470354e7b09184d1a3a985761053a2fd694ddb5b5c80242afc2c8c90b"},
+    {file = "greenlet-3.5.5-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:03115c2e0a371999bf8ae616aa8d653f96641d4705c457aebaa187276e9f7537"},
+    {file = "greenlet-3.5.5-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4441153ffba21b90d3ca89fe3d31f5c093ae6c0bf0cfdfc98f54cde22f95b62e"},
+    {file = "greenlet-3.5.5-cp313-cp313-win_amd64.whl", hash = "sha256:95c5b1f4b3a193f8a0c2de4bfdcb48d119f7f1063941f1de1f2168051b3e52dd"},
+    {file = "greenlet-3.5.5-cp313-cp313-win_arm64.whl", hash = "sha256:1af90aa4bc129883b340cdd6957a3bc74f60528a4993bbd1f53aaebe1d9981cc"},
+    {file = "greenlet-3.5.5-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:d4a389a852e392a6366058651a20fa5ba40d979865aa81bea2ccbdc44805070d"},
+    {file = "greenlet-3.5.5-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:70b157cd319873e8b544ddc2de158f55bbd0a9b0218c8ce9332039801518e328"},
+    {file = "greenlet-3.5.5-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8bdfd1424abcf26832961e766570cae79efdb9599d709088c9cb6ef82b194926"},
+    {file = "greenlet-3.5.5-cp314-cp314-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d98ef6f92e67c6dbf299dbfd8facc1b0d2d9cedf91e325e73b3d0373fe4309d8"},
+    {file = "greenlet-3.5.5-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:182de51c6b572a705f2fafaab2e783bcf7d2760940229dfe73086cbae037af3e"},
+    {file = "greenlet-3.5.5-cp314-cp314-manylinux_2_39_riscv64.whl", hash = "sha256:159df1942d88e8f784cbb38d6f18bdb365cd11319cfbb3e89623de2b97892d53"},
+    {file = "greenlet-3.5.5-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:8fec3f165dfe332e490c3247c0f6c23b0bfc45f06496ad7f00ddb00e3d35e4dc"},
+    {file = "greenlet-3.5.5-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:c6ce25fee6cabc8bf22cb8b52e642cbb821be5b9aec8094d07ff03378141b8e9"},
+    {file = "greenlet-3.5.5-cp314-cp314-win_amd64.whl", hash = "sha256:7dffc5c859fe6059974df1e37d7923d654a83e2ae18fdd616994270e001115e1"},
+    {file = "greenlet-3.5.5-cp314-cp314-win_arm64.whl", hash = "sha256:5e2afcfc4d4305dd715809b03da5cbe437c8984f61d8917751eb5fe4aefa3e07"},
+    {file = "greenlet-3.5.5-cp314-cp314t-macosx_11_0_universal2.whl", hash = "sha256:0e5a7de979d764aea1f5b6e95cf92b5b37741b9823702041f34b126e7f690277"},
+    {file = "greenlet-3.5.5-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:fef01bd457f11fc158b130ca0027a3c365693280e8e231b65bdaf57999f39f5b"},
+    {file = "greenlet-3.5.5-cp314-cp314t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5173a72310725a74afc82c164f0e52cb8ad0de62f2bb623f24f6c0cc07d80272"},
+    {file = "greenlet-3.5.5-cp314-cp314t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5e9ec2e7c98e895fcea0c5cc57b2606cf86ece6d0a56578f3eb225e2af4f0387"},
+    {file = "greenlet-3.5.5-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:44f08341873200ba8a60a8bc14ace3d91f1754f7fa7bc66157714a8cd420a476"},
+    {file = "greenlet-3.5.5-cp314-cp314t-manylinux_2_39_riscv64.whl", hash = "sha256:102817506f6090b5176c746a82603341a549b40e5c3d5b72a4c672228a918c41"},
+    {file = "greenlet-3.5.5-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:d246c0db9a2513cd45f019ba178ea4d4d4705bd210ee465e2c15d76a1ab13874"},
+    {file = "greenlet-3.5.5-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:72507285b5caa1d17904a3f7c322ca780823a54170a0e04ec3f37bcc60d4db71"},
+    {file = "greenlet-3.5.5-cp314-cp314t-win_amd64.whl", hash = "sha256:7805655781fb8f28a55d05fe57ed61f5f10f1892fb587673e3bb5264f28041f0"},
+    {file = "greenlet-3.5.5-cp315-cp315-macosx_11_0_universal2.whl", hash = "sha256:c0db80fcd5b8aece93f66c64f78a786bbb6b96c5fe63ef5a5a4581ecf8bab206"},
+    {file = "greenlet-3.5.5-cp315-cp315-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b241c32f912ada659808d68e308c568baf577eebf757d15471472de0c18cfad"},
+    {file = "greenlet-3.5.5-cp315-cp315-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ef6a08349401d8eaf3cb12688ac8557de95788556b8631ef17555a4a173022c0"},
+    {file = "greenlet-3.5.5-cp315-cp315-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:37faa97daccb6d9f4c2141ce3118d023c3c5506864a7d8bdf726f665018c1f76"},
+    {file = "greenlet-3.5.5-cp315-cp315-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f2e3d061b8e13aec2f0441689b3c71b244a20e5d274a52cb0f7e31bd1d139552"},
+    {file = "greenlet-3.5.5-cp315-cp315-manylinux_2_39_riscv64.whl", hash = "sha256:b18007dc2473a7942fd157366b55f01da6fed7ce85318591005b419e0a439474"},
+    {file = "greenlet-3.5.5-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:9ab5f5b93655e77fe0d6c2dfd22b5eac751bb1f876d8ec21761b7c1fb9266007"},
+    {file = "greenlet-3.5.5-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:f0e5a21bd4452a88cf032fc43c4a5b307ab1380eacb63b5988f9c0317885e773"},
+    {file = "greenlet-3.5.5-cp315-cp315-win_amd64.whl", hash = "sha256:469dbb0a78625642f4a626cfd0c6e8bccc0385b5e49189b6308bbe849ec88a8e"},
+    {file = "greenlet-3.5.5-cp315-cp315-win_arm64.whl", hash = "sha256:2d57406c3efd32d7a81e17a674314e8bd00792cdab49ea3228a49aa1bfb2e769"},
+    {file = "greenlet-3.5.5-cp315-cp315t-macosx_11_0_universal2.whl", hash = "sha256:68184dfcf50ccaa8e864770fe0633a7e27250ea9329f8192ef47ee9ecfd78e1c"},
+    {file = "greenlet-3.5.5-cp315-cp315t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9ec0dc0e59dc9c61af5c47348365ccbbd7addfafe0a93b00336ff3da2907bdc6"},
+    {file = "greenlet-3.5.5-cp315-cp315t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e604f58e35833fc46ef20302bcb314dddbfd3fcf33a4f936216d51dd678d63ae"},
+    {file = "greenlet-3.5.5-cp315-cp315t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:2888a3a38bc5ee5bb6c438372197152e815837e4fab7ed7a1f86ef18ffd58ad1"},
+    {file = "greenlet-3.5.5-cp315-cp315t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:40239b5384f96da3963585cc6d7eaa9b56f8ae67e8d92cc82dd9e202fc847de3"},
+    {file = "greenlet-3.5.5-cp315-cp315t-manylinux_2_39_riscv64.whl", hash = "sha256:1e8d9391fe77f15649589a907cef972dbbd6352ef7ff7dc0492f658c0c26495f"},
+    {file = "greenlet-3.5.5-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:a1eaccf5c3a1d3e46dead602c72e6836731e8e245c9de6a27764567b6b62d4c0"},
+    {file = "greenlet-3.5.5-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:19e4e026fe20691f333b8eb1a3bc9625eceba8c3f9d62ec5a6f8581afbc6b5a5"},
+    {file = "greenlet-3.5.5-cp315-cp315t-win_amd64.whl", hash = "sha256:712aee154f648bde84634654bb38bb78c69ac640c37a45c9effed800735049d8"},
+    {file = "greenlet-3.5.5-cp315-cp315t-win_arm64.whl", hash = "sha256:7f049911ee81a16a03c33d5450d8d5867d27f596ca5fb201b86f4524e874468b"},
+    {file = "greenlet-3.5.5.tar.gz", hash = "sha256:adb4bae02e91a8e863e48b177e4014bdcac8a6b5e047ea1df687a61534b85e6c"},
+]
+
+[package.extras]
+docs = ["Sphinx", "furo"]
+test = ["objgraph", "psutil", "setuptools"]
+
 [[package]]
 name = "h11"
 version = "0.16.0"
@@ -1396,6 +1489,28 @@ files = [
     {file = "platformdirs-4.10.0.tar.gz", hash = "sha256:31e761a6a0ca04faf7353ea759bdba55652be214725111e5aac52dfa29d4bef7"},
 ]
 
+[[package]]
+name = "playwright"
+version = "1.62.0"
+description = "A high-level API to automate web browsers"
+optional = false
+python-versions = ">=3.10"
+groups = ["main"]
+files = [
+    {file = "playwright-1.62.0-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:d8da938f3748841a8754f2e1f0216902c1c8f8ae3720de8b32ccf8e6913a7c4f"},
+    {file = "playwright-1.62.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:db755ab27db21a04186f1fe8169888e42356086e439b1059b923ef417f0b6034"},
+    {file = "playwright-1.62.0-py3-none-macosx_11_0_universal2.whl", hash = "sha256:5108bd5b3e87169ddf269feee097da5893af7f8aea4634dfc840518d64c1f1da"},
+    {file = "playwright-1.62.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:ba33bae6a13b3d9d354c751cb618af357d20fe1d57767cbcce52079bbef17ad3"},
+    {file = "playwright-1.62.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:db2d76613a57ad844362ce42f7d0c2fa26b19a4f7a46d4f76b891c631e6e5aff"},
+    {file = "playwright-1.62.0-py3-none-win32.whl", hash = "sha256:e5614fa89355d7081457680324bb219f79f69c423c5cb6fa250e30b0d8aebf1c"},
+    {file = "playwright-1.62.0-py3-none-win_amd64.whl", hash = "sha256:92c0d98ed04eb35af557b709875edba415b1f548bdb22ddb5bb3e1e6c835c2f1"},
+    {file = "playwright-1.62.0-py3-none-win_arm64.whl", hash = "sha256:ea8d3055aa9d5a9f1832ac82517bd8b42c78fac7ebcbebb0107116735c8cb6a1"},
+]
+
+[package.dependencies]
+greenlet = ">=3.1.1,<4.0.0"
+pyee = ">=13,<14"
+
 [[package]]
 name = "pluggy"
 version = "1.6.0"
@@ -1751,6 +1866,24 @@ gcp-secret-manager = ["google-cloud-secret-manager (>=2.23.1)"]
 toml = ["tomli (>=2.0.1)"]
 yaml = ["pyyaml (>=6.0.1)"]
 
+[[package]]
+name = "pyee"
+version = "13.0.1"
+description = "A rough port of Node.js's EventEmitter to Python with a few tricks of its own"
+optional = false
+python-versions = ">=3.8"
+groups = ["main"]
+files = [
+    {file = "pyee-13.0.1-py3-none-any.whl", hash = "sha256:af2f8fede4171ef667dfded53f96e2ed0d6e6bd7ee3bb46437f77e3b57689228"},
+    {file = "pyee-13.0.1.tar.gz", hash = "sha256:0b931f7c14535667ed4c7e0d531716368715e860b988770fc7eb8578d1f67fc8"},
+]
+
+[package.dependencies]
+typing-extensions = "*"
+
+[package.extras]
+dev = ["black", "build", "flake8", "flake8-black", "isort", "jupyter-console", "mkdocs", "mkdocs-include-markdown-plugin", "mkdocstrings[python]", "mypy", "pytest", "pytest-asyncio ; python_version >= \"3.4\"", "pytest-trio ; python_version >= \"3.7\"", "sphinx", "toml", "tox", "trio", "trio ; python_version > \"3.6\"", "trio-typing ; python_version > \"3.6\"", "twine", "twisted", "validate-pyproject[all]"]
+
 [[package]]
 name = "pygments"
 version = "2.20.0"
@@ -3015,4 +3148,4 @@ app = ["babel", "fastapi", "jinja2"]
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.14,<4.0"
-content-hash = "7f8a3d007747f68e9735e957a0c06459044c8006b89cf3f5d37512f36638abd5"
+content-hash = "b0c7f9c6c9fbb20ada45e7d27601920b0ba42716a1a70b4e317e7295de230376"

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "gallery"
 description = ""
-version = "0.5.3"
+version = "0.8.3"
 readme = "README.md"
 authors = [{ name = "shmyga", email = "shmyga.z@gmail.com" }]
 requires-python = '>=3.14,<4.0'
@@ -11,6 +11,7 @@ dependencies = [
   'dateparser (>=1.4,<2.0)',
   'pydantic (>=2.13,<3.0)',
   'aiocache[redis] (>=0.12,<0.13)',
+  "playwright (>=1.62.0,<2.0.0)",
 ]
 
 [project.optional-dependencies]
@@ -37,6 +38,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.black]
 line-length = 120
+target-version = ["py314"]
 
 [tool.isort]
 profile = "black"

scripts/setup

@@ -11,6 +11,7 @@ source .env
 # python
 poetry env use ${PYTHON_VERSION}
 poetry install
+.venv/bin/playwright install chromium --with-deps --only-shell
 
 # static
 cd static || exit

static/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "gallery",
-  "version": "0.5.3",
+  "version": "0.8.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "gallery",
-      "version": "0.5.3",
+      "version": "0.8.3",
       "license": "ISC",
       "dependencies": {
         "@popperjs/core": "^2.11.8",

static/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gallery",
-  "version": "0.5.3",
+  "version": "0.8.3",
   "type": "module",
   "scripts": {
     "build": "webpack --mode production",

static/src/app/base/component.ts

@@ -0,0 +1,196 @@
+export interface Type<T> extends Function {
+  new (...args: any[]): T;
+}
+
+export abstract class ValueElement<T, O> extends HTMLElement {
+  static observedAttributes = ["value"];
+
+  private _value: T | null = null;
+
+  get value(): T | null {
+    return this._value;
+  }
+
+  set value(value: T | null) {
+    if (value) {
+      this.setAttribute("value", JSON.stringify(value));
+    } else if (this.hasAttribute("value")) {
+      this.removeAttribute("value");
+    }
+  }
+
+  options: O | null;
+
+  constructor(value: T | null = null, options: O | null = null) {
+    super();
+    if (value) {
+      this.value = value;
+    }
+    this.options = options;
+    this.onInit();
+  }
+
+  onInit() {}
+
+  beforeRefresh() {}
+
+  onRefresh() {}
+
+  abstract buildHTML(): string;
+
+  refresh() {
+    const rawValue = this.getAttribute("value");
+    if (rawValue) {
+      this._value = JSON.parse(rawValue);
+    } else {
+      this._value = null;
+    }
+    if (this.className) {
+      this.classList = this.className;
+    }
+    this.beforeRefresh();
+    this.innerHTML = this.buildHTML();
+    this.onRefresh();
+  }
+
+  connectedCallback() {
+    this.refresh();
+  }
+
+  attributeChangedCallback(name: string, oldValue: any, newValue: any) {
+    setTimeout(() => this.refresh());
+  }
+}
+
+export interface ListOptions<T> {
+  onClick?: (element: ListItemElement<T>) => void;
+  onAdd?: (element: ListItemElement<T>) => void;
+  onRemove?: (element: ListItemElement<T>) => void;
+}
+
+export abstract class ListItemElement<T> extends ValueElement<T, ListOptions<T>> {
+  abstract getHref(value: T): string;
+
+  abstract getContent(value: T): string;
+
+  className = "list-group-item list-group-item-action";
+
+  onInit(): void {
+    this.handleClick = this.handleClick.bind(this);
+    this.handleRemoveClick = this.handleRemoveClick.bind(this);
+    this.handleAddClick = this.handleAddClick.bind(this);
+  }
+
+  buildHTML(): string {
+    if (!this.value) {
+      return "";
+    }
+    const href = this.getHref(this.value);
+    const content = this.getContent(this.value);
+    return `
+    <a href="${href}"
+      class="d-flex justify-content-between align-items-start text-decoration-none">
+      <span>
+        <span class="text-success me-2 ${this.options?.onAdd ? "" : "d-none"}" style="color: green;" data-add>
+          &plus;
+        </span>
+        ${content}
+      </span>
+      <span>
+        <span class="text-danger ms-2 ${this.options?.onRemove ? "" : "d-none"}" data-remove>
+          &#x2715;
+        </span>
+      </span>
+    </a>
+    `;
+  }
+
+  onRefresh(): void {
+    this.addEventListener("click", this.handleClick);
+    if (this.options?.onAdd) {
+      this.querySelector<HTMLElement>("[data-add]")?.addEventListener("click", this.handleAddClick);
+    } else {
+      this.querySelector("[data-add]")?.remove();
+    }
+    if (this.options?.onRemove) {
+      this.querySelector<HTMLElement>("[data-remove]")?.addEventListener("click", this.handleRemoveClick);
+    } else {
+      this.querySelector("[data-remove]")?.remove();
+    }
+  }
+
+  handleClick(event: MouseEvent) {
+    if (this.value && this.options?.onClick) {
+      this.options.onClick(this);
+    }
+  }
+
+  handleAddClick(event: MouseEvent) {
+    event.preventDefault();
+    event.stopPropagation();
+    if (this.value && this.options?.onAdd) {
+      this.options.onAdd(this);
+    }
+  }
+
+  handleRemoveClick(event: MouseEvent) {
+    event.preventDefault();
+    event.stopPropagation();
+    if (this.value && this.options?.onRemove) {
+      this.options.onRemove(this);
+    }
+  }
+
+  disconnectedCallback() {
+    this.removeEventListener("click", this.handleClick);
+    this.querySelector<HTMLElement>("[data-add]")?.removeEventListener("click", this.handleAddClick);
+    this.querySelector<HTMLElement>("[data-remove]")?.removeEventListener("click", this.handleRemoveClick);
+  }
+}
+
+export abstract class ListElement<T, C extends ListItemElement<T> = ListItemElement<T>> extends ValueElement<
+  T[],
+  ListOptions<T>
+> {
+  static observedAttributes = ["value", "onadd", "onremove", "onclick"];
+
+  abstract childType: Type<C>;
+
+  className = "list-group";
+
+  buildHTML(): string {
+    return "";
+  }
+
+  beforeRefresh() {
+    if (this.hasAttribute("onclick")) {
+      const onclick = new Function("element", this.getAttribute("onclick")!) as ListOptions<T>["onClick"];
+      if (!this.options) {
+        this.options = {};
+      }
+      this.options.onClick = onclick;
+    }
+    if (this.hasAttribute("onadd")) {
+      const onadd = new Function("element", this.getAttribute("onadd")!) as ListOptions<T>["onAdd"];
+      if (!this.options) {
+        this.options = {};
+      }
+      this.options.onAdd = onadd;
+    }
+    if (this.hasAttribute("onremove")) {
+      const onremove = new Function("element", this.getAttribute("onremove")!) as ListOptions<T>["onRemove"];
+      if (!this.options) {
+        this.options = {};
+      }
+      this.options.onRemove = onremove;
+    }
+  }
+
+  onRefresh() {
+    if (this.value) {
+      for (const item of this.value) {
+        this.appendChild(new this.childType(item, this.options));
+      }
+    }
+  }
+}

static/src/app/base/manager.ts

@@ -0,0 +1,50 @@
+import { ListElement, ListItemElement } from "./component";
+import { DataStorage, StorageValue } from "./storage";
+
+export class DataManager<T extends StorageValue> {
+  private storage: DataStorage<T>;
+
+  private get dataList(): ListElement<T> {
+    return document.querySelector(this.dataListSelector)!;
+  }
+
+  constructor(
+    listComponentType: typeof ListElement<T>, //prevent removing as unusing
+    storageKey: string,
+    private dataListSelector: string,
+  ) {
+    this.storage = new DataStorage(storageKey);
+    this.load = this.load.bind(this);
+    this.store = this.store.bind(this);
+    this.add = this.add.bind(this);
+    this.remove = this.remove.bind(this);
+  }
+
+  load() {
+    this.dataList.value = this.storage.getAll();
+  }
+
+  store(element: ListItemElement<T>) {
+    if (element.value) {
+      this.storage.add(element.value);
+    }
+  }
+
+  add(element: ListItemElement<T>) {
+    const value = element.value;
+    value;
+    if (value && this.storage.add(value)) {
+      const clone: ListItemElement<T> = element.cloneNode(true) as ListItemElement<T>;
+      clone.options = { onRemove: this.remove };
+      this.dataList.appendChild(clone);
+    }
+  }
+
+  remove(element: ListItemElement<T>) {
+    const value = element.value;
+    if (value) {
+      this.storage.remove(value.id);
+      element.remove();
+    }
+  }
+}

static/src/app/base/storage.ts

@@ -0,0 +1,46 @@
+export interface StorageValue {
+  id: string;
+}
+
+export class DataStorage<T extends StorageValue> {
+  constructor(private storageKey: string) {}
+
+  private readValues(): T[] {
+    const objects = JSON.parse(window.localStorage.getItem(this.storageKey) || "[]");
+    if (!Array.isArray(objects)) {
+      return Object.values(objects);
+    }
+    return objects;
+  }
+
+  private writeValues(values: T[]) {
+    window.localStorage.setItem(this.storageKey, JSON.stringify(values));
+  }
+
+  getAll(): T[] {
+    return this.readValues();
+  }
+
+  add(value: T): boolean {
+    const values = this.readValues();
+    for (const v of values) {
+      if (v.id == value.id) {
+        return false;
+      }
+    }
+    values.push(value);
+    this.writeValues(values);
+    return true;
+  }
+
+  remove(id: string) {
+    const values = this.readValues();
+    for (let i = 0; i < values.length; i++) {
+      if (values[i].id == id) {
+        values.splice(i, 1);
+        this.writeValues(values);
+        return;
+      }
+    }
+  }
+}

static/src/app/schedule.ts

@@ -1,110 +0,0 @@
-export interface Channel {
-  id: string;
-  name: string;
-  provider: string;
-}
-
-export class ScheduleChannelStorage {
-  private storageKey: string = "schedule:channels";
-
-  getAll(): Channel[] {
-    const objects = JSON.parse(window.localStorage.getItem(this.storageKey) || "{}");
-    return Object.values(objects);
-  }
-
-  add(object: Channel) {
-    const objects = JSON.parse(window.localStorage.getItem(this.storageKey) || "{}");
-    objects[object.id] = object;
-    window.localStorage.setItem(this.storageKey, JSON.stringify(objects));
-  }
-
-  remove(id: string) {
-    const objects = JSON.parse(window.localStorage.getItem(this.storageKey) || "{}");
-    delete objects[id];
-    window.localStorage.setItem(this.storageKey, JSON.stringify(objects));
-  }
-}
-
-export class ScheduleChannelManager {
-  loadChannels(selector: string) {
-    const channels = window.scheduleChannelStorage.getAll();
-    const container = document.querySelector(selector);
-    if (container) {
-      container.innerHTML = "";
-      for (const channel of channels) {
-        const element = new ScheduleChannelElement();
-        element.setAttribute("channel", JSON.stringify(channel));
-        element.setAttribute("removable", "");
-        container.appendChild(element);
-      }
-    }
-  }
-}
-
-class ScheduleChannelElement extends HTMLElement {
-  static observedAttributes = ["channel", "removable"];
-
-  channel: Channel | null = null;
-
-  constructor() {
-    super();
-    this.handleClick = this.handleClick.bind(this);
-    this.handleRemoveClick = this.handleRemoveClick.bind(this);
-  }
-
-  connectedCallback() {
-    this.channel = JSON.parse(this.getAttribute("channel") || "{}");
-    this.innerHTML = `
-    <a href="${this.channel?.provider}/${this.channel?.id}"
-      class="d-flex justify-content-between align-items-start  text-decoration-none">
-      <span>
-        <span class="text-primary">${this.channel?.name}</span>
-      </span>
-      <span>
-        <span class="badge text-bg-secondary">${this.channel?.provider}</span>
-        <span class="text-danger ms-2" data-remove>
-          &#x2715;
-        </span>
-      </span>
-    </a>`;
-    this.classList = "list-group-item list-group-item-action";
-    this.addEventListener("click", this.handleClick);
-    if (this.hasAttribute("removable")) {
-      this.querySelector<HTMLElement>("[data-remove]")?.addEventListener("click", this.handleRemoveClick);
-    } else {
-      this.querySelector("[data-remove]")?.remove();
-    }
-  }
-
-  disconnectedCallback() {
-    this.removeEventListener("click", this.handleClick);
-    this.querySelector<HTMLElement>("[data-remove]")?.removeEventListener("click", this.handleRemoveClick);
-  }
-
-  handleClick(event: MouseEvent) {
-    if (this.channel) {
-      window.scheduleChannelStorage.add(this.channel);
-    }
-  }
-
-  handleRemoveClick(event: MouseEvent) {
-    event.preventDefault();
-    event.stopPropagation();
-    if (this.channel) {
-      window.scheduleChannelStorage.remove(this.channel.id);
-    }
-    this.remove();
-  }
-}
-
-customElements.define("schedule-channel", ScheduleChannelElement);
-
-declare global {
-  interface Window {
-    scheduleChannelStorage: ScheduleChannelStorage;
-    scheduleChannelManager: ScheduleChannelManager;
-  }
-}
-
-window.scheduleChannelStorage = new ScheduleChannelStorage();
-window.scheduleChannelManager = new ScheduleChannelManager();

static/src/app/schedule/component.ts

@@ -0,0 +1,52 @@
+import { ListElement, ListItemElement, ValueElement } from "../base/component";
+import { Channel } from "./model";
+
+export class ScheduleChannelGroup extends ValueElement<string | Channel[], {}> {
+  className: string = "list-group-item list-group-item-action";
+
+  buildHTML(): string {
+    const groupName = Array.isArray(this.value) ? "Open All" : this.value;
+    const groupId = Array.isArray(this.value)
+      ? this.value.map((item) => `${item.provider}:${item.id}`).join(",")
+      : this.value || "";
+    return `
+    <a href="group/${encodeURIComponent(groupId)}"
+      class="d-flex justify-content-between align-items-start text-decoration-none">
+      <span>
+        <span class="text-primary" style="text-transform: capitalize">${groupName}</span>
+      </span>
+    </a>`;
+  }
+}
+
+customElements.define("schedule-channel-group", ScheduleChannelGroup);
+
+export class ScheduleChannelItem extends ListItemElement<Channel> {
+  getHref(value: Channel): string {
+    return `${value.provider}/${value.id}`;
+  }
+
+  getContent(value: Channel): string {
+    return `
+    <span class="badge me-1 text-bg-secondary">${value.provider}</span>
+    <span class="text-primary">${value.name}</span>
+    `;
+  }
+}
+
+export class ScheduleChannelList extends ListElement<Channel, ScheduleChannelItem> {
+  childType = ScheduleChannelItem;
+
+  public onRefresh(): void {
+    super.onRefresh();
+    if (this.value?.length) {
+      const groupElement = new ScheduleChannelGroup(this.value);
+      this.prepend(groupElement);
+    } else {
+      this.prepend("Empty");
+    }
+  }
+}
+
+customElements.define("schedule-channel-item", ScheduleChannelItem);
+customElements.define("schedule-channel-list", ScheduleChannelList);

static/src/app/schedule/index.ts

@@ -0,0 +1,11 @@
+import { DataManager } from "../base/manager";
+import { ScheduleChannelList } from "./component";
+import { Channel } from "./model";
+
+declare global {
+  interface Window {
+    scheduleChannelManager: DataManager<Channel>;
+  }
+}
+
+window.scheduleChannelManager = new DataManager(ScheduleChannelList, "schedule:channels", "#storedChannels");

static/src/app/schedule/model.ts

@@ -0,0 +1,5 @@
+export interface Channel {
+  id: string;
+  name: string;
+  provider: string;
+}

static/src/app/weather.ts

@@ -1,118 +0,0 @@
-export interface Location {
-  id: string;
-  name: string;
-  provider: string;
-  country_code: string;
-  country?: string;
-  district?: string;
-  subdistrict?: string;
-}
-
-export class WeatherLocationStorage {
-  private storageKey: string = "weather:locations";
-
-  getAll(): Location[] {
-    const locations = JSON.parse(window.localStorage.getItem(this.storageKey) || "{}");
-    return Object.values(locations);
-  }
-
-  add(location: Location) {
-    const locations = JSON.parse(window.localStorage.getItem(this.storageKey) || "{}");
-    locations[location.id] = location;
-    window.localStorage.setItem(this.storageKey, JSON.stringify(locations));
-  }
-
-  remove(id: string) {
-    const locations = JSON.parse(window.localStorage.getItem(this.storageKey) || "{}");
-    delete locations[id];
-    window.localStorage.setItem(this.storageKey, JSON.stringify(locations));
-  }
-}
-
-export class WeatherLocationManager {
-  loadLocations(selector: string) {
-    const locations = window.weatherLocationStorage.getAll();
-    const container = document.querySelector(selector);
-    if (container) {
-      container.innerHTML = "";
-      for (const location of locations) {
-        const element = new WeatherLocationElement();
-        element.setAttribute("location", JSON.stringify(location));
-        element.setAttribute("removable", "");
-        container.appendChild(element);
-      }
-    }
-  }
-}
-
-class WeatherLocationElement extends HTMLElement {
-  static observedAttributes = ["location", "removable"];
-
-  location: Location | null = null;
-
-  constructor() {
-    super();
-    this.handleClick = this.handleClick.bind(this);
-    this.handleRemoveClick = this.handleRemoveClick.bind(this);
-  }
-
-  connectedCallback() {
-    this.location = JSON.parse(this.getAttribute("location") || "{}");
-    this.innerHTML = `
-    <a href="${this.location?.provider}/${this.location?.id}"
-      class="d-flex justify-content-between align-items-start text-decoration-none">
-      <span>
-        <span class="fi fi-${this.location?.country_code} me-1"></span>
-        <span class="text-primary">${this.location?.name}</span>
-        <span class="small ms-1 text-secondary">
-          ${this.location?.country}, ${this.location?.district}, ${this.location?.subdistrict}
-        </span>
-      </span>
-      <span>
-        <span class="badge text-bg-secondary">${this.location?.provider}</span>
-        <span class="text-danger ms-2" data-remove>
-          &#x2715;
-        </span>
-      </span>
-    </a>`;
-    this.classList = 'list-group-item list-group-item-action';
-    this.addEventListener("click", this.handleClick);
-    if (this.hasAttribute("removable")) {
-      this.querySelector<HTMLElement>("[data-remove]")?.addEventListener("click", this.handleRemoveClick);
-    } else {
-      this.querySelector("[data-remove]")?.remove();
-    }
-  }
-
-  disconnectedCallback() {
-    this.removeEventListener("click", this.handleClick);
-    this.querySelector<HTMLElement>("[data-remove]")?.removeEventListener("click", this.handleRemoveClick);
-  }
-
-  handleClick(event: MouseEvent) {
-    if (this.location) {
-      window.weatherLocationStorage.add(this.location);
-    }
-  }
-
-  handleRemoveClick(event: MouseEvent) {
-    event.preventDefault();
-    event.stopPropagation();
-    if (this.location) {
-      window.weatherLocationStorage.remove(this.location.id);
-    }
-    this.remove();
-  }
-}
-
-customElements.define("weather-location", WeatherLocationElement);
-
-declare global {
-  interface Window {
-    weatherLocationStorage: WeatherLocationStorage;
-    weatherLocationManager: WeatherLocationManager;
-  }
-}
-
-window.weatherLocationStorage = new WeatherLocationStorage();
-window.weatherLocationManager = new WeatherLocationManager();

static/src/app/weather/component.ts

@@ -0,0 +1,33 @@
+import { ListElement, ListItemElement } from "../base/component";
+import { Location } from "./model";
+
+export class WheatherLocationItem extends ListItemElement<Location> {
+  getHref(value: Location): string {
+    return `${value.provider}/${value.id}`;
+  }
+
+  getContent(value: Location): string {
+    return `
+    <span class="badge me-1 text-bg-secondary">${value.provider}</span>
+    <span class="fi fi-${value.country_code} me-1"></span>
+    <span class="text-primary">${value.name}</span>
+    <span class="small ms-1 text-secondary">
+      ${value.country}, ${value.district}, ${value.subdistrict}
+    </span>
+    `;
+  }
+}
+
+export class WeatherLocationList extends ListElement<Location, WheatherLocationItem> {
+  childType = WheatherLocationItem;
+
+  public onRefresh(): void {
+    super.onRefresh();
+    if (!this.value?.length) {
+      this.prepend("Empty");
+    }
+  }
+}
+
+customElements.define("weather-location-item", WheatherLocationItem);
+customElements.define("weather-location-list", WeatherLocationList);

static/src/app/weather/index.ts

@@ -0,0 +1,11 @@
+import { DataManager } from "../base/manager";
+import { WeatherLocationList } from "./component";
+import { Location } from "./model";
+
+declare global {
+  interface Window {
+    weatherLocationManager: DataManager<Location>;
+  }
+}
+
+window.weatherLocationManager = new DataManager(WeatherLocationList, "weather:locations", "#storedLocations");

static/src/app/weather/model.ts

@@ -0,0 +1,9 @@
+export interface Location {
+  id: string;
+  name: string;
+  provider: string;
+  country_code: string;
+  country?: string;
+  district?: string;
+  subdistrict?: string;
+}

static/src/lib/bootstrap-icons.scss

@@ -45,4 +45,7 @@
   &.bi-file-earmark-text {
     mask-image: url(bootstrap-icons/icons/file-earmark-text.svg);
   }
+  &.bi-cast {
+    mask-image: url(bootstrap-icons/icons/cast.svg);
+  }
 }

static/src/lib/weather-icons/icons_optimizator.py

@@ -1,3 +1,4 @@
+# pylint: skip-file
 from pathlib import Path
 
 from lxml import etree
@@ -17,8 +18,8 @@ def icon_optimizator(file: Path):
     for node in tree.findall(".//{*}path"):
         d = node.attrib["d"]
         node.attrib["d"] = " ".join(map(normalize_value, d.split(" ")))
-    #file = file.parent.parent / "icons.tmp" / file.name
-    #file.parent.mkdir(parents=True, exist_ok=True)
+    # file = file.parent.parent / "icons.tmp" / file.name
+    # file.parent.mkdir(parents=True, exist_ok=True)
     tree.write(file)
     target_size = file.stat().st_size
     print(file.name, source_size, target_size)

tests/common/mock.py

@@ -1,5 +1,7 @@
 from pathlib import Path
+from typing import TypeVar
 
+from gallery.sketch.api import Api, S
 from gallery.sketch.source import ApiSource
 
 
@@ -10,8 +12,20 @@ class MockSource(ApiSource):
         self._path = path
         self._mapping = mapping
 
-    async def request(self, endpoint: str) -> str:
+    # pylint:disable=arguments-differ,unused-argument
+    async def request(self, endpoint: str, /, **kwargs) -> str:
         for pattern, filename in self._mapping.items():
             if pattern in endpoint:
                 return (self._path / filename).read_text()
         raise ValueError(endpoint)
+
+
+API = Api[S]
+A = TypeVar("A", bound=API)
+
+
+def create_mock_api(api_type: type[A], mock_source: MockSource) -> A:
+    api = api_type()
+    # pylint: disable=protected-access
+    api._build_source = lambda: mock_source
+    return api

tests/conftest.py

@@ -0,0 +1,20 @@
+from os import environ
+
+from aiocache import caches
+
+import gallery  # pylint:disable=unused-import
+
+environ.setdefault("OPENWEATHER_KEY", "test")
+
+caches.set_config(
+    {
+        "default": {
+            "cache": "aiocache.SimpleMemoryCache",
+            "serializer": {"class": "aiocache.serializers.PickleSerializer"},
+        },
+        "redis": {
+            "cache": "aiocache.SimpleMemoryCache",
+            "serializer": {"class": "aiocache.serializers.PickleSerializer"},
+        },
+    }
+)

tests/data/openweather/__init__.py

@@ -1,8 +1,14 @@
 from pathlib import Path
 
+from gallery.painting.openweather.openweather import OpenWeather
 from tests.common.mock import MockSource
 
-OPENWEATHER_MOCK_SOURCE = MockSource(
+
+class OpenWeatherMockSource(MockSource, OpenWeather):
+    pass
+
+
+OPENWEATHER_MOCK_SOURCE = OpenWeatherMockSource(
     Path(__file__).parent,
     {
         "forecast": "forecast.json",

tests/data/rp5/__init__.py

@@ -0,0 +1,11 @@
+from pathlib import Path
+
+from tests.common.mock import MockSource
+
+RP5_MOCK_SOURCE = MockSource(
+    Path(__file__).parent,
+    {
+        "search": "search.html",
+        "test": "weather.html",
+    },
+)

tests/data/rp5/search.html

@@ -0,0 +1,379 @@
+<html lang="ru" xmlns="http://www.w3.org/1999/xhtml"><head>
+<title>Результат поиска</title>
+<script type="application/ld+json">
+{
+"dateModified": "2026-09-01"
+}
+</script>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Результат поиска. Результаты поиска.">
+<meta name="keywords" content="результат поиска, результаты поиска">
+<meta name="viewport" content="height=device-height, user-scalable=yes">
+<meta name="referrer" content="origin">
+<meta name="msapplication-config" content="/browserconfig.xml">
+<meta name="msapplication-TileColor" content="#005eb5">
+<link rel="apple-touch-icon" type="image/png" href="/images/favicons/ios/ic_ios_57x57.png" sizes="57x57">
+<link rel="apple-touch-icon" type="image/png" href="/images/favicons/ios/ic_ios_60x60.png" sizes="60x60">
+<link rel="apple-touch-icon" type="image/png" href="/images/favicons/ios/ic_ios_72x72.png" sizes="72x72">
+<link rel="apple-touch-icon" type="image/png" href="/images/favicons/ios/ic_ios_76x76.png" sizes="76x76">
+<link rel="apple-touch-icon" type="image/png" href="/images/favicons/ios/ic_ios_114x114.png" sizes="114x114">
+<link rel="apple-touch-icon" type="image/png" href="/images/favicons/ios/ic_ios_120x120.png" sizes="120x120">
+<link rel="apple-touch-icon" type="image/png" href="/images/favicons/ios/ic_ios_152x152.png" sizes="152x152">
+<link rel="apple-touch-icon" type="image/png" href="/images/favicons/ios/ic_ios_180x180.png" sizes="180x180">
+<link rel="shortcut icon" type="image/png" href="/images/favicons/android_2/192x192.png" sizes="192x192">
+<link rel="shortcut icon" type="image/png" href="/images/favicons/android_2/144x144.png" sizes="144x144">
+<link rel="shortcut icon" type="image/png" href="/images/favicons/android_2/128x128.png" sizes="128x128">
+<link rel="shortcut icon" type="image/png" href="/images/favicons/android_2/96x96.png" sizes="96x96">
+<link rel="shortcut icon" type="image/png" href="/images/favicons/android_2/72x72.png" sizes="72x72">
+<link rel="shortcut icon" type="image/png" href="/images/favicons/android_2/48x48.png" sizes="48x48">
+
+<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
+<link rel="stylesheet" href="/css/mainStyle.css?q=1.0182" type="text/css">
+<link rel="stylesheet" href="/css/sprites.css?q=1.0182" type="text/css">
+<link rel="stylesheet" href="/css/jquery.autocomplete.css?q=1.0182" type="text/css">
+    <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false&amp;key=AIzaSyAvCiizuGON7hMCTMa79Zf7d_4k56cCJ_0"></script>
+<style media="print">
+    </style>
+    
+<script type="text/javascript" src="/scripts/jquery-1.6.4.min.js"></script>
+<script type="text/javascript" src="/scripts/jquery.autocomplete.01.cr.js"></script>
+<script type="text/javascript" src="/scripts/browser.js"></script>
+<script type="text/javascript" src="/scripts/googlemap.js"></script>
+<script type="text/javascript" src="/scripts/main.022.cr.js?q=1.052"></script>
+<script type="text/javascript" src="/scripts/rp5hint.js"></script>
+<script type="text/javascript" src="/scripts/rcs.js"></script>
+<script type="text/javascript" src="/scripts/infobubble.001.js"></script>
+<script type="text/javascript" src="/scripts/maps.008.js"></script>
+<script type="text/javascript" src="/scripts/geo_vidget.js"></script>
+<!--<script type="text/javascript" src="//static.criteo.net/js/ld/publishertag.js"></script>-->
+    <script>window.yaContextCb=window.yaContextCb||[]</script>
+<script src="https://yandex.ru/ads/system/context.js" [^]="" async=""></script><script type="text/javascript" language="JavaScript">cRole = ""; langId = 2; cSearch = "Название города или села";</script>
+    <script type="text/javascript">
+        // локальное время
+        var gmtAdd = 10800000;
+        var sumHour = 0;
+        var cLocalTime = 'Местное время';
+        // установки времени
+        var Dphp = 1788293743;
+        var gmtServ = 0;
+        var Djs = Math.round(((D=new Date()).getTime()-D.getTimezoneOffset()*60000)/1000);
+        // дельта во времени в сек.
+        var tDelta = Dphp - Djs;
+    </script>
+            <style>
+                #h8c34381aaf77ce0fb634a3b6884f16046b9fd201 {display: inline-block; width: 126px; margin: 79px 0 0 8px;}
+                #ha8e4d0cfbc1ac49c913e422d81ab257c227f18a7 {clear: both;}
+                @media print {
+                    #ha8e4d0cfbc1ac49c913e422d81ab257c227f18a7 {margin-top: 20px; background: #fff;}
+                    #hf420d4b9b1efdbbe6ef03d062299d020ccae86d6 {display: none !important;}
+                }
+                #hf420d4b9b1efdbbe6ef03d062299d020ccae86d6 {float: left; font-size: 12px; display: inline; margin: 5px 0 11px 0;}
+            </style>
+<script type="text/javascript" charset="UTF-8" src="https://maps.googleapis.com/maps-api-v3/api/js/66/2d/common.js"></script><script type="text/javascript" charset="UTF-8" src="https://maps.googleapis.com/maps-api-v3/api/js/66/2d/util.js"></script></head>
+<body>
+<div id="back-wrapper" style="width: 1670px; height: 688px;"></div>
+<div id="message-outside" class="message-outside">
+    <div id="message-outside-content" class="message-outside-content"></div>
+    <div class="button-container">
+        <input type="button" class="button-blue" value="OK" onclick="displayBlocks('#message-outside','','',true); return false;">
+    </div>
+</div>
+<div id="map-screen-container">
+    <div id="map-screen-close"></div>
+    <div id="map-screen"></div>
+</div>
+
+<div id="wrapper">
+    <div id="header-wrapper" class="noprint">
+        <div id="header">
+            <table>
+                <tbody><tr>
+                    <td rowspan="3" style="width: 180px;" class="td-top">
+                        <div id="logo">
+                            <a href="/Погода_в_мире" title=""><img src="/images/ru/logo.png" title="" alt="Погода_в_мире" style="margin: 4px 0 0 -17px"></a>
+                        </div>
+                    </td>
+                    <td class="td-top">
+<div id="topMenuContent" style="text-align: left">
+    <a id="mobile_link" class="pointer" onclick="getUrl('http://m.rp5.ru/Погода_в_Змиевке,_Луганская_Народная_Республика', 'desktop'); return false;">Мобильная версия</a>|
+    <a href="/Погода_в_мире">Главная</a>|
+    <a href="/docs/about/ru">О сайте</a>|
+    <a href="/docs/faq/ru">Частые вопросы (FAQ)</a>|
+    <a href="/docs/contact/ru">Контакты</a>
+</div>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="height: 31px; vertical-align: middle"><div id="countries"><a href="/Погода_в_Беларуси">Беларусь</a>&nbsp;<a href="/Погода_в_Литве">Литва</a>&nbsp;<a href="/Погода_в_России">Россия</a>&nbsp;<a href="/Погода_в_Украине">Украина</a>&nbsp;<a href="/Погода_в_мире">Все страны</a></div>
+<div class="rightNavi noprint">
+    <div class="intoNavi rss">
+        <span class="verticalBottom" id="RSS_top">RSS&nbsp; <a href="http://rp5.ru/rss/24530/ru" id="rss_link"><div class="iconrss"></div></a>&nbsp;</span>
+    </div>
+</div>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="padding-top: 7px; vertical-align: top">
+    <div id="telephone" class="buttonSummary" style="margin: 2px 2px 0 0;" onclick="getUrl('http://m.rp5.ru/Погода_в_Змиевке,_Луганская_Народная_Республика', 'desktop'); return false;">
+        <table><tbody><tr><td style="height: 35px; padding: 0 34px 0 7px; vertical-align: middle; ">
+        <a class="inDd2Summary inDd2"><span>Мобильная версия</span></a>
+        </td></tr></tbody></table>
+    </div>
+    <div id="informerC" class="buttonSummary">
+        <div id="appButton" class="inDdSummary" style="font-size: 12px;">
+            <table><tbody><tr><td style="height: 35px; vertical-align: middle">Приложения</td></tr></tbody></table>
+        </div>
+        <div id="appMenu" style="display: none;">
+            <ul>
+                <li onclick="top.location.href='/docs/informer/ru'">Информеры</li>
+                <li onclick="top.location.href='/docs/xml/ru?id=24530'">XML</li>
+                <li onclick="top.location.href='/docs/sgate/ru'">API частных метеостанций</li>
+                <div style="margin: 2px 0 3px 0; border-top: 1px dashed #a7a7a7"></div>
+                <li onclick="top.location.href='/docs/gadget/ru'">Гаджет для WINDOWS</li>
+                    <div style="margin: 2px 0 3px 0; border-top: 1px dashed #a7a7a7"></div>
+                    <li onclick="window.open('https://play.google.com/store/apps/details?id=ru.rp5.rp5weatherhorizontal', '_blank')">Приложение для Android</li>
+                    <!--<li onclick="top.location.href='/wduck/source/new/app-release-v22.apk'">*.apk-файл</li>-->
+                <div style="margin: 2px 0 3px 0; border-top: 1px dashed #a7a7a7;"></div>
+                <li onclick="top.location.href='/Дневник_погоды_в_Сватово'">Дневник погоды для школьников</li>
+            </ul>
+        </div>
+    </div>
+    <div class="ddListSummary">
+        <span>
+            <div class="ddList2">
+                <div id="unitsButton" class="inDdSummary">
+                    <table><tbody><tr><td style="height: 35px; vertical-align: middle">Единицы измерений</td></tr></tbody></table>
+                </div>
+                <div id="unitsMenu" style="text-align: left; display: none;">
+                    <form name="fValues" action="">
+                        <table id="tValues" style="vertical-align: top;">
+                            <tbody><tr>
+                                <td>
+                                    <div>Облачность:</div>
+                                    <div>
+                                        <input type="radio" id="r_cc1" class="radioUnits" name="r_cc" title="проценты (%)" onclick="if(this.checked) {chValue('cc',0,0);}" checked="checked">
+                                        <label for="r_cc1">проценты (%)</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_cc2" class="radioUnits" name="r_cc" title="1/10" onclick="if(this.checked) {chValue('cc',1,0);}">
+                                        <label for="r_cc2">1/10</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_cc3" class="radioUnits" name="r_cc" title="окты" onclick="if(this.checked) {chValue('cc',2,0);}">
+                                        <label for="r_cc3">окты</label>
+                                    </div>
+                                </td>
+                                <td>
+                                    <div>Осадки:</div>
+                                    <div>
+                                        <input type="radio" id="r_pr1" class="radioUnits" name="r_pr" title="миллиметры (мм)" onclick="if(this.checked) {chValue('pr',0,0);}" checked="checked">
+                                        <label for="r_pr1">миллиметры (мм) / сантиметры (см)</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_pr2" class="radioUnits" name="r_pr" title="дюймы" onclick="if(this.checked) {chValue('pr',1,0);}">
+                                        <label for="r_pr2">дюймы</label>
+                                    </div>
+                                </td>
+                                <td>
+                                    <div>Температура:</div>
+                                    <div>
+                                        <input type="radio" id="r_t1" class="radioUnits" name="r_t" title="градусы Цельсия (°C)" onclick="if(this.checked) {chValue('t',0,0);}" checked="checked">
+                                        <label for="r_t1">градусы Цельсия (°C)</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_t2" class="radioUnits" name="r_t" title="градусы Фаренгейта (°F)" onclick="if(this.checked) {chValue('t',1,0);}">
+                                        <label for="r_t2">градусы Фаренгейта (°F)</label>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2">
+                                    <div>Давление:</div>
+                                    <div>
+                                        <input type="radio" id="r_p1" class="radioUnits" name="r_p" title="миллиметры ртутного столба (мм рт. ст.)" onclick="if(this.checked) {chValue('p',0,0);}" checked="checked">
+                                        <label for="r_p1">миллиметры ртутного столба (мм рт. ст.)</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_p2" class="radioUnits" name="r_p" title="дюймы ртутного столба (дюймы рт. ст.)" onclick="if(this.checked) {chValue('p',1,0);}">
+                                        <label for="r_p2">дюймы ртутного столба (дюймы рт. ст.)</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_p3" class="radioUnits" name="r_p" title="миллибары (мбар)" onclick="if(this.checked) {chValue('p',2,0);}">
+                                        <label for="r_p3">миллибары (мбар)</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_p4" class="radioUnits" name="r_p" title="гектопаскали (гПа)" onclick="if(this.checked) {chValue('p',3,0);}">
+                                        <label for="r_p3">гектопаскали (гПа)</label>
+                                    </div>
+                                </td>
+                                <td>
+                                    <div>Ветер:</div>
+                                    <div>
+                                        <input type="radio" id="r_wv1" class="radioUnits" name="r_wv" title="метры в секунду (м/с)" onclick="if(this.checked) {chValue('wv',0,0);}" checked="checked">
+                                        <label for="r_wv1">метры в секунду (м/с)</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_wv2" class="radioUnits" name="r_wv" title="километры в час (км/ч)" onclick="if(this.checked) {chValue('wv',1,0);}">
+                                        <label for="r_wv2">километры в час (км/ч)</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_wv3" class="radioUnits" name="r_wv" title="мили в час (мили/час)" onclick="if(this.checked) {chValue('wv',2,0);}">
+                                        <label for="r_wv3">мили в час (мили/час)</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_wv4" class="radioUnits" name="r_wv" title="узлы" onclick="if(this.checked) {chValue('wv',3,0);}">
+                                        <label for="r_wv4">узлы</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_wv5" class="radioUnits" name="r_wv" title="Бфрт (Бфрт)" onclick="if(this.checked) {chValue('wv',4,0);}">
+                                        <label for="r_wv5">баллы Бофорта (Бфрт)</label>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="3">
+                                    <div style="margin-bottom: 9px; border-top: 1px dashed #a7a7a7"></div>
+                                    <div>Только для страниц «Архив погоды»</div>
+                                    <div>Горизонтальная дальность видимости (VV):</div>
+                                    <div>
+                                        <input type="radio" id="r_vv1" class="radioUnits" name="r_vv" title="километры" onclick="if(this.checked) {chValue('vv',0,0);}" checked="checked">
+                                        <label for="r_vv1">километры</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_vv2" class="radioUnits" name="r_vv" title="мили" onclick="if(this.checked) {chValue('vv',1,0);}">
+                                        <label for="r_vv2">мили</label>
+                                    </div>
+                                    <div>Высота основания самых низких облаков (H):</div>
+                                    <div>
+                                        <input type="radio" id="r_h1" class="radioUnits" name="r_h" title="метры" onclick="if(this.checked) {chValue('h',0,0);}" checked="checked">
+                                        <label for="r_h1">метры</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_h2" class="radioUnits" name="r_h" title="футы" onclick="if(this.checked) {chValue('h',1,0);}">
+                                        <label for="r_h2">футы</label>
+                                    </div>
+                                    <div>Высота снежного покрова (sss):</div>
+                                    <div>
+                                        <input type="radio" id="r_sss1" class="radioUnits" name="r_sss" title="сантиметры" onclick="if(this.checked) {chValue('sss',0,0);}" checked="checked">
+                                        <label for="r_sss1">сантиметры</label>
+                                    </div>
+                                    <div>
+                                        <input type="radio" id="r_sss2" class="radioUnits" name="r_sss" title="дюймы" onclick="if(this.checked) {chValue('sss',1,0);}">
+                                        <label for="r_sss2">дюймы</label>
+                                    </div>
+                                </td>
+                            </tr>
+                        </tbody></table>
+                    </form>
+                </div>
+            </div>
+        </span>
+    </div>
+    <div class="ddListSummary1">
+        <span>
+            <div class="ddList1">
+                <div id="langButton" class="inDdSummary">
+                    <table><tbody><tr><td style="height: 35px; vertical-align: middle;">Language</td></tr></tbody></table>
+                </div>
+                <div id="langMenu" style="display: none;">
+                    <ul></ul>
+                </div>
+            </div>
+        </span>
+    </div>
+    <div id="search">
+        <form name="fsearch" autocomplete="off" method="post" action="/docs/search/ru" onsubmit="searchConfirm();">
+            <input type="text" name="searchStr" id="searchStr" class="search ac_input" onfocus="clearTxt();" onblur="setTxt();" value="змиёвка" autocomplete="off">
+            <input type="button" id="searchButton" class="searchButton" onclick="searchConfirm();" value="">
+            <script type="text/javascript">setTxt();</script>
+        </form>
+    </div>
+                    </td>
+                </tr>
+            </tbody></table>
+        </div>
+    </div>
+    <div id="content-wrapper">
+        <div id="content">
+            <div id="hf420d4b9b1efdbbe6ef03d062299d020ccae86d6">
+                <div class="intoLeftNavi">
+                    <span class="verticalBottom">
+                        <a href="/Погода_в_мире"><nobr>Все страны</nobr></a>&nbsp;<img src="/images/iconArrow.png" alt="" title="">&nbsp;<a href="/Погода_в_России"><nobr>Россия</nobr></a>&nbsp;<img src="/images/iconArrow.png" alt="" title="">&nbsp;
+				       			  <a href="/Погода_в_Луганской_Народной_Республике"><nobr>Луганская Народная Республика</nobr></a>&nbsp;<img src="/images/iconArrow.png" alt="" title="">&nbsp;
+				       			  <a href="/Погода_в_Сватовском_районе"><nobr>Сватовский район</nobr></a>&nbsp;<img src="/images/iconArrow.png" alt="" title="">&nbsp;
+				       			  <a href="/Погода_в_Змиевке,_Луганская_Народная_Республика"><nobr>Змиевка</nobr></a>
+                    </span>
+                </div>
+            </div>
+            <div id="ha8e4d0cfbc1ac49c913e422d81ab257c227f18a7"><div id="leftNavi" class="pageTitle"> <span class="verticalBottom"><h1>Результат поиска</h1></span></div><div class="clear"></div> <p class="stinfo"><b>Найдено населенных пунктов:</b> 3</p> <table cellspacing="0" cellpadding="0" class="searchResults"> <tbody><tr class="header"> <td> <div class="ImgLeft"></div> <div class="searchPointTitle"> <span class="innerTextHead">Населенный пункт</span> <div> </div></div></td> <td> <div class="searchTitles"> <span class="innerTextHead">Страна</span> </div> </td> <td> <div class="searchTitles"> <span class="innerTextHead">Регион</span> </div> </td> <td style="border-right: none;"> <div class="ImgRight"></div> <div class="searchTitles"> <span class="innerTextHead">Район</span> </div> </td> </tr><tr class="srow0"> <td class="resBorder"><span class="innerTextResult"><a href="/Погода_в_Змиевке,_Луганская_Народная_Республика">Змиевка</a></span></td> <td class="resBorder"><span class="innerTextResult">Россия</span></td> <td class="resBorder"><span class="innerTextResult">Луганская Народная Республика</span></td> <td><span class="innerTextResult">Сватовский район</span></td> </tr><tr class="srow1"> <td class="resBorder"><span class="innerTextResult"><a href="/Погода_в_Змиевке,_Орловская_область">Змиевка</a></span></td> <td class="resBorder"><span class="innerTextResult">Россия</span></td> <td class="resBorder"><span class="innerTextResult">Орловская область</span></td> <td><span class="innerTextResult">Свердловский район</span></td> </tr><tr class="srow0"> <td class="resBorder"><span class="innerTextResult"><a href="/Погода_в_Змиевке,_Херсонская_область">Змиевка</a></span></td> <td class="resBorder"><span class="innerTextResult">Россия</span></td> <td class="resBorder"><span class="innerTextResult">Херсонская область</span></td> <td><span class="innerTextResult">Бериславский район</span></td> </tr> </tbody></table>
+            </div>
+        </div>
+        <div class="clear"></div>
+        
+    </div>
+</div>
+<div id="footer-wrapper" class="noprint">
+    <div id="footer">
+        
+        <div id="footer-info">
+        <div class="footerMenu">
+            <div class="footer_title"><b style="font-size: 10pt;">Показаны ранее:</b></div><span class="Ajax-PointID" id="6318">
+            <div class="MainTemp">
+                <span class="t_0" style="display: inline;"><span class="red">+19</span></span>
+                <span class="t_1" style="display: none;"><span class="red">+66</span></span>
+            </div></span> <div class="footer_links"><a href="/Погода_в_Орле,_Орловская_область">Орел</a></div><br><span class="Ajax-PointID" id="24530">
+            <div class="MainTemp">
+                <span class="t_0" style="display: inline;"><span class="red">+17</span></span>
+                <span class="t_1" style="display: none;"><span class="red">+63</span></span>
+            </div></span> <div class="footer_links"><a href="/Погода_в_Змиевке,_Луганская_Народная_Республика">Змиевка</a></div><br>
+        </div>
+        <div class="footerMenu">
+            <div class="footer_title"><b style="font-size: 10pt;">Ближайшие центры:</b></div><span class="Ajax-PointID" id="531">
+            <div class="MainTemp">
+                <span class="t_0" style="display: inline;"><span class="red">+17</span></span>
+                <span class="t_1" style="display: none;"><span class="red">+63</span></span>
+            </div></span> <div class="footer_links"><a href="/Погода_в_Сватово,_Луганская_Народная_Республика">Сватово</a></div><br><span class="Ajax-PointID" id="720">
+            <div class="MainTemp">
+                <span class="t_0" style="display: inline;"><span class="red">+15</span></span>
+                <span class="t_1" style="display: none;"><span class="red">+59</span></span>
+            </div></span> <div class="footer_links"><a href="/Погода_в_Боровой,_Боровский_район">Боровая</a></div><br><span class="Ajax-PointID" id="735">
+            <div class="MainTemp">
+                <span class="t_0" style="display: inline;"><span class="red">+17</span></span>
+                <span class="t_1" style="display: none;"><span class="red">+63</span></span>
+            </div></span> <div class="footer_links"><a href="/Погода_в_Купянске">Купянск</a></div><br><span class="Ajax-PointID" id="518">
+            <div class="MainTemp">
+                <span class="t_0" style="display: inline;"><span class="red">+17</span></span>
+                <span class="t_1" style="display: none;"><span class="red">+63</span></span>
+            </div></span> <div class="footer_links"><a href="/Погода_в_Кременной,_Россия">Кременная</a></div><br>
+        </div>
+        <div class="footerMenu">
+            <div class="footer_title"><b style="font-size: 10pt;">Популярные:</b></div><span class="Ajax-PointID" id="488">
+            <div class="MainTemp">
+                <span class="t_0" style="display: inline;"><span class="red">+13</span></span>
+                <span class="t_1" style="display: none;"><span class="red">+55</span></span>
+            </div></span> <div class="footer_links"><a href="/Погода_в_Беловодске">Беловодск</a></div><br><span class="Ajax-PointID" id="520">
+            <div class="MainTemp">
+                <span class="t_0" style="display: inline;"><span class="red">+17</span></span>
+                <span class="t_1" style="display: none;"><span class="red">+63</span></span>
+            </div></span> <div class="footer_links"><a href="/Погода_в_Луганске,_Луганская_Народная_Республика">Луганск</a></div><br><span class="Ajax-PointID" id="529">
+            <div class="MainTemp">
+                <span class="t_0" style="display: inline;"><span class="red">+21</span></span>
+                <span class="t_1" style="display: none;"><span class="red">+70</span></span>
+            </div></span> <div class="footer_links"><a href="/Погода_в_Ровеньках,_Луганская_Народная_Республика">Ровеньки</a></div><br><span class="Ajax-PointID" id="536">
+            <div class="MainTemp">
+                <span class="t_0" style="display: inline;"><span class="red">+17</span></span>
+                <span class="t_1" style="display: none;"><span class="red">+63</span></span>
+            </div></span> <div class="footer_links"><a href="/Погода_в_Старобельске">Старобельск</a></div><br>
+        </div>
+        </div>
+        <div id="footer-content">
+            <div id="footer-copyright">Copyright © ООО «Расписание Погоды», 2004-2026</div>
+        </div>
+    </div>
+</div>
+<!-- old code -->
+
+
+
+
+</body></html>

tests/data/yandexweather/__init__.py

@@ -0,0 +1,11 @@
+from pathlib import Path
+
+from tests.common.mock import MockSource
+
+YANDEXWEATHER_MOCK_SOURCE = MockSource(
+    Path(__file__).parent,
+    {
+        "details": "details.html",
+        "suggest": "suggest.json",
+    },
+)

tests/data/yandexweather/suggest.json

@@ -0,0 +1,57 @@
+[
+  {
+    "title": "Орёл",
+    "description": "Орёл",
+    "coords": { "lat": 52.97075653, "lon": 36.06435776 },
+    "uri": "//yandex.ru/pogoda?name=%D0%9E%D1%80%D1%91%D0%BB&kind=locality",
+    "geoId": 10,
+    "slug": "10",
+    "kind": "locality",
+    "distance": { "value": null, "text": "" },
+    "url": "//yandex.ru/pogoda?name=%D0%9E%D1%80%D1%91%D0%BB&kind=locality"
+  },
+  {
+    "title": "село Орёл-Изумруд",
+    "description": "Краснодарский край",
+    "coords": { "lat": 43.46733475, "lon": 39.92550659 },
+    "uri": "//yandex.ru/pogoda?name=%D0%9A%D1%80%D0%B0%D1%81%D0%BD%D0%BE%D0%B4%D0%B0%D1%80%D1%81%D0%BA%D0%B8%D0%B9+%D0%BA%D1%80%D0%B0%D0%B9%2C+%D0%B3%D0%BE%D1%80%D0%BE%D0%B4%D1%81%D0%BA%D0%BE%D0%B9+%D0%BE%D0%BA%D1%80%D1%83%D0%B3+%D0%A1%D0%BE%D1%87%D0%B8%2C+%D1%81%D0%B5%D0%BB%D0%BE+%D0%9E%D1%80%D1%91%D0%BB-%D0%98%D0%B7%D1%83%D0%BC%D1%80%D1%83%D0%B4&kind=locality",
+    "geoId": 211278,
+    "slug": "211278",
+    "kind": "locality",
+    "distance": { "value": null, "text": "" },
+    "url": "//yandex.ru/pogoda?name=%D0%9A%D1%80%D0%B0%D1%81%D0%BD%D0%BE%D0%B4%D0%B0%D1%80%D1%81%D0%BA%D0%B8%D0%B9+%D0%BA%D1%80%D0%B0%D0%B9%2C+%D0%B3%D0%BE%D1%80%D0%BE%D0%B4%D1%81%D0%BA%D0%BE%D0%B9+%D0%BE%D0%BA%D1%80%D1%83%D0%B3+%D0%A1%D0%BE%D1%87%D0%B8%2C+%D1%81%D0%B5%D0%BB%D0%BE+%D0%9E%D1%80%D1%91%D0%BB-%D0%98%D0%B7%D1%83%D0%BC%D1%80%D1%83%D0%B4&kind=locality"
+  },
+  {
+    "title": "деревня Орёл",
+    "description": "Республика Татарстан (Татарстан)",
+    "coords": { "lat": 55.56605148, "lon": 49.06790161 },
+    "uri": "//yandex.ru/pogoda?name=%D0%A0%D0%B5%D1%81%D0%BF%D1%83%D0%B1%D0%BB%D0%B8%D0%BA%D0%B0+%D0%A2%D0%B0%D1%82%D0%B0%D1%80%D1%81%D1%82%D0%B0%D0%BD+%28%D0%A2%D0%B0%D1%82%D0%B0%D1%80%D1%81%D1%82%D0%B0%D0%BD%29%2C+%D0%9B%D0%B0%D0%B8%D1%88%D0%B5%D0%B2%D1%81%D0%BA%D0%B8%D0%B9+%D1%80%D0%B0%D0%B9%D0%BE%D0%BD%2C+%D0%9E%D1%80%D0%BB%D0%BE%D0%B2%D1%81%D0%BA%D0%BE%D0%B5+%D1%81%D0%B5%D0%BB%D1%8C%D1%81%D0%BA%D0%BE%D0%B5+%D0%BF%D0%BE%D1%81%D0%B5%D0%BB%D0%B5%D0%BD%D0%B8%D0%B5%2C+%D0%B4%D0%B5%D1%80%D0%B5%D0%B2%D0%BD%D1%8F+%D0%9E%D1%80%D1%91%D0%BB&kind=locality",
+    "geoId": 140917,
+    "slug": "140917",
+    "kind": "locality",
+    "distance": { "value": null, "text": "" },
+    "url": "//yandex.ru/pogoda?name=%D0%A0%D0%B5%D1%81%D0%BF%D1%83%D0%B1%D0%BB%D0%B8%D0%BA%D0%B0+%D0%A2%D0%B0%D1%82%D0%B0%D1%80%D1%81%D1%82%D0%B0%D0%BD+%28%D0%A2%D0%B0%D1%82%D0%B0%D1%80%D1%81%D1%82%D0%B0%D0%BD%29%2C+%D0%9B%D0%B0%D0%B8%D1%88%D0%B5%D0%B2%D1%81%D0%BA%D0%B8%D0%B9+%D1%80%D0%B0%D0%B9%D0%BE%D0%BD%2C+%D0%9E%D1%80%D0%BB%D0%BE%D0%B2%D1%81%D0%BA%D0%BE%D0%B5+%D1%81%D0%B5%D0%BB%D1%8C%D1%81%D0%BA%D0%BE%D0%B5+%D0%BF%D0%BE%D1%81%D0%B5%D0%BB%D0%B5%D0%BD%D0%B8%D0%B5%2C+%D0%B4%D0%B5%D1%80%D0%B5%D0%B2%D0%BD%D1%8F+%D0%9E%D1%80%D1%91%D0%BB&kind=locality"
+  },
+  {
+    "title": "посёлок Орёл",
+    "description": "Пермский край",
+    "coords": { "lat": 59.33684921, "lon": 56.58647919 },
+    "uri": "//yandex.ru/pogoda?name=%D0%9F%D0%B5%D1%80%D0%BC%D1%81%D0%BA%D0%B8%D0%B9+%D0%BA%D1%80%D0%B0%D0%B9%2C+%D0%BC%D1%83%D0%BD%D0%B8%D1%86%D0%B8%D0%BF%D0%B0%D0%BB%D1%8C%D0%BD%D1%8B%D0%B9+%D0%BE%D0%BA%D1%80%D1%83%D0%B3+%D0%91%D0%B5%D1%80%D0%B5%D0%B7%D0%BD%D0%B8%D0%BA%D0%B8%2C+%D0%BF%D0%BE%D1%81%D1%91%D0%BB%D0%BE%D0%BA+%D0%9E%D1%80%D1%91%D0%BB&kind=locality",
+    "geoId": 135862,
+    "slug": "135862",
+    "kind": "locality",
+    "distance": { "value": null, "text": "" },
+    "url": "//yandex.ru/pogoda?name=%D0%9F%D0%B5%D1%80%D0%BC%D1%81%D0%BA%D0%B8%D0%B9+%D0%BA%D1%80%D0%B0%D0%B9%2C+%D0%BC%D1%83%D0%BD%D0%B8%D1%86%D0%B8%D0%BF%D0%B0%D0%BB%D1%8C%D0%BD%D1%8B%D0%B9+%D0%BE%D0%BA%D1%80%D1%83%D0%B3+%D0%91%D0%B5%D1%80%D0%B5%D0%B7%D0%BD%D0%B8%D0%BA%D0%B8%2C+%D0%BF%D0%BE%D1%81%D1%91%D0%BB%D0%BE%D0%BA+%D0%9E%D1%80%D1%91%D0%BB&kind=locality"
+  },
+  {
+    "title": "Пуэрто-Франсиско-де-Орельяна",
+    "description": "Провинция Орельяна",
+    "coords": { "lat": -0.4602830112, "lon": -76.99185944 },
+    "uri": "//yandex.ru/pogoda?name=%D0%9F%D1%80%D0%BE%D0%B2%D0%B8%D0%BD%D1%86%D0%B8%D1%8F+%D0%9E%D1%80%D0%B5%D0%BB%D1%8C%D1%8F%D0%BD%D0%B0%2C+%D0%9F%D1%83%D1%8D%D1%80%D1%82%D0%BE-%D0%A4%D1%80%D0%B0%D0%BD%D1%81%D0%B8%D1%81%D0%BA%D0%BE-%D0%B4%D0%B5-%D0%9E%D1%80%D0%B5%D0%BB%D1%8C%D1%8F%D0%BD%D0%B0&kind=weather",
+    "geoId": 111891,
+    "slug": "111891",
+    "kind": "weather",
+    "distance": { "value": null, "text": "" },
+    "url": "//yandex.ru/pogoda?name=%D0%9F%D1%80%D0%BE%D0%B2%D0%B8%D0%BD%D1%86%D0%B8%D1%8F+%D0%9E%D1%80%D0%B5%D0%BB%D1%8C%D1%8F%D0%BD%D0%B0%2C+%D0%9F%D1%83%D1%8D%D1%80%D1%82%D0%BE-%D0%A4%D1%80%D0%B0%D0%BD%D1%81%D0%B8%D1%81%D0%BA%D0%BE-%D0%B4%D0%B5-%D0%9E%D1%80%D0%B5%D0%BB%D1%8C%D1%8F%D0%BD%D0%B0&kind=weather"
+  }
+]

tests/test_gismeteo_api.py

@@ -3,14 +3,13 @@ import datetime
 import pytest
 
 from gallery.painting.gismeteo.api import GismeteoApi
+from tests.common.mock import create_mock_api
 from tests.data.gismeteo import GISMETEO_MOCK_SOURCE
 
 
 @pytest.fixture(name="gismeteo_api", scope="module")
 def gismeteo_api_fixture() -> GismeteoApi:
-    api = GismeteoApi()
-    api.SOURCE = GISMETEO_MOCK_SOURCE
-    return api
+    return create_mock_api(GismeteoApi, GISMETEO_MOCK_SOURCE)
 
 
 async def test_search(gismeteo_api: GismeteoApi):

tests/test_matchtv_api.py

@@ -3,14 +3,13 @@ import datetime
 import pytest
 
 from gallery.painting.matchtv.api import MatchTvApi
+from tests.common.mock import create_mock_api
 from tests.data.matchtv import MATCHTV_MOCK_SOURCE
 
 
 @pytest.fixture(name="matchtv_api", scope="module")
 def matchtv_api_fixture() -> MatchTvApi:
-    api = MatchTvApi()
-    api.SOURCE = MATCHTV_MOCK_SOURCE
-    return api
+    return create_mock_api(MatchTvApi, MATCHTV_MOCK_SOURCE)
 
 
 async def test_search(matchtv_api: MatchTvApi):

tests/test_openweather_api.py

@@ -3,20 +3,13 @@ import datetime
 import pytest
 
 from gallery.painting.openweather.api import OpenWeatherApi
-from gallery.painting.openweather.openweather import OpenWeather
+from tests.common.mock import create_mock_api
 from tests.data.openweather import OPENWEATHER_MOCK_SOURCE
 
 
 @pytest.fixture(name="openweather_api", scope="module")
 def openweather_api_fixture() -> OpenWeatherApi:
-    class MockOpenWeather(OpenWeather):
-        def __init__(self):
-            super().__init__("")
-            self._source = OPENWEATHER_MOCK_SOURCE
-
-    api = OpenWeatherApi()
-    api.SOURCE = MockOpenWeather()
-    return api
+    return create_mock_api(OpenWeatherApi, OPENWEATHER_MOCK_SOURCE)
 
 
 async def test_search(openweather_api: OpenWeatherApi):

tests/test_rp5.py

@@ -0,0 +1,27 @@
+import datetime
+
+import pytest
+
+from gallery.painting.rp5.api import RP5WeatherApi
+from tests.common.mock import create_mock_api
+from tests.data.rp5 import RP5_MOCK_SOURCE
+
+
+@pytest.fixture(name="rp5_api", scope="module")
+def rp5_api_fixture() -> RP5WeatherApi:
+    return create_mock_api(RP5WeatherApi, RP5_MOCK_SOURCE)
+
+
+async def test_search(rp5_api: RP5WeatherApi):
+    result = await rp5_api.find_locations("test")
+    assert len(result) == 3
+
+
+async def test_day(rp5_api: RP5WeatherApi):
+    result = await rp5_api.get_day("test", datetime.date(2026, 9, 11))
+    assert len(result.values) == 4
+
+
+async def test_days(rp5_api: RP5WeatherApi):
+    result = await rp5_api.get_days("test", 10)
+    assert len(result.values) == 8

tests/test_yandextv_api.py

@@ -3,14 +3,13 @@ import datetime
 import pytest
 
 from gallery.painting.yandextv.api import YandexTvApi
+from tests.common.mock import create_mock_api
 from tests.data.yandextv import YANDEXTV_MOCK_SOURCE
 
 
 @pytest.fixture(name="yandextv_api", scope="module")
 def yandextv_api_fixture() -> YandexTvApi:
-    api = YandexTvApi()
-    api.SOURCE = YANDEXTV_MOCK_SOURCE
-    return api
+    return create_mock_api(YandexTvApi, YANDEXTV_MOCK_SOURCE)
 
 
 async def test_search(yandextv_api: YandexTvApi):

tests/test_yandexweather_api.py

@@ -0,0 +1,27 @@
+import datetime
+
+import pytest
+
+from gallery.painting.yandexweather.api import YandexWeatherApi
+from tests.common.mock import create_mock_api
+from tests.data.yandexweather import YANDEXWEATHER_MOCK_SOURCE
+
+
+@pytest.fixture(name="yandexweather_api", scope="module")
+def yandexweather_api_fixture() -> YandexWeatherApi:
+    return create_mock_api(YandexWeatherApi, YANDEXWEATHER_MOCK_SOURCE)
+
+
+async def test_search(yandexweather_api: YandexWeatherApi):
+    result = await yandexweather_api.find_locations("test")
+    assert len(result) == 5
+
+
+async def test_day(yandexweather_api: YandexWeatherApi):
+    result = await yandexweather_api.get_day("test", datetime.date.today())
+    assert len(result.values) == 4
+
+
+async def test_days(yandexweather_api: YandexWeatherApi):
+    result = await yandexweather_api.get_days("test", 10)
+    assert len(result.values) == 10