Wed, 7 Update (#63)

Author: drehelis

README.md

@@ -60,6 +60,11 @@ uv pip install -r requirements.txt
 flask run --debug --port=5001
 ```
 
+Manually run cron job
+```
+python -c "from scheduler import run_job; run_job()"
+```
+
 ## TODO
 I'm out of ideas...
 

assets/teams/Neot Peres.png

@@ -37,7 +37,7 @@
   {% for game in upcoming -%}
   <div id="container-{{loop.index}}" class="container">
     <div class="metadata">
-      <div class="metadata-item">משחק ⚽ היום בשעה: {{ game.game_hour }}</div>
+      <div class="metadata-item">אירוע 🏟️ היום בשעה: {{ game.game_hour }}</div>
     </div>
     <div class="team">
       <div class="team-logo" style="background-image: url('assets/teams/{{ game.home_team_en }}.png');"></div>
@@ -68,11 +68,11 @@
   {% endfor %}
   <div id="default-container" class="container" style="display: none;">
     <div class="metadata">
-      <div class="metadata-item">המשחק ⚽ הבא:
+      <div class="metadata-item">אירוע 🏟️ הבא:
       {% if upcoming and upcoming|length > 0 %}
         {{ upcoming[0].get('scraped_date_time') | babel_format_full_heb }}
       {% else %}
-          אין משחקים קרבים
+        אין אירועים קרובים
       {% endif %}
       </div>
       <div class="metadata-item"><img src="assets/images/qrcode.png" alt="QR Code" style="max-width: 100px; margin-top: 1rem;"></div>

assets/teams/Osher Cohen.png

@@ -109,7 +109,11 @@
         <p>
         <div id="result_action"></div>
         </p>
-        <a href="/scheduler">תיזמונים</a>
+        <li>
+            <a href="/scheduler">תיזמונים</a> |
+            <a href="https://yeshmishak.top/static.html">עמוד תצוגה</a> |
+            <a href="https://yeshmishak.top/cal.html">יומן</a>
+        </li>
     </div>
 
     <script>

assets/templates/static_page.jinja2

@@ -65,6 +65,11 @@
         "url": "https://www.football.co.il/maccabi-tel-aviv",
         "logo": "https://static.football.co.il/wp-content/themes/kingclub-theme/images/teams/4536.png",
     },
+    "מכבי תל-אביב": {
+        "name": "Maccabi Tel Aviv",
+        "url": "https://www.football.co.il/maccabi-tel-aviv",
+        "logo": "https://static.football.co.il/wp-content/themes/kingclub-theme/images/teams/4536.png",
+    },
     "עירוני טבריה": {
         "name": "Ironi Tveria",
         "url": "https://www.football.co.il/ironi-tveria/",
@@ -115,6 +120,16 @@
         "url": "https://www.football.co.il/maccabi-petah-tikva/",
         "logo": "https://static.football.co.il/wp-content/themes/kingclub-theme/images/teams/15006.png",
     },
+    "אושר כהן": {
+        "name": "Osher Cohen",
+        "url": "https://youtube.com/user/OfficialOsherCohen",
+        "logo": "",
+    },
+    "תושבי נאות פרס": {
+        "name": "Neot Peres",
+        "url": "https://www.facebook.com/groups/pereshaifa/",
+        "logo": "",
+    },
 }
 
 EMOJI_HEARTS = [

html_templates/next.html

@@ -56,7 +56,7 @@ def create_message(obj_data):
 
         yield (
             f"""
-משחק ⚽ *היום* בשעה *{row.game_hour}*
+אירוע 🏟️ *היום* בשעה *{row.game_hour}*
 *{row.league}*: [{escape_markdown_v2(row.home_team)}]({row.home_team_url}) \\|\\| [{escape_markdown_v2(row.guest_team)}]({row.guest_team_url})
 צפי חסימת כבישים: *{row.custom_road_block_time}*
 צפי אוהדים משוער: *{row.specs_word}* {escape_markdown_v2(f"({row.specs_number:,})")} {row.specs_emoji}

metadata.py

@@ -253,11 +253,29 @@ def banner(self):
         )
 
         banner_list = [guest_team_fname, versus_image_fname, home_team_fname]
-        images = [Image.open(i) for i in banner_list]
 
-        # pick the image which is the smallest, and resize the others to match it (can be arbitrary image shape here)
+        # Open images and convert all to RGB mode for consistency
+        images = []
+        for img_path in banner_list:
+            img = Image.open(img_path)
+            if img.mode != "RGB":
+                white_bg = Image.new("RGB", img.size, (255, 255, 255))
+
+                if img.mode == "RGBA":
+                    white_bg.paste(img, (0, 0), img)
+                    img = white_bg
+                else:
+                    img = img.convert("RGB")
+            images.append(img)
+
+        # pick the image which is the smallest, and resize the others to match it
         min_shape = sorted([(np.sum(i.size), i.size) for i in images])[0][1]
-        hstack = np.hstack([i.resize(min_shape) for i in images])
+
+        # Resize all images to the same shape before stacking
+        resized_images = [np.array(img.resize(min_shape)) for img in images]
+
+        # Stack the images horizontally
+        hstack = np.hstack(resized_images)
 
         images_combine = Image.fromarray(hstack)
         final_size = (770, 300)  # best found to fit telegram photo on mobile