ci(version): 0.10.4

.gitea/actions/setup/action.yml

@@ -0,0 +1,32 @@
+name: "Setup"
+description: "Setup project"
+inputs:
+  python-version:
+    default: "3.14"
+runs:
+  using: "composite"
+  steps:
+    - id: setup-python
+      uses: actions/setup-python@v7
+      with:
+        python-version: ${{ inputs.python-version }}
+        cache: "pip"
+
+    - run: |
+        pip install project-manager \
+          --index-url https://git.shmyga.ru/api/packages/InfernalGames/pypi/simple/ \
+          --extra-index-url https://pypi.org/simple
+
+    - run: pm setup:config -vv
+
+    # setup python venv
+    - run: pip install poetry
+
+    - id: cache-venv
+      uses: actions/cache@v6
+      with:
+        path: .venv
+        key: venv-${{ runner.os }}-python-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
+
+    - if: steps.cache-venv.outputs.cache-hit != 'true'
+      run: pm setup:python -vv

.gitea/workflows/deploy.yaml

@@ -1,22 +0,0 @@
-name: deploy
-
-on:
-  workflow_run:
-    workflows: [release]
-    types: [completed]
-
-jobs:
-  deploy:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: appleboy/ssh-action@v1
-        with:
-          host: ${{ secrets.DEPLOY_HOST }}
-          username: ${{ secrets.DEPLOY_USERNAME }}
-          key: ${{ secrets.DEPLOY_KEY }}
-          passphrase: ${{ secrets.DEPLOY_PASSPHRASE }}
-          script: |
-            cd /opt/gallery
-            docker compose pull
-            docker compose up -d

.gitea/workflows/release.yaml

@@ -2,19 +2,20 @@ name: release
 
 on:
   push:
-    tags:
+    tags: ["*"]
-      - "[0-9]+.[0-9]+.[0-9]+"
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
-      - uses: https://git.shmyga.ru/InfernalGames/project-manager@master
+      - uses: ./.gitea/actions/setup
+      - run: pm lint -vv
+      - run: pm test -vv
       - run: pm build:docker -vv
       - uses: docker/login-action@v4
         with:
           registry: git.shmyga.ru
-          username: ${{ vars.PUBLISH_USERNAME }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.PUBLISH_TOKEN }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - run: pm publish:docker -vv

.gitea/workflows/test.yaml

@@ -7,8 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
-      - uses: https://git.shmyga.ru/InfernalGames/project-manager@master
+      - uses: ./.gitea/actions/setup
-        with:
-          setup-python: true
       - run: pm lint -vv
       - run: pm test -vv

README.md

@@ -1,7 +1,5 @@
 # API Gallery
 
-[![test](https://git.shmyga.ru/InfernalGames/gallery/actions/workflows/test.yaml/badge.svg?branch=master)](https://git.shmyga.ru/InfernalGames/gallery/actions?workflow=test.yaml)
-
 Currently implemented APIs:
 
 - Weather forecast

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

@@ -1,3 +1,4 @@
+import datetime
 from pathlib import Path
 from urllib import parse
 
@@ -12,7 +13,9 @@ from gallery.easel.depends.schedule import (
     ScheduleApiDepends,
     ScheduleGroupChannelsDepends,
 )
+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 .filters import timedelta_format
@@ -49,6 +52,12 @@ async def get_schedule_index(request: AppRequest, provider: str | None = None, q
     )
 
 
+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")
@@ -63,16 +72,7 @@ async def get_group(request: AppRequest, channels: ScheduleGroupChannelsDepends,
     return templates.TemplateResponse(
         request=request,
         name="group.html",
-        context={
+        context={"responses": responses},
-            "responses": responses,
-            "api_route": "/".join(
-                [
-                    "/api/schedule/group",
-                    request.path_params["group_id"],
-                    request.path_params["date"],
-                ]
-            ),
-        },
     )
 
 
@@ -87,17 +87,5 @@ async def get_channel(request: AppRequest, schedule_api: ScheduleApiDepends, cha
     return templates.TemplateResponse(
         request=request,
         name="channel.html",
-        context={
+        context={"response": response},
-            "response": response,
-            "api_route": (
-                "/".join(
-                    [
-                        "/api/schedule",
-                        request.path_params["provider"],
-                        request.path_params["channel"],
-                        request.path_params["date"],
-                    ]
-                )
-            ),
-        },
     )

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

@@ -10,9 +10,6 @@ locale=request.state.language)}}
 {% block header %}
 <app-link href="/schedule"
           icon="tv">{{_("TV program")}}</app-link>
-<app-link target="_blank"
-          href="{{ api_route }}"
-          icon="filetype-json"></app-link>
 {% endblock %}
 
 {% block content %}
@@ -47,8 +44,7 @@ locale=request.state.language)}}
     {% 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) |
+        <span>{{value.start.strftime('%H:%M')}}</span>&nbsp;<span class="small ms-1">({{(value.end - value.start) | timedelta_format}})</span>
-          timedelta_format}})</span>
       </td>
       <td>{{value.label}}</td>
     </tr>

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

@@ -9,9 +9,6 @@
 {% block header %}
 <app-link href="/schedule"
           icon="tv">{{_("TV program")}}</app-link>
-<app-link target="_blank"
-          href="{{ api_route }}"
-          icon="filetype-json"></app-link>
 {% endblock %}
 
 {% block content %}

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

@@ -37,18 +37,7 @@ def build_weather_response(request: AppRequest, response: WeatherResponse):
     return templates.TemplateResponse(
         request=request,
         name="weather.html",
-        context={
+        context={"response": response},
-            "response": response,
-            "api_route": "/".join(
-                [
-                    "/api/weather",
-                    request.path_params["provider"],
-                    request.path_params["location"],
-                    response.period,
-                    request.path_params.get("date") or request.path_params.get("days") or "",
-                ]
-            ),
-        },
     )
 
 

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

@@ -7,9 +7,6 @@ locale=request.state.language)}}{% endblock %}
 {% block header %}
 <app-link href="/weather"
           icon="brightness-high">{{_("Weather")}}</app-link>
-<app-link target="_blank"
-          href="{{ api_route }}"
-          icon="filetype-json"></app-link>
 {% endblock %}
 
 {% block content %}

gallery/painting/yandextv/api.py

@@ -29,7 +29,6 @@ class YandexTVApi(ScheduleApi):
         return self.channel_parser.parse(data)
 
     async def get_schedule(self, channel_id: str, date: datetime.date) -> Schedule:
-        channel_path_part = "channel" if "-" in channel_id else "channels"
+        endpoint = f"{self.lr}/channel/{channel_id}?date={date:%Y-%m-%d}"
-        endpoint = f"{self.lr}/{channel_path_part}/{channel_id}?date={date:%Y-%m-%d}"
         data = await self.source.request(endpoint)
         return self.schedule_parser.parse(ScheduleData(date, channel_id, data))

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "gallery"
 description = ""
-version = "0.10.5"
+version = "0.10.4"
 readme = "README.md"
 authors = [{ name = "shmyga", email = "shmyga.z@gmail.com" }]
 requires-python = ">=3.14,<4.0"

static/package-lock.json

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

static/package.json

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

static/src/lib/bootstrap-icons.scss

@@ -48,7 +48,4 @@
   &.bi-cast {
     mask-image: url(bootstrap-icons/icons/cast.svg);
   }
-  &.bi-filetype-json {
-    mask-image: url(bootstrap-icons/icons/filetype-json.svg);
-  }
 }