Apr, 23 Updates (#32)

Author: drehelis

.devcontainer/requirements.prod.txt

@@ -8,3 +8,4 @@ python-dateutil
 numpy
 Pillow
 gitpython
+babel

Dockerfile

@@ -10,7 +10,7 @@ RUN apk add --update \
     libc-dev \
     libffi-dev \
     openssl-dev \
-    musl-locales \
+    git \
     && rm -rf /var/cache/apk/*
 
 COPY assets/. ./assets

README.md

@@ -13,7 +13,7 @@ Join the notification #channel on [Telegram](https://t.me/sammy_ofer_notificatio
 
 ## Web-UI
 
-![Web-UI screenshot](screen.png)****
+![Web-UI screenshot](screen.png)
 
 ## Static landing page ([link](https://drehelis.github.io/sammy_ofer/static.html))
 
@@ -33,6 +33,7 @@ docker run -d --name sammy_ofer \
     --restart=on-failure \
     --env TELEGRAM_CHANNEL_ID=<required> \
     --env TELEGRAM_TOKEN=<required> \
+    --env GH_PAT (optional) \
     sammy_ofer:latest
 ```
 

assets/templates/static_page.jinja2

@@ -39,7 +39,7 @@
       <div class="metadata-item">📣: {{ notes }}</div>
       {% endif %}
       <div class="metadata-item"><img src="assets/images/qrcode.png" alt="QR Code" style="max-width: 100px; margin-top: 1rem;"></div>
-      <div><img src="https://img.shields.io/endpoint?color=neon&style=plastic&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fsammy_ofer_notification_channel"></div>
+      <div><img src="https://img.shields.io/endpoint?color=neon&style=plastic&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fsammy_ofer_notification_channel&label=Sammy%20Ofer%20Notification%20Channel"></div>
     </div>
   </div>
   <script>
@@ -54,7 +54,7 @@
     <div class="metadata">
       <div class="metadata-item">⚪ המשחק ⚽ הבא: {{ games['game_1'][0].strftime('%A, %d/%m/%Y') }} ⚪</div>
       <div class="metadata-item"><img src="assets/images/qrcode.png" alt="QR Code" style="max-width: 100px; margin-top: 1rem;"></div>
-      <img src="https://img.shields.io/endpoint?color=neon&style=plastic&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fsammy_ofer_notification_channel">
+      <img src="https://img.shields.io/endpoint?color=neon&style=plastic&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fsammy_ofer_notification_channel&label=Sammy%20Ofer%20Notification%20Channel">
     </div>
   </div>
 

html_templates/next.html

@@ -84,7 +84,7 @@
         <div class="divTableRow">
             <div class="divTableCell">{{ loop.index }}</div>
             <div class="divTableCell">{{ scraped_date_time.strftime('%Y-%m-%d') }}</div>
-            <div class="divTableCell">{{ scraped_date_time.strftime('%A') }}</div>
+            <div class="divTableCell">{{ scraped_date_time | babel_format_day_heb }}</div>
             <div class="divTableCell">{{ scraped_date_time.strftime('%H:%M') }}</div>
             <div class="divTableCell">{{ league }}</div>
             <div class="divTableCell"><img width="18" height="18" src="assets/teams/{{ home_team_en }}.png">&nbsp;<a href="{{ home_team_url }}" target="_blank">{{ home_team }}</a></div>

static_html_page.py

@@ -3,11 +3,12 @@
 from pathlib import Path
 from shutil import copy
 import datetime
+import os
 
 from git import Repo
 from logger import logger
 
-REPO_URL = "https://github.com/drehelis/sammy_ofer"
+REPO_URL = f"https://{os.getenv("GH_PAT")}@github.com/drehelis/sammy_ofer"
 TMP_REPO_DIR = "/tmp/sammy_ofer"
 STATIC_HTML_FILENAME = "static.html"
 GH_PAGES_BRANCH = "static_page"
@@ -42,6 +43,9 @@ def git_commit():
     except:
         repo = Repo.clone_from(REPO_URL, TMP_REPO_DIR)
 
+    repo.config_writer().set_value("user", "name", "sammy-ofer-bot").release()
+    repo.config_writer().set_value("user", "email", "[email protected]").release()
+
     try:
         repo.git.checkout(GH_PAGES_BRANCH)
     except:

web.py

@@ -9,23 +9,19 @@
 from flask import Flask, render_template, request
 from flask.helpers import send_file
 from markupsafe import Markup
-from spectators import SPECTATORS
 
+from spectators import SPECTATORS
 import web_scrape
 
 
-def b64encode(s):
-    return base64.b64encode(s.encode())
-
+def babel_format_day_heb(s):
+    from babel.dates import format_date
 
-def b64decode(s):
-    data = base64.b64decode(s)
-    return data.decode()
+    return format_date(s, "EEEE", locale="he")
 
 
 app = Flask(__name__, template_folder="html_templates")
-app.jinja_env.filters["b64encode"] = b64encode
-app.jinja_env.filters["b64decode"] = b64decode
+app.jinja_env.filters["babel_format_day_heb"] = babel_format_day_heb
 
 
 @app.route("/next", methods=["GET"])

web_scrape.py

@@ -8,7 +8,6 @@
 from dateutil import parser
 from pathlib import Path
 from logger import logger
-import locale
 import requests
 import re
 
@@ -19,15 +18,6 @@
 from static_html_page import gen_static_page
 from metadata import TEAMS_METADATA, DESKTOP_AGENTS
 
-try:
-    locale.setlocale(locale.LC_TIME, "he_IL")  # MacOS
-except locale.Error:
-    try:
-        # apt-get install language-pack-he language-pack-he-base
-        locale.setlocale(locale.LC_TIME, "he_IL.UTF-8")  # Ubuntu
-    except locale.Error:
-        pass
-
 
 def random_ua():
     return {"User-Agent": choice(DESKTOP_AGENTS)}