From 56645e3ff853ed94a76858d22551d3b9765b9e99 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Tue, 18 Feb 2025 00:48:32 +0000 Subject: [PATCH 1/2] Add '500: Internal Server Error' to not_here_list. --- check.py | 1 + 1 file changed, 1 insertion(+) diff --git a/check.py b/check.py index 5d4c234..ae1bd68 100755 --- a/check.py +++ b/check.py @@ -76,6 +76,7 @@ not_here_list = [ "This page does not exist yet", "404 Not Found", "500 Internal Server Error", + "500: Internal Server Error", "Test Page for the Apache HTTP Server", "Site not found · GitHub Pages", "504: Gateway time-out", From befdfd8bb8b0757b638882fe31070e0b3097f433 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Tue, 18 Feb 2025 00:49:05 +0000 Subject: [PATCH 2/2] New build_url() method. --- check.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/check.py b/check.py index ae1bd68..7630216 100755 --- a/check.py +++ b/check.py @@ -186,21 +186,24 @@ class Conference: @property def url(self) -> str: """Conference URL.""" - return self.src_url.format(year=self.year) + return self.build_url(year=self.year) + + def build_url(self, year: int) -> str: + """Build conference URL.""" + return self.src_url.format(year=year, two_digit_year=year % 2000) @property def past_url(self) -> str: """URL for previous year.""" - return self.src_url.format(year=self.year - 1) + return self.build_url(year=self.year - 1) def check(self) -> tuple[bool, str, str | None]: """Check if conference is live.""" no_dot = {"bsideskbh.dk", "pif.camp"} - session = ( - s if all(hostname not in self.url for hostname in no_dot) else s_no_dot - ) + url = self.url + session = s if all(hostname not in url for hostname in no_dot) else s_no_dot try: - r = session.get(self.url) + r = session.get(url) except requests.exceptions.ConnectionError: return (False, "connection refused", None) @@ -229,7 +232,7 @@ class Conference: def check_web_site(self) -> bool: """Check if an individual web site is live.""" - assert "{year}" in self.src_url + assert "{year}" in self.src_url or "{two_digit_year}" in self.src_url live, msg, redirect_to_url = self.check() if not live: return False