diff --git a/check.py b/check.py
index 6b08255..ca78184 100755
--- a/check.py
+++ b/check.py
@@ -2,11 +2,9 @@
"""Check if conference websites are live."""
-import configparser
import os
import re
import smtplib
-import typing
import warnings
from datetime import date
from email.mime.text import MIMEText
@@ -15,16 +13,10 @@ from email.utils import formatdate, make_msgid
import requests
import yaml
from requests.adapters import HTTPAdapter
-from urllib3.exceptions import InsecureRequestWarning # type: ignore
-from urllib3.util.url import parse_url # type: ignore
+from urllib3.exceptions import InsecureRequestWarning
+from urllib3.util.url import parse_url
-
-class LiveConference(typing.TypedDict):
- """Live conference."""
-
- conference: str
- year: int
- live: date
+from conference import LiveConference, config, load_yaml
class AbsoluteDNSAdapter(HTTPAdapter):
@@ -36,6 +28,7 @@ class AbsoluteDNSAdapter(HTTPAdapter):
# Append a dot to the hostname if it's not already there.
hostname = parsed_url.host
+ assert hostname
if not hostname.endswith("."):
hostname += "."
@@ -50,16 +43,6 @@ class AbsoluteDNSAdapter(HTTPAdapter):
return super().send(request, **kwargs)
-config_file_path = os.path.expanduser(
- os.path.join(
- os.getenv("XDG_CONFIG_HOME", "~/.config"), "conference-check", "config"
- )
-)
-
-config = configparser.ConfigParser()
-config.read(os.path.expanduser(config_file_path))
-
-
# Suppress only the single InsecureRequestWarning from urllib3
warnings.filterwarnings("ignore", category=InsecureRequestWarning)
@@ -95,6 +78,7 @@ not_here_list = [
"Wikimedia Error",
"The page you requested could not be found",
"Ooops! Could Not Find It",
+ "OpenStreetMap Authentication Proxy",
]
@@ -144,13 +128,6 @@ def send_mail(subject: str, body: str) -> None:
s.quit()
-def load_yaml(name: str) -> typing.Any:
- """Load YAML."""
- filename = os.path.expanduser(config["data"][name])
- assert os.path.exists(filename)
- return yaml.safe_load(open(filename))
-
-
def check_conference_web_site(name: str, src_url: str, year: int) -> bool:
"""Check if an individual web site is live."""
assert "{year}" in src_url
diff --git a/conference/__init__.py b/conference/__init__.py
new file mode 100644
index 0000000..6891012
--- /dev/null
+++ b/conference/__init__.py
@@ -0,0 +1,34 @@
+"""Conference classes and functions."""
+
+import configparser
+import os
+import typing
+from datetime import date
+
+import yaml
+
+config_file_path = os.path.expanduser(
+ os.path.join(
+ os.getenv("XDG_CONFIG_HOME", "~/.config"), "conference-check", "config"
+ )
+)
+assert os.path.exists(config_file_path)
+
+config = configparser.ConfigParser()
+config.read(os.path.expanduser(config_file_path))
+
+
+class LiveConference(typing.TypedDict, total=False):
+ """Live conference."""
+
+ conference: str
+ year: int
+ live: date
+ url: str | None
+
+
+def load_yaml(name: str) -> typing.Any:
+ """Load YAML."""
+ filename = os.path.expanduser(config["data"][name])
+ assert os.path.exists(filename)
+ return yaml.safe_load(open(filename))
diff --git a/templates/index.html b/templates/index.html
new file mode 100644
index 0000000..bcba09c
--- /dev/null
+++ b/templates/index.html
@@ -0,0 +1,53 @@
+
+
+
+
+ Conference check
+
+
+
+
+
+ Conference check
+ Date when website went live.
+
+
+
+
diff --git a/web_view.py b/web_view.py
new file mode 100755
index 0000000..9d0786b
--- /dev/null
+++ b/web_view.py
@@ -0,0 +1,25 @@
+#!/usr/bin/python3
+"""When conference websites appeared."""
+
+import flask
+
+from conference import LiveConference, load_yaml
+
+app = flask.Flask(__name__)
+app.debug = False
+
+
+@app.route("/")
+async def index() -> str:
+ """Index page."""
+ conferences = load_yaml("conferences")
+ live: list[LiveConference] = load_yaml("live")
+
+ for c in live:
+ c["url"] = conferences[c["conference"]].format(year=c["year"])
+
+ return flask.render_template("index.html", live=live, conferences=conferences)
+
+
+if __name__ == "__main__":
+ app.run(host="0.0.0.0")