From 53b9e966e38d53a2e72f6e79c5cb6c69c609b0cd Mon Sep 17 00:00:00 2001
From: BryanSlavinBryter <bas@brytertech.com>
Date: Thu, 7 Nov 2024 16:38:10 -0500
Subject: [PATCH] Update hanukkah.star

Ensure this works until 2030 - check with me then for an update!
---
 apps/hanukkah/hanukkah.star | 68 ++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 39 deletions(-)

diff --git a/apps/hanukkah/hanukkah.star b/apps/hanukkah/hanukkah.star
index 78b09a1ec..7d6ab6c0d 100644
--- a/apps/hanukkah/hanukkah.star
+++ b/apps/hanukkah/hanukkah.star
@@ -10,67 +10,57 @@ MAIN_MENORAH_IMAGE = base64.decode("""
 iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAACXBIWXMAAC4jAAAuIwF4pT92AAACTUlEQVRoBe1ZvUoDQRDeeMZAjGhiEKsDxcLCQhQJgo1gpY02voCNtaWNCHkAX8AXsDH6AGlEjBYWChb+IUZUNCZiNEdEL34T70I8EW4lmwlcBiZ7l539Zua73dn7EaIpfAzkU22p1wP/Fl8EQrRyOd9eGIho/quY+ekzuGJg9Vs6E/HikWaap8IsXQ8ndV0f5QiohcMp+TxJRpfecn5f/jHgM7TlScMwAlyxsPnN5tI70Ge2AOCYbQZYSZfQtnuZgBCS//Q0AZeZgs/LBIj+aJCWAZuw3QdYGZ+jvWfLHo5ZCZha26O9/5KTAO5doA3Jj3mZgCckb3qZAM7cy77LS2BkZSNB+lc0qvudflX7q8a3i+CQMwjHuep+hzuh2l8Fn7sIOhOv+3mTgLpT3mAOmzOgwS5I3cOxdwF6Igsr9N4riS1rLwkvIhiQo0H2EkjiOIz9cZP+VCBZYJK6FVl7t7jCypEuNuUsKs/iVscs/stDH6izSuieneT9u/n1+9/+fiBRDBcOxP/i2TB/je+BQQc0cbg6P0fGFQLoxCIhhsMCnddB+uCDZqGTAFWugwDet5NX5cQ1LgjPQlkfhuwi6DroGhumgVcuRjXGdQ1nF0HXA2psGALeS40xpeB+1ACpkRLGmObTMJ+BjkP1qqFdOKZ3gmdQKrz0fiADpRp0C13HepXZPTBETpQSgMQXEU4c2m2FRR9B7qD2i9BB6/gGLc0G+jpEFZxmpgalXecYJCh7a6SaAFrfndAPqB8qI0UY04dTmiUTIGFXZrBb2y9APpyWjITdDwAAAABJRU5ErkJggg==
 """)
 
+def get_hanukkah_dates(year):
+    hanukkah_dates = {
+        2024: "2024-12-25T00:00:00Z",
+        2025: "2025-12-14T00:00:00Z",
+        2026: "2026-12-04T00:00:00Z",
+        2027: "2027-12-24T00:00:00Z",
+        2028: "2028-12-12T00:00:00Z",
+        2029: "2029-12-01T00:00:00Z",
+        2030: "2030-12-20T00:00:00Z",
+    }
+    hanukkah_first_day = time.parse_time(hanukkah_dates[year])
+    hanukkah_last_day = hanukkah_first_day + time.parse_duration("192h")
+    return hanukkah_first_day, hanukkah_last_day
+
 def main(config):
     timezone = config.get("timezone") or "America/New_York"
     if not time.is_valid_timezone(timezone):
         timezone = "America/New_York"
     current_time = time.now().in_location(timezone)
+    current_year = current_time.year
 
-    # Used for testing
-    # current_time = time.parse_time("2024-12-24T10:00:00Z")
-    # TODO: Current time to midnight or 11:59:59?
+    if current_year > 2030:
+        return render.Root(
+            child = render.WrappedText(
+                content = "This app only supports years up to 2030.",
+                color = "#ff0000",
+                font = "CG-pixel-4x5-mono",
+            ),
+        )
 
-    # First Day of Hanukkah
-    # TODO: Look up for future years
-    # 20241107 - bas - hardcoded for 2024
-    hanukkah_first_day = time.parse_time("2024-12-25T00:00:00Z")
-    hanukkah_last_day = hanukkah_first_day + time.parse_duration("192h")
+    hanukkah_first_day, hanukkah_last_day = get_hanukkah_dates(current_year)
 
-    # Is it currently Hanukkah?
-    # Check if it is after Hanukkah
     if current_time > hanukkah_last_day:
-        # TODO: Make work with Marquee
-        msg = render.WrappedText(
-            content = "Hanukkah is over for 2024.\nSee you on December 14, 2025!",
+        main_child = render.WrappedText(
+            content = "Hanukkah is over for %d.See you next year!" % current_year,
             color = "#0000ff",
             font = "CG-pixel-4x5-mono",
         )
-
-        # TODO: Animation with menorah?
-        main_child = msg
-        # Check if it is before Hanukkah
-
     elif current_time < hanukkah_first_day:
-        # How many days before Hanukkah begins?
         countdown_days = int((hanukkah_first_day - current_time).hours / 24) + 1
         if countdown_days == 1:
-            msg = render.WrappedText("Hanukkah 2024 starts tomorrow!", font = "tb-8", color = "#0000ff")
+            main_child = render.WrappedText("Hanukkah starts tomorrow!", font = "tb-8", color = "#0000ff")
         else:
-            msg = render.WrappedText("Hanukkah 2024 starts in %d days!" % countdown_days, font = "tb-8", color = "#0000ff")
-
-        # TODO: Animation with menorah?
-        main_child = msg
-        # It's Hanukkah!
-
+            main_child = render.WrappedText("Hanukkah starts in %d days!" % countdown_days, font = "tb-8", color = "#0000ff")
     else:
-        # TODO: Figure out whether to show the candles being lit
-        # Figure out how many candles to show
         num_candles = int((current_time - hanukkah_first_day).hours / 24) + 1
         candles = []
-
-        # Magical Offsets for the candle images
         offset_widths = [0, 80, 96, 112, 136, 152, 168, 184]
-
-        # Lay out the candles
         for i in range(0, num_candles):
             candles.append(render.Box(width = offset_widths[i], child = render.Image(src = CANDLE_IMAGE)))
-
-        # Insert the base menorah
         candles.append(render.Image(src = MAIN_MENORAH_IMAGE))
-
-        # Render as a flat stack
         main_child = render.Stack(children = candles)
 
-    return render.Root(
-        child = main_child,
-    )
+    return render.Root(child = main_child)