May, 4 Updates (#37)

drehelis · web-flow · commit f9a804eef110 · 2024-05-04T19:46:59.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ __pycache__
 spectators.py*
 .env
 banner.png
+static.html
diff --git a/assets/templates/static_page.jinja2 b/assets/templates/static_page.jinja2
@@ -1,3 +1,9 @@
+{% macro notification_channel() %}
+<!-- https://github.com/badges/shields/issues/10109 -->
+<a href="https://t.me/sammy_ofer_notification_channel" style="border: none; text-decoration: none;">
+  <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" alt="Sammy Ofer Notification Channel">
+</a>
+{% endmacro -%}
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -12,15 +18,15 @@
   <link href="assets/templates/style.css" rel="stylesheet" type="text/css">
   <script>
     const currentDate = new Date();
-    const day = currentDate.getDate();
-    const month = ("0" + (currentDate.getMonth() + 1)).slice(-2);
-    const year = currentDate.getFullYear();
+    const day = currentDate.toLocaleString('en-US', { day: '2-digit' });
+    const month = currentDate.toLocaleString('en-US', { month: '2-digit' });
+    const year = currentDate.toLocaleString('en-US', { year: "numeric" });
     const todayDate = `${year}-${month}-${day}`;
   </script>
 </head>
 <body>
-  {% for key, value in games.items() %}
-  {% set scraped_date_time, league, home_team, home_team_en, home_team_url, game_hour, guest_team, guest_team_en, guest_team_url, game_time_delta, road_block_time, specs_word, specs_number, poll, notes, custom_sepcs_number, custom_road_block_time = value %}
+  {% for key, value in games.items() -%}
+  {% set scraped_date_time, league, home_team, home_team_en, home_team_url, game_hour, guest_team, guest_team_en, guest_team_url, game_time_delta, road_block_time, specs_word, specs_number, poll, notes, custom_sepcs_number, custom_road_block_time = value -%}
   <div id="container-{{loop.index}}" class="container">
     <div class="metadata">
       <div class="metadata-item">משחק ⚽ היום בשעה: {{ game_hour }}</div>
@@ -40,11 +46,8 @@
       <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>
-      <!-- https://github.com/badges/shields/issues/10109 -->
       <div>
-        <a href="https://t.me/sammy_ofer_notification_channel" style="border: none; text-decoration: none;">
-          <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" alt="Sammy Ofer Notification Channel">
-        </a>
+        {{ notification_channel() | indent(8) }}
       </div>
     </div>
   </div>
@@ -55,15 +58,11 @@
     }
   </script>
   {% endfor %}
-
   <div id="default-container" class="container" style="display: none;">
     <div class="metadata">
       <div class="metadata-item">המשחק ⚽ הבא: {{ games['game_1'][0] | babel_format_full_heb }}</div>
       <div class="metadata-item"><img src="assets/images/qrcode.png" alt="QR Code" style="max-width: 100px; margin-top: 1rem;"></div>
-      <!-- https://github.com/badges/shields/issues/10109 -->
-      <a href="https://t.me/sammy_ofer_notification_channel" style="border: none; text-decoration: none;">
-        <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" alt="Sammy Ofer Notification Channel">
-      </a>
+      {{ notification_channel() | indent(6) }}
     </div>
   </div>
   
diff --git a/cron.py b/cron.py
@@ -132,7 +132,9 @@ async def send(msg, token=TELEGRAM_TOKEN, chat_id=TELEGRAM_CHANNEL_ID):
 if __name__ == "__main__":
     web = web_scrape.WebScrape()
     scrape = web.scrape()
-    scraped_games = web.decoratored_games(scrape)
+    scraped_games = web.decoratored_games(
+        scrape
+    )  # also fetches teams logos and generates static page
     generated_data = check_games_today(scraped_games)
     detected_games_today = list(generated_data)
     message = create_message(detected_games_today)
diff --git a/logger.py b/logger.py
@@ -2,8 +2,8 @@
 
 logging.basicConfig(
     level=logging.INFO,
-    format="{'time':'%(asctime)s', 'level': '%(levelname)s', 'message': '%(message)s'}",
-    handlers=[logging.StreamHandler()]
+    format="[%(asctime)s] [%(levelname)-8s] %(message)s (%(filename)s:%(lineno)s)",
+    handlers=[logging.StreamHandler()],
 )
 
 logger = logging.getLogger(__name__)
diff --git a/static_html_page.py b/static_html_page.py
@@ -38,6 +38,10 @@ def gen_static_page(obj):
         f.write(content)
         logger.info(f"Generated {STATIC_HTML_FILENAME} from template")
 
+    if os.getenv("SKIP_COMMIT"):
+        logger.info("SKIP_COMMIT is set, skipping git commit")
+        return
+
     git_commit()
 
 
diff --git a/web_scrape.py b/web_scrape.py
@@ -12,7 +12,6 @@
 import re
 
 import numpy as np
-import PIL
 from PIL import Image
 
 from static_html_page import gen_static_page

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`logging.basicConfig(`
`4`	`4`	`level=logging.INFO,`
`5`		`- format="{'time':'%(asctime)s', 'level': '%(levelname)s', 'message': '%(message)s'}",`
`6`		`- handlers=[logging.StreamHandler()]`
	`5`	`+ format="[%(asctime)s] [%(levelname)-8s] %(message)s (%(filename)s:%(lineno)s)",`
	`6`	`+ handlers=[logging.StreamHandler()],`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`logger = logging.getLogger(__name__)`