From cdb4a0d9b21d321f689539d08e3d18560c7fea27 Mon Sep 17 00:00:00 2001 From: Buzz Andersen Date: Wed, 21 Aug 2024 23:20:26 -0700 Subject: [PATCH 1/6] Add schema to control whether "show full animation is used." Show "extra" text for movie times where available. --- apps/vidiotscalendar/vidiots_calendar.star | 47 ++++++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/apps/vidiotscalendar/vidiots_calendar.star b/apps/vidiotscalendar/vidiots_calendar.star index dfb42ea0c..e58f9b0b4 100644 --- a/apps/vidiotscalendar/vidiots_calendar.star +++ b/apps/vidiotscalendar/vidiots_calendar.star @@ -10,12 +10,13 @@ load("html.star", "html") load("http.star", "http") load("render.star", "render") load("time.star", "time") +load("schema.star", "schema") VIDIOTS_URL = "https://vidiotsfoundation.org/coming-soon/" ANIMATION_DELAY = 50 DATE_RANGE_DURATION = "168h" # 1 week -def main(): +def main(config): response = http.get(VIDIOTS_URL, ttl_seconds = 240) if response.status_code != 200: @@ -23,7 +24,7 @@ def main(): movies = parse_movie_html(response.body()) - return render_animation_for_movies(movies) + return render_animation_for_movies(movies, config.bool("full_animation")) def parse_movie_html(htmlBody): showList = html(htmlBody).find("#upcoming-films").children_filtered(".show-list").children_filtered(".show-details") @@ -65,7 +66,7 @@ def parse_movie_html(htmlBody): return movies -def render_animation_for_movies(movies): +def render_animation_for_movies(movies, full_animation): children = [] for current_movie in movies: @@ -78,6 +79,8 @@ def render_animation_for_movies(movies): first_time = showtimes[0] additional_count = len(showtimes) - 1 + print(first_time.extra) + time_string = first_time.date if additional_count > 0: time_string = time_string + " + " + str(additional_count) + " more" @@ -85,12 +88,26 @@ def render_animation_for_movies(movies): if n < (dates_count - 1): time_string = time_string + " • " + showtime_extra_text = "" + if len(first_time.extra) > 0: + showtime_extra_text = " (" + first_time.extra + ")" + times.append( - render.Column( + render.Row( children = [ - render.Text(time_string), - ], - ), + render.Column( + children = [ + render.Text(time_string) + ] + ), + render.Column( + children = [ + render.Text(showtime_extra_text, color="#ed1c24") + ] + ) + ] + ) + ) children.append( @@ -115,7 +132,7 @@ def render_animation_for_movies(movies): return render.Root( delay = ANIMATION_DELAY, - show_full_animation = True, + show_full_animation=full_animation, child = render.Padding( pad = (0, 0, 0, 2), child = render.Column( @@ -147,6 +164,20 @@ def render_animation_for_movies(movies): ), ) +def get_schema(): + return schema.Schema( + version = "1", + fields = [ + schema.Toggle( + id = "full_animation", + name = "Show Full List", + desc = "Request that Tidbyt show the full movie list rather than being limited to the normal app cycle time.", + icon = "clock", + default = False, + ), + ], + ) + VIDIOTS_LOGO = base64.decode(""" iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAEsWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS41LjAiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIKICAgIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIKICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIgogICAgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIKICAgdGlmZjpJbWFnZUxlbmd0aD0iNDgiCiAgIHRpZmY6SW1hZ2VXaWR0aD0iNDgiCiAgIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiCiAgIHRpZmY6WFJlc29sdXRpb249Ijk2LzEiCiAgIHRpZmY6WVJlc29sdXRpb249Ijk2LzEiCiAgIGV4aWY6UGl4ZWxYRGltZW5zaW9uPSI0OCIKICAgZXhpZjpQaXhlbFlEaW1lbnNpb249IjQ4IgogICBleGlmOkNvbG9yU3BhY2U9IjEiCiAgIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiCiAgIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIKICAgeG1wOk1vZGlmeURhdGU9IjIwMjQtMDgtMTBUMTg6Mjc6NDgtMDc6MDAiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjQtMDgtMTBUMTg6Mjc6NDgtMDc6MDAiPgogICA8eG1wTU06SGlzdG9yeT4KICAgIDxyZGY6U2VxPgogICAgIDxyZGY6bGkKICAgICAgc3RFdnQ6YWN0aW9uPSJwcm9kdWNlZCIKICAgICAgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWZmaW5pdHkgUGhvdG8gMiAyLjUuNCIKICAgICAgc3RFdnQ6d2hlbj0iMjAyNC0wOC0xMFQxODoyNzo0OC0wNzowMCIvPgogICAgPC9yZGY6U2VxPgogICA8L3htcE1NOkhpc3Rvcnk+CiAgPC9yZGY6RGVzY3JpcHRpb24+CiA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgo8P3hwYWNrZXQgZW5kPSJyIj8+Wk6vfAAAAYBpQ0NQc1JHQiBJRUM2MTk2Ni0yLjEAACiRdZHfK4NRGMc/G5qYpiguXCzhatNMLW6ULaEkzZThZnv3S+3H2/tOWm6VW0WJG78u+Au4Va6VIlJyvWvihvV63m21JTunc57P+Z7neXrOc8AaSisZvdkDmWxeC077ncvhFaetSKvMHty4IoquTi4szNFwfD1hMe2D28zV2O/f0R6L6wpYWoUnFFXLC88Iz23mVZP3hbuVVCQmfCns0qRA4UdTj1a4aHKywj8ma6FgAKydws5kHUfrWElpGWF5OQOZ9IZSrcd8iT2eXVoU2y+rD50g0/hxMssUAXyMMC67T7rjZVhONIj3lOPnyUmsIrtKAY11kqTI4xJ1Q7LHxSZEj8tMUzD7/7evemLUW8lu90PLm2F8DIJtD0q7hvF9ahilM2h6hZtsLT53AmOfou/WtIFjcGzD1W1Nix7A9Q70vqgRLVKWmmRZEwl4v4COMHTdQ9tqpWfVe86fIbQlX3UHh0cwJP6OtV+Vwmf7Oj9e2AAAAAlwSFlzAAAOxAAADsQBlSsOGwAADm5JREFUaIG1WXmUW9V9/u697z1pJI2elifNrvHs45oYgw0JAdfsISEkaUwIwSQ0J2lPE05O2wRo2tOedEuannKapbQQiENKaAIJYS0YcEkwNtgY8MrYs2+aGY802ne95d7+IY8zM8yMR475/tKRru79fsv9bZcAIFgbxIK1Cz+fL6y4p8QkmJYpAKA71LmVADfnctm/mE5EBK3iALLC56UkzhXL7qnIyhnyPaHO2wmwWwDHphMRQQAi/R4HrpnEucKu2FDSy2Jd0zrZxqR/IYR8QwgxIjh/DKho63wLcF5ACAElFCW9LHpDnXUm5z8FcAMBIIAHhqZG85RSwjnHai70+7jDOYNRCiEELG6JnlDn5rJl7PE53Dd4a2phcisihHgUAISo0KvmDrzvkJgEi3MBQHSHOm4umforXf6Wnq9/+JYSIQRciEcHwyOzAMhqAsxrfqk/v68WsdvsZy5rZ0v7t3TL/NWVbZtc99/0dWMyHbHPZGIFRuhOoOJi85Cw9pB4vsPmGSiyglK5JNaHutxlbvyIgNx62weu0b+0+UbGBZef638DjNDnBsMjJ7FA+wAgEUIIQCAEX6j59yPOvweUUnDOoRu66Al19hRN/VFPjWvLN7fu0DV7rXz81AiJFtMIZ6JQqPTAwv+cEUAIgUYtQGod7u1CiLcHwyPjwLw/Wlgo7SqoWuDFyanjYyVT39nlb67/m22f12VQpUaxocVbj4devA8E2BfNpPYAWEQeqNwBMROLcgAfIIQc7w51fqe7paPetEwhhBCKLC/yuRVQFfmaxf5+j24az17VdlH9D2/8c3NDYJ0ykZpFreLA0dlhMRCbhMykH6XScSEx6T3nEEIIEUKIrpZ2NyX0ECW0w+LWNIAfEEIeGpgcTgGATVZI2dCr4bksbLKCsqGL3lCXS+fGfYywO3ZceK116wVXE5fNQbkQIAAkyvCXu+7DgfCJEZmyi4emRjPLKYoBILIkk7lUvKypvjkBsd0uKW4OcZ1uGZ8JejTuV33vRpMxAwAYY6RKtyKnFQUAlfje0tlVtoynPPbaj999xefMHRuvY08d30MbVQ17R49ANw3MFdPi4cO7CCHk+0NTo7vJCm7AAIBzTgAgXkr2qQ71w81qoOMrl37KiBfS2lwh/TGL808GvVra7/CfjGViHABkSSZL/XEJ5g8kjDHwSnxHd6jjI2XTeLon0LL+O9f9ibm1daNkCU6aPUHYJQVt/kY0uDXxwFvPkJNzEymJsa/G08nUAmUs3LtiAQBQJJlYhiUCqn8wVsjc8cHm9fI9V9zG/Q63Fc0n6+fyqe2c8OuDXn8snk4OzJOXmES4WFkQRZKJaZkcADqb27+hW+ZPrmq/SP3ahz5t1SoOqWTqmExHEPIEMZY4hdHEDEAh/vPg04QL/vOh8OgjyxFfZAEAxKoQIvFMcsrn9jSNJGe2bG7oRr6UZ3detp37atx8OjsXiheyt/rcvm0BrzYdTydG58kzuti1CAjsih3lSoh0qbXqg4SQe3ZsvJb89R/eDsuy6Gw2Dp0biOfTaPU2QLcMuOQaPNO/D29N93OFSXfG04lpSigRK+TRMxaokKjUIUGvdjRZzN5OKXFuv+BK2CWFjMxN0Zs3XMlbvfViJhtrjxfSX9BU30VBjzYeTyemTpMnlFBQSsCFgGmZojfU2V02jadUu/PGuy6/ld9x0Q0kUcwQQoB2rQm+GjdC3noki1l47C5wCP69N35FS6b+f0Ph0e8CWJE8ALJIACEEKKUkloqnA6pPTKQj118W2sCDTi+pd/vR5A6Qbq2ZeG1O3uFrxHQm1psq5b6oqb7uoOofimeSEQFxJnd0t3TcWLKMpzt9TT3/ePUX+cUN3dQSnIRTEQzOTaLd3wSLc4AQvNh/AHZJwd6JY/yVsUNUYeyueDrZv9SyK7rQ0h/qvcEjOb34iVg+XX9D1wfFicg4KZo6GKFIF3PklguvIVe1XcQJQKczsY0ZvfDHmuprCXq0k/F0ItnV0n6Pbpk7t7ZurP3na7/M23yNdFf/fgScXrT5GtHub0SqkMVzJ/ahS2tBb6AVNYqd37vvcZYp5d8FwV8lMilz3rJVCeC0O8hMfNYIerTZqUz0s63eOhFS64jCJChMQm/dOkylIuiPTpAdm64nFzd2cUaoMp2NbcnpxR1+t/cmAvKl2zZeS+66/LNCtbuoYZno0lpQo9gwnjwFh2wHJRQNbg1eRy1skoKXhg7y5wbfoBJj3x0Kj+6TGCNciNWSpFjkQvMwTAMAkMgk+9VadUs4Fem5deM13MZk8vLgQbT66kEIQY1sQ63NgXem+snV7ZvxifVXiLxecqTKudDXPrRdfHr9VvJi/wHSqTXjjbFjMLiFWpsDe8eOotVbD5fNgXQpjzcn+tCoauL7+5+gkVzilETpnfF0Mn8W8mc0v2oj3d3ScXHZMl7/yqWftH1588eJyS1Y3ILBLdiYDC44BASKho7p9By6Ay1IlXLC71BJ2TSgmwZssox8uQhFUmBjMhilMLkFmTGkijnM5VKIFTPW3S/dzwjw7cHwyN9i+aLyPTXXig2NaZkAQAbDI4cYpQ/+uu81ciI6bj15/FUY3MKekUMYmJuAAKBX1mIkNnU6+ljkyWO/hUQpHIodnAvsHnwLqUIWBb2ImUwMlFC8cHI/dNPA+rp14skTe5hhmUkQPAQAtJJ4lyp3+VJiJSEYZZWwqmpH0+X85yzB1WvaNwvV7iLNnjoEnF4cnRnCXC6JTq0FPYEQBARMbqHW5oTb7oRuGpAog+ZU4bY7MZ48hVy5iCY1AItbaHBreDc6xnceep4C2DkUHv0FACJWbqxWFWDRYiEEGGVkLh3PBjx+YyIV+ei1HZt5ixqk8/trThVBV0WQ2VwcQZcXNbINdbU+HJjow0TyFDq0ZtTaHJAYQ9DlRbKYBaOV+FGj2LDznRdIX3SspDDpT2PpxNzpumdF956nd1YLLITm9h4rWfpHZ3OJphu6LuXvTA2Qk9FxXFDfDkoIODiEEDgw0QebpMBtd0G1O9Ho1iAzGZFcEpRQMEpxcPIEurQWHJ4eQDgdtX7Z9yo1LevxwfDIg2vlMy/gmgRw2B1kNhE16zza1FQmtqPB7be2tW2ifoeKSDYJmyRDc6gIuLxQ7S6oNS68NnoYhmWizdcIAeCFk6/D53DD53CjM9AMRim6AiE8N7gfb06d4AplfxbPJOfLhjU3SGsSYD6sxjPJIa9b3TienN3wkc5LLM2p0t2DB+G2O5EsZJEtF9DkCcLGFHhqalFrc0AIgVOZGLa09EKtceHZvr2gIGhQA4jkEvwH+5+gJVN/fmhq9F4AEBBnc51FWPNYhVFWqVqp/Pfjqdn8Y8d/AwD4zIVXo83fiHghjWQhi7KpY2BuAk6lBkGXFzOZGPpmRyEzGQQEW9s3we/0wOIWXh5+S0RySUiU/XDhGdVgzXdgPqXHM4mIpvo8Y8nZKy5r2WAeCvdThcnoDbaizu1DspDF2+GT6A6GAABuuxPdgRYYlolMOY+gy4vfDr+DvFHijxx9maVK2VeHp0a/dfqMqgWoarBFaWW5RNi/JYqZyZ8e3sVaPHXCqdjxxvgxjMSmEXT5cPOF10A3TTxx9DfI6yVQQpHXS3ip/02UTQNXdlyM/tgkH0vOQGLSfUClQaqWPFCFBYCKFWRJJtFULB9Q/YWJ1OxN29o3mb2BVsYohUO2IVsuoKAXYZdt8NTUIuBUUTJ0KJKE3uA62GUFlBB+/8Fn2Ew2/i6l9O5EOmme7gqrnW4sGq+v6Y+mWcm6TNCHdcs88OBbz8q5csFqdGsIuLw4NDWAuVwSMpPQ6q1HupTHk8dfBQFB2TRwdHoI+8MneN/cGBQm/XhocqRECV2x4zoL1hZGl0JiEplLx6ygNzBxKhv/fJ3LZ04nIyynF3F520Z4HW48dfxVuO0uBJwetPkbYJdsAATCqYj49cnX2Hhqdlqi7M54OlE4HXnmsdpDynssdE4CzLeR8XRi1Of29oylTm3avmGb0eZrYCAEjFD4nSpqbQ7k9RJskgwBYCJxCjabzXr40C4KiP8YDI/8L6V0acOy0JXOWgud63RazF86mUn/EE5HMy8OH4Snplb0zY7ilaG3UV/rh9fhxmh8GgPRSRAAs9mE+PmR3SRvlDKU0J8AWG7yt1L7JZb7bdVaaBXMj1RIPJ2IaarfOZqcueqSpl6jw9/Egi4vFElGLJ9GsyeIJjUAmyTDptis+99+VjIt82dLpg3zBFergZZ+L4D3WqCqEfr8rEmm7N8z5cLIzneelwpGmU+l50AIxd7Rw0gUMjgZHceR6SG8MHhAJAoZg1H2XwBAyaLjq77AqOISrxjeFFkhkeRcMejR0lOZ6B8FatSyTJjUpAbQEwyh1u6EjUkQEOb9B5+Rc0bxheHw6Pcqm66YuNYcTtd6B1bcTD89Ly0WCj/TTXPP80MH7JeE/sAkIHix/00MRifR4NZwJDLCw+koJFJJXIzS1Qiu2RrnFIWWQmISSeUzIugJjMzmEl9w2xzmlqYeqUa2oUkNomwZ1r37HpPjxfTrxULq77LFkjiXsmE5nJc3st+1n8N7GaWP/OL4K/apTKysOT04Mj2A/ZPvWsOJachUemAmkeRn0X5VOG+PfBKrdFgylf4pmksl/vvwLjBChRDgT554TTItawjA0wBgrT4UrgrnTQDTssAoJQOTw2Myk+7dNXTQNpKcKWlur3ksMkplxh4aDI/kJLZqyVztQ+KiudB5M6vf7T1a5sanZrNx7UR0XAzFp+ISlb4aTydyZ5n1VB1Kq+p+1gJZkmGYhugJdd7ChXicEAIC/OvA5PA3lyG5XLisqhY67w/d8+3nwOTwLykhuwlgEuDHwIJnmt9hpYy70khl5feBKnmummhkSSKcc2iqbxZAdmBy+H+WnLPQ11d7UD/r+v8HIPDSlA+3pr4AAAAASUVORK5CYII= """) From 8001d853058f0a4aadc87078b69d0bb460f3cd55 Mon Sep 17 00:00:00 2001 From: Buzz Andersen Date: Wed, 21 Aug 2024 23:24:20 -0700 Subject: [PATCH 2/6] Remove debug print statement. --- apps/vidiotscalendar/vidiots_calendar.star | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/vidiotscalendar/vidiots_calendar.star b/apps/vidiotscalendar/vidiots_calendar.star index e58f9b0b4..524c1c143 100644 --- a/apps/vidiotscalendar/vidiots_calendar.star +++ b/apps/vidiotscalendar/vidiots_calendar.star @@ -79,8 +79,6 @@ def render_animation_for_movies(movies, full_animation): first_time = showtimes[0] additional_count = len(showtimes) - 1 - print(first_time.extra) - time_string = first_time.date if additional_count > 0: time_string = time_string + " + " + str(additional_count) + " more" From 80b16ee26ef23f64e9388a0165a3577716a0bad2 Mon Sep 17 00:00:00 2001 From: Buzz Andersen Date: Wed, 21 Aug 2024 23:36:56 -0700 Subject: [PATCH 3/6] Supply default value for "full animations" config. --- apps/vidiotscalendar/vidiots_calendar.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/vidiotscalendar/vidiots_calendar.star b/apps/vidiotscalendar/vidiots_calendar.star index 524c1c143..e74f66ed5 100644 --- a/apps/vidiotscalendar/vidiots_calendar.star +++ b/apps/vidiotscalendar/vidiots_calendar.star @@ -24,7 +24,7 @@ def main(config): movies = parse_movie_html(response.body()) - return render_animation_for_movies(movies, config.bool("full_animation")) + return render_animation_for_movies(movies, config.bool("full_animation", False)) def parse_movie_html(htmlBody): showList = html(htmlBody).find("#upcoming-films").children_filtered(".show-list").children_filtered(".show-details") From 423bb7d8ec8e8384109d5fa3633d2ef5c26cdebf Mon Sep 17 00:00:00 2001 From: Buzz Andersen Date: Wed, 21 Aug 2024 23:38:43 -0700 Subject: [PATCH 4/6] Linting. --- apps/vidiotscalendar/vidiots_calendar.star | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/apps/vidiotscalendar/vidiots_calendar.star b/apps/vidiotscalendar/vidiots_calendar.star index e74f66ed5..d613f2e38 100644 --- a/apps/vidiotscalendar/vidiots_calendar.star +++ b/apps/vidiotscalendar/vidiots_calendar.star @@ -9,8 +9,8 @@ load("encoding/base64.star", "base64") load("html.star", "html") load("http.star", "http") load("render.star", "render") -load("time.star", "time") load("schema.star", "schema") +load("time.star", "time") VIDIOTS_URL = "https://vidiotsfoundation.org/coming-soon/" ANIMATION_DELAY = 50 @@ -95,17 +95,16 @@ def render_animation_for_movies(movies, full_animation): children = [ render.Column( children = [ - render.Text(time_string) - ] + render.Text(time_string), + ], ), render.Column( children = [ - render.Text(showtime_extra_text, color="#ed1c24") - ] - ) - ] - ) - + render.Text(showtime_extra_text, color = "#ed1c24"), + ], + ), + ], + ), ) children.append( @@ -130,7 +129,7 @@ def render_animation_for_movies(movies, full_animation): return render.Root( delay = ANIMATION_DELAY, - show_full_animation=full_animation, + show_full_animation = full_animation, child = render.Padding( pad = (0, 0, 0, 2), child = render.Column( From ba5f93fe4ed4f4a4155907b51b477b96a33a1fc8 Mon Sep 17 00:00:00 2001 From: Buzz Andersen Date: Thu, 22 Aug 2024 23:16:08 -0700 Subject: [PATCH 5/6] Fix bug where same date is shown for movies with multiple dates. --- apps/vidiotscalendar/vidiots_calendar.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/vidiotscalendar/vidiots_calendar.star b/apps/vidiotscalendar/vidiots_calendar.star index d613f2e38..2a3ee52b3 100644 --- a/apps/vidiotscalendar/vidiots_calendar.star +++ b/apps/vidiotscalendar/vidiots_calendar.star @@ -74,7 +74,7 @@ def render_animation_for_movies(movies, full_animation): dates_count = len(current_movie.dates) for n in range(len(current_movie.dates)): - current_date = current_movie.dates.items()[0] + current_date = current_movie.dates.items()[n] showtimes = current_date[1] first_time = showtimes[0] additional_count = len(showtimes) - 1 From 2bc5fac67360de1fc94623f079d82af2bd6326f8 Mon Sep 17 00:00:00 2001 From: Buzz Andersen Date: Mon, 2 Dec 2024 22:22:31 -0800 Subject: [PATCH 6/6] Fix date range checking so that it can deal with wrapping to the next year. --- apps/vidiotscalendar/vidiots_calendar.star | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/vidiotscalendar/vidiots_calendar.star b/apps/vidiotscalendar/vidiots_calendar.star index 0f69c60a8..a07ea2adc 100644 --- a/apps/vidiotscalendar/vidiots_calendar.star +++ b/apps/vidiotscalendar/vidiots_calendar.star @@ -1,7 +1,7 @@ """ Applet: Vidiots Calendar Summary: Showtimes for Vidiots (LA) -Description: Movie showtimes for the next 7 days at Vidiots in Los Angeles, CA. +Description: Movie showtimes for Vidiots theater in Los Angeles, CA. Author: Buzz Andersen """ @@ -83,8 +83,8 @@ def parse_movie_html(html_body, date_limit_duration): showtime_extra_text = showtime.children_filtered(".extra").text().strip() showtime_text = showtime.text().replace("\n", "").replace("\t", "").replace(showtime_extra_text, "").strip() - is_past = (date.month < date_now.month) or ((date.month == date_now.month) and (date.day < date_now.day)) - is_beyond_limit = (date.month > date_limit.month) or ((date.month == date_limit.month) and (date.day > date_limit.day)) + is_past = date.unix < date_now.unix + is_beyond_limit = date.unix > date_limit.unix if is_past == False and is_beyond_limit == False: if valid_dates.get(epoch) == None: