From 05161749e8575cfded25f381617efc9dcb17c971 Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Tue, 13 Aug 2024 20:54:12 +0300
Subject: [PATCH] feat: add common view module

---
 gallery/easel/__init__.py                     |   2 +
 gallery/easel/route/view/common/__init__.py   |   9 +++
 .../{schedule => common}/static/favicon.ico   | Bin
 .../easel/route/view/common/static/style.css  |  76 ++++++++++++++++++
 .../route/view/{weather => common}/util.py    |   0
 gallery/easel/route/view/schedule/__init__.py |  12 ++-
 gallery/easel/route/view/schedule/filters.py  |   5 ++
 .../easel/route/view/schedule/static/index.js |   0
 .../route/view/schedule/static/style.css      |  18 +----
 .../route/view/schedule/templates/index.html  |   8 +-
 .../view/schedule/templates/schedule.html     |  22 +++--
 gallery/easel/route/view/weather/__init__.py  |   9 ++-
 .../route/view/weather/static/favicon.ico     | Bin 15406 -> 0 bytes
 .../easel/route/view/weather/static/style.css |  44 ----------
 .../route/view/weather/templates/index.html   |   8 +-
 .../route/view/weather/templates/weather.html |   6 +-
 gallery/painting/matchtv/api.py               |  22 +++--
 gallery/sketch/schedule/model.py              |   1 +
 gallery/version.py                            |   1 +
 19 files changed, 155 insertions(+), 88 deletions(-)
 create mode 100644 gallery/easel/route/view/common/__init__.py
 rename gallery/easel/route/view/{schedule => common}/static/favicon.ico (100%)
 create mode 100644 gallery/easel/route/view/common/static/style.css
 rename gallery/easel/route/view/{weather => common}/util.py (100%)
 create mode 100644 gallery/easel/route/view/schedule/filters.py
 delete mode 100644 gallery/easel/route/view/schedule/static/index.js
 delete mode 100644 gallery/easel/route/view/weather/static/favicon.ico
 create mode 100644 gallery/version.py

diff --git a/gallery/easel/__init__.py b/gallery/easel/__init__.py
index 79bc2e3..6782fcf 100644
--- a/gallery/easel/__init__.py
+++ b/gallery/easel/__init__.py
@@ -8,6 +8,7 @@ from gallery.sketch.weather.api import WeatherApi
 from .route import doc
 from .route.api import schedule as schedule_api_route
 from .route.api import weather as weather_api_route
+from .route.view import common as common_view_route
 from .route.view import schedule as schedule_view_route
 from .route.view import weather as weather_view_route
 
@@ -26,6 +27,7 @@ def build_app(
     doc.mount(app)
     weather_api_route.mount(app)
     schedule_api_route.mount(app)
+    common_view_route.mount(app)
     weather_view_route.mount(app)
     schedule_view_route.mount(app)
     return app
diff --git a/gallery/easel/route/view/common/__init__.py b/gallery/easel/route/view/common/__init__.py
new file mode 100644
index 0000000..2e78bc5
--- /dev/null
+++ b/gallery/easel/route/view/common/__init__.py
@@ -0,0 +1,9 @@
+from pathlib import Path
+
+from fastapi import FastAPI
+from fastapi.staticfiles import StaticFiles
+
+
+def mount(app: FastAPI):
+    base_dir = Path(__file__).parent
+    app.mount("/static/common", StaticFiles(directory=base_dir / "static"))
diff --git a/gallery/easel/route/view/schedule/static/favicon.ico b/gallery/easel/route/view/common/static/favicon.ico
similarity index 100%
rename from gallery/easel/route/view/schedule/static/favicon.ico
rename to gallery/easel/route/view/common/static/favicon.ico
diff --git a/gallery/easel/route/view/common/static/style.css b/gallery/easel/route/view/common/static/style.css
new file mode 100644
index 0000000..ce3160a
--- /dev/null
+++ b/gallery/easel/route/view/common/static/style.css
@@ -0,0 +1,76 @@
+/*
+base
+*/
+body {
+  font-size: 1.5rem;
+}
+
+h3 {
+  margin: 0.5rem 0;
+}
+
+/*
+table
+*/
+table {
+  table-layout: fixed;
+  border-collapse: collapse;
+}
+
+table,
+th,
+td {
+  text-align: center;
+}
+
+td {
+  padding: 0.1rem 0.4rem;
+}
+
+/*
+a.button
+*/
+a.button {
+  text-decoration: none;
+  color: inherit;
+}
+
+.button.disabled {
+  pointer-events: none;
+  cursor: default;
+  color: gray;
+  filter: grayscale(100%);
+}
+
+/*
+app
+*/
+.app-container {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+ul.app-list {
+  list-style: none;
+}
+
+ul.app-list > li {
+  border: 1px solid lightgrey;
+}
+
+ul.app-list > li > a {
+  display: block;
+  padding: 0.5rem 2rem;
+  text-decoration: none;
+  color: inherit;
+}
+
+ul.app-list > li:hover {
+  border-color: blue;
+}
+
+ul.app-list > li:hover > a {
+  color: blue;
+}
diff --git a/gallery/easel/route/view/weather/util.py b/gallery/easel/route/view/common/util.py
similarity index 100%
rename from gallery/easel/route/view/weather/util.py
rename to gallery/easel/route/view/common/util.py
diff --git a/gallery/easel/route/view/schedule/__init__.py b/gallery/easel/route/view/schedule/__init__.py
index 9d23d11..16e8c38 100644
--- a/gallery/easel/route/view/schedule/__init__.py
+++ b/gallery/easel/route/view/schedule/__init__.py
@@ -6,16 +6,18 @@ from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 
-from gallery.easel.route.view.weather.util import TagType, TagUtil
 from gallery.sketch.schedule.api import ScheduleApi
+from gallery.version import __version__
+
+from ..common.util import TagType, TagUtil
+from .filters import timedelta_format
 
 
 def mount(app: FastAPI):
     base_dir = Path(__file__).parent
-    app.mount(
-        "/schedule/static", StaticFiles(directory=base_dir / "static"), name="static"
-    )
+    app.mount("/static/schedule", StaticFiles(directory=base_dir / "static"))
     templates = Jinja2Templates(directory=base_dir / "templates")
+    templates.env.filters["timedelta_format"] = timedelta_format
 
     @app.get("/schedule", response_class=HTMLResponse)
     async def get_schedule_list(request: Request):
@@ -25,6 +27,7 @@ def mount(app: FastAPI):
             request=request,
             name="index.html",
             context={
+                "version": __version__,
                 "channels": channels,
             },
         )
@@ -45,6 +48,7 @@ def mount(app: FastAPI):
             request=request,
             name="schedule.html",
             context={
+                "version": __version__,
                 "tag_util": TagUtil,
                 "datetime": datetime,
                 "response": response,
diff --git a/gallery/easel/route/view/schedule/filters.py b/gallery/easel/route/view/schedule/filters.py
new file mode 100644
index 0000000..5a13680
--- /dev/null
+++ b/gallery/easel/route/view/schedule/filters.py
@@ -0,0 +1,5 @@
+import datetime
+
+
+def timedelta_format(value: datetime.timedelta) -> str:
+    return ":".join(str(value).split(":")[:2])
diff --git a/gallery/easel/route/view/schedule/static/index.js b/gallery/easel/route/view/schedule/static/index.js
deleted file mode 100644
index e69de29..0000000
diff --git a/gallery/easel/route/view/schedule/static/style.css b/gallery/easel/route/view/schedule/static/style.css
index e435974..7dff605 100644
--- a/gallery/easel/route/view/schedule/static/style.css
+++ b/gallery/easel/route/view/schedule/static/style.css
@@ -1,21 +1,7 @@
-body {
-  font-size: 1.5rem;
-}
-
-.app-container {
-  display: flex;
-  flex-direction: column;
-  flex-wrap: nowrap;
-  align-items: center;
-}
-
-table,
-th,
 td {
-  /* border: 1px solid rgba(0, 0, 0, 0.2); */
   text-align: left;
 }
 
-td {
-  padding: 0.1rem 0.4rem;
+tr.live {
+  font-weight: bold;
 }
diff --git a/gallery/easel/route/view/schedule/templates/index.html b/gallery/easel/route/view/schedule/templates/index.html
index e6acc56..b9c64fa 100644
--- a/gallery/easel/route/view/schedule/templates/index.html
+++ b/gallery/easel/route/view/schedule/templates/index.html
@@ -9,14 +9,16 @@
           content="ie=edge">
     <title>ТВ</title>
     <link rel="stylesheet"
-          href="/schedule/static/style.css?v=1">
+          href="/static/common/style.css?v={{version}}">
+    <link rel="stylesheet"
+          href="/static/schedule/style.css?v={{version}}">
     <link rel="icon"
-          href="/schedule/static/favicon.ico"
+          href="/static/common/favicon.ico"
           type="image/x-icon">
 </head>
 
 <body class="app-container">
-    <ul>
+    <ul class="app-list">
         {% for channel in channels %}
         <li><a href="schedule/{{channel}}">{{channel}}</a></li>
         {% endfor %}
diff --git a/gallery/easel/route/view/schedule/templates/schedule.html b/gallery/easel/route/view/schedule/templates/schedule.html
index 491ddfb..11d53c1 100644
--- a/gallery/easel/route/view/schedule/templates/schedule.html
+++ b/gallery/easel/route/view/schedule/templates/schedule.html
@@ -9,28 +9,38 @@
           content="ie=edge">
     <title>Программа | {{response.channel.name}} | {{response.date.strftime('%a, %d %B %Y')}}</title>
     <link rel="stylesheet"
-          href="/schedule/static/style.css?v=1">
+          href="/static/common/style.css?v={{version}}">
+    <link rel="stylesheet"
+          href="/static/schedule/style.css?v={{version}}">
     <link rel="icon"
-          href="/schedule/static/favicon.ico"
+          href="/static/common/favicon.ico"
           type="image/x-icon">
 </head>
 
 <body class="app-container">
     <h3>
-        {{response.channel.name}} | {{response.date.strftime('%a, %d %B %Y')}}
+        <a class="button {{'disabled' if response.date == datetime.date.today() else ''}}"
+           href="../tag/{{tag_util.create_tag('day', response.date, -1)}}">⬅️</a>
+        <a class="button"
+           href="../..">⬆️</a>
+        <span>{{response.channel.name}} | {{response.date.strftime('%a, %d %B %Y')}}</span>
+        <a class="button"
+           href="../tag/{{tag_util.create_tag('day', response.date, 1)}}">➡️</a>
     </h3>
 
     <table>
         <thead>
             <tr>
-                <td>TIME</td>
-                <td>NAME</td>
+                <td></td>
+                <td></td>
+                <td></td>
             </tr>
         </thead>
         <tbody>
             {% for value in response.values %}
-            <tr>
+            <tr class="{{'live' if value.live else ''}}">
                 <td>{{value.start.strftime('%H:%M')}}</td>
+                <td>{{(value.end - value.start) | timedelta_format}}</td>
                 <td>{{value.label}}</td>
             </tr>
             {% endfor %}
diff --git a/gallery/easel/route/view/weather/__init__.py b/gallery/easel/route/view/weather/__init__.py
index 1b7252c..a5e7788 100644
--- a/gallery/easel/route/view/weather/__init__.py
+++ b/gallery/easel/route/view/weather/__init__.py
@@ -9,16 +9,15 @@ from fastapi.templating import Jinja2Templates
 from gallery.sketch.weather.api import WeatherApi
 from gallery.sketch.weather.mock import WEATHER_MOCK_DATA
 from gallery.sketch.weather.model import WeatherResponse
+from gallery.version import __version__
 
+from ..common.util import TagType, TagUtil
 from .filters import cloudness_icon, wind_direction_icon
-from .util import TagType, TagUtil
 
 
 def mount(app: FastAPI):
     base_dir = Path(__file__).parent
-    app.mount(
-        "/weather/static", StaticFiles(directory=base_dir / "static"), name="static"
-    )
+    app.mount("/static/weather", StaticFiles(directory=base_dir / "static"))
     templates = Jinja2Templates(directory=base_dir / "templates")
     templates.env.filters["wind_direction_icon"] = wind_direction_icon
     templates.env.filters["cloudness_icon"] = cloudness_icon
@@ -28,6 +27,7 @@ def mount(app: FastAPI):
             request=request,
             name="weather.html",
             context={
+                "version": __version__,
                 "tag_util": TagUtil,
                 "datetime": datetime,
                 "response": response,
@@ -42,6 +42,7 @@ def mount(app: FastAPI):
             request=request,
             name="index.html",
             context={
+                "version": __version__,
                 "locations": locations,
             },
         )
diff --git a/gallery/easel/route/view/weather/static/favicon.ico b/gallery/easel/route/view/weather/static/favicon.ico
deleted file mode 100644
index a283ecbb19c12721c2eba06930c07b51354f6565..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15406
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
PQv*FU&{G3lt%3go^wSY@

diff --git a/gallery/easel/route/view/weather/static/style.css b/gallery/easel/route/view/weather/static/style.css
index 0548542..af87dda 100644
--- a/gallery/easel/route/view/weather/static/style.css
+++ b/gallery/easel/route/view/weather/static/style.css
@@ -1,47 +1,3 @@
-body {
-  font-size: 1.5rem;
-}
-
-.app-container {
-  display: flex;
-  flex-direction: column;
-  flex-wrap: nowrap;
-  align-items: center;
-}
-
-h3 {
-  margin: 0.5rem 0;
-}
-
-a.button {
-  text-decoration: none;
-  color: inherit;
-}
-
-.button.disabled {
-  pointer-events: none;
-  cursor: default;
-  color: gray;
-  filter: grayscale(100%);
-}
-
-table {
-  /* width: 100%; */
-  table-layout: fixed;
-  border-collapse: collapse;
-}
-
-table,
-th,
-td {
-  /* border: 1px solid rgba(0, 0, 0, 0.2); */
-  text-align: center;
-}
-
-td {
-  padding: 0.1rem 0.4rem;
-}
-
 .header {
   font-size: 1rem;
   text-align: left;
diff --git a/gallery/easel/route/view/weather/templates/index.html b/gallery/easel/route/view/weather/templates/index.html
index 87b6138..7530eb6 100644
--- a/gallery/easel/route/view/weather/templates/index.html
+++ b/gallery/easel/route/view/weather/templates/index.html
@@ -9,14 +9,16 @@
           content="ie=edge">
     <title>Погода</title>
     <link rel="stylesheet"
-          href="/weather/static/style.css?v=1">
+          href="/static/common/style.css?v={{version}}">
+    <link rel="stylesheet"
+          href="/static/weather/style.css?v={{version}}">
     <link rel="icon"
-          href="/weather/static/favicon.ico"
+          href="/static/common/favicon.ico"
           type="image/x-icon">
 </head>
 
 <body class="app-container">
-    <ul>
+    <ul class="app-list">
         {% for location in locations %}
         <li><a href="weather/{{location}}">{{location}}</a></li>
         {% endfor %}
diff --git a/gallery/easel/route/view/weather/templates/weather.html b/gallery/easel/route/view/weather/templates/weather.html
index d523b72..97b8e80 100644
--- a/gallery/easel/route/view/weather/templates/weather.html
+++ b/gallery/easel/route/view/weather/templates/weather.html
@@ -9,9 +9,11 @@
           content="ie=edge">
     <title>Погода | {{response.location}} | {{response.date.strftime('%a, %d %B %Y')}}</title>
     <link rel="stylesheet"
-          href="/weather/static/style.css?v=1">
+          href="/static/common/style.css?v={{version}}">
+    <link rel="stylesheet"
+          href="/static/weather/style.css?v={{version}}">
     <link rel="icon"
-          href="/weather/static/favicon.ico"
+          href="/static/common/favicon.ico"
           type="image/x-icon">
 </head>
 
diff --git a/gallery/painting/matchtv/api.py b/gallery/painting/matchtv/api.py
index 12e9fd4..96d5d48 100644
--- a/gallery/painting/matchtv/api.py
+++ b/gallery/painting/matchtv/api.py
@@ -2,6 +2,7 @@ import datetime
 import logging
 
 import aiohttp
+from aiocache import cached
 from bs4 import BeautifulSoup
 
 from gallery.sketch.schedule.api import ScheduleApi
@@ -24,6 +25,7 @@ CHANNEL_LIST = [
 
 class MatchTvApi(ScheduleApi):
     BASE_URL = "https://matchtv.ru"
+    CACHE_TTL = 30 * 60
 
     USER_AGENT = (
         "Mozilla/5.0 (X11; Linux x86_64) "
@@ -47,6 +49,7 @@ class MatchTvApi(ScheduleApi):
     async def get_channels(self) -> list[str]:
         return CHANNEL_LIST
 
+    @cached(ttl=CACHE_TTL)
     async def get_channel_schedule(
         self, channel_id: str, date: datetime.date
     ) -> Schedule:
@@ -55,18 +58,25 @@ class MatchTvApi(ScheduleApi):
         soup = BeautifulSoup(data, features="html.parser")
         values = []
         channel_name = soup.select_one(".caption__heading").text.split("|")[0].strip()
-        current_date = datetime.datetime.combine(
+        current_day = datetime.datetime.combine(
             date.today(), datetime.datetime.min.time()
         )
+        end = current_day + datetime.timedelta(days=1, hours=6)
+        prev_value: ScheduleValue | None = None
         for item in soup.select(".teleprogram-schedule .teleprogram-schedule__item"):
             title = item.select_one(".teleprogram-item__title").text.strip()
             time_str = item.select_one(".teleprogram-item__time").text.strip()
             hours, minutes = map(int, time_str.split(":"))
-            item_date = datetime.datetime.combine(
-                date, datetime.time(hour=hours, minute=minutes)
-            )
-            values.append(ScheduleValue(start=current_date, end=item_date, label=title))
-            current_date = item_date
+            item_date = current_day.replace(hour=hours, minute=minutes)
+            if prev_value is not None and item_date.hour < prev_value.start.hour:
+                current_day += datetime.timedelta(days=1)
+                item_date += datetime.timedelta(days=1)
+            live = "Прямая трансляция" in title
+            value = ScheduleValue(start=item_date, end=end, label=title, live=live)
+            values.append(value)
+            if prev_value is not None:
+                prev_value.end = item_date
+            prev_value = value
         return Schedule(
             channel=Channel(id=channel_id, name=channel_name), date=date, values=values
         )
diff --git a/gallery/sketch/schedule/model.py b/gallery/sketch/schedule/model.py
index 1c554ae..6d3cf62 100644
--- a/gallery/sketch/schedule/model.py
+++ b/gallery/sketch/schedule/model.py
@@ -18,6 +18,7 @@ class ScheduleValue(Model):
     end: datetime.datetime
     label: str
     category: str | None = None
+    live: bool = False
 
 
 class Schedule(Model):
diff --git a/gallery/version.py b/gallery/version.py
new file mode 100644
index 0000000..3dc1f76
--- /dev/null
+++ b/gallery/version.py
@@ -0,0 +1 @@
+__version__ = "0.1.0"