Merge pull request #5 from mscherer/patch-1

Update IRC network

.gitignore

@@ -1,2 +1,3 @@
 .venv/
 __pycache__/
+config-*.py

README.md

@@ -1,6 +1,6 @@
 # AfpyLogs
 
-Web view of IRC logs from #afpy channel on Freenode.
+Web view of IRC logs from #afpy channel on [Libera](https://libera.chat/).
 
 
 ## Installing

app.py

@@ -3,24 +3,33 @@
 import os
 import re
 
+from pathlib import Path
+from bleach import Cleaner
+from bleach.linkifier import LinkifyFilter
 from flask import Flask, g, redirect, render_template, url_for
 
 
 application = Flask(__name__, template_folder=".")
 application.config.from_object("config")
+try:
+    application.config.from_object(f"config-{application.config['ENV']}")
+except Exception as e:
+    print(
+        "Starting without specific configuration"
+        f"file config-{application.config['ENV']}.py"
+    )
 application.jinja_env.trim_blocks = application.config["JINJA_ENV"]["TRIM_BLOCKS"]
 application.jinja_env.lstrip_blocks = application.config["JINJA_ENV"]["LSTRIP_BLOCKS"]
 
 LOG_PATTERN = re.compile(application.config["LOG_PATTERN"])
-LINK_PATTERN = re.compile(application.config["LINK_PATTERN"])
 BOLD_PATTERN = re.compile(application.config["BOLD_PATTERN"])
 
 
 def get_archives():
     archives = []
     dates = {"years": [], "months": {}, "days": {}}
-    for filename in sorted(os.listdir(application.config["LOG_PATH"])):
+    for filename in sorted(Path(application.config["LOG_PATH"]).glob("log-*-*-*.txt")):
-        date = filename[:-4].split("-")[1:]
+        date = filename.name[:-4].split("-")[1:]
         archives.append(date)
         if date[0] not in dates["years"]:
             dates["years"].append(date[0])
@@ -41,36 +50,35 @@ def archives(year=None, month=None, day=None):
     # Récupération des fichiers disponibles
     archives, g.dates = get_archives()
     # Récupération de la date souhaitée
-    if year is None or month is None or day is None:
+    if (
-        # Si date mal ou non fournie, on prend la dernière existante
+        year is None
+        or month is None
+        or day is None
+        or [year, month, day] not in archives
+    ):
+        # Si date mal ou non fournie ou inexistante, on prend la dernière
         year = archives[-1][0]
         month = archives[-1][1]
         day = archives[-1][2]
         # Et on redirige proprement
         return redirect(url_for("archives", year=year, month=month, day=day))
-    # On vérifie que le tuple existe
-    if [year, month, day] not in archives:
-        # TODO: Renvoyer une 404 ou mettre un message d'erreur ?
-        return "404"
     # Ok, on charge et on affiche le contenu du fichier
     filename = "log-%s-%s-%s.txt" % (year, month, day)
     filepath = os.path.join(application.config["LOG_PATH"], filename)
-    with open(filepath) as f:
+    with open(filepath, encoding="utf-8") as f:
         lines = f.read().splitlines()
     g.lines = []
     g.year, g.month, g.day = year, month, day
+    cleaner = Cleaner(tags=["b"], filters=[LinkifyFilter])
     for line in lines:
         result = LOG_PATTERN.match(line)
         if result is not None:
             message = result.group("message")
-            for link in LINK_PATTERN.findall(message):
-                message = message.replace(
-                    link, application.config["LINK_HTML"].format(link=link)
-                )
             for text in BOLD_PATTERN.findall(message):
                 message = message.replace(
                     text, application.config["BOLD_HTML"].format(text=text)
                 )
+            message = cleaner.clean(message)
             g.lines.append(
                 {
                     "time": result.group("time"),

config.py

@@ -13,11 +13,5 @@ LOG_PATH = "/var/www/logs.afpy.org"
 DATE_FORMAT = "(\d+-\d+-\d+ )?(?P<time>\d\d:\d\d)"
 LOG_PATTERN = r"^%s\s+[<*]\s*(?P<nick>[^> ]+)[> ]\s+(?P<message>.*)$" % DATE_FORMAT
 
-# Patterns
+BOLD_PATTERN = r"\*[^*\s]+\*"
-LINK_PATTERN = r"https?://\S+"
+BOLD_HTML = "<b>{text}</b>"
-BOLD_PATTERN = r"\*[^\*\s]+\*"
-
-# html
-LINK_HTML = '<a href="{link}">{link}</a>'
-BOLD_HTML = "<b>{text}</b>"
-

requirements.txt

@@ -1,2 +1,3 @@
 flask
+bleach
 gunicorn

template.html

@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>Logs du chan #afpy pour le </title>
         <style type="text/css">
             body {background-color: #000; color: #fff; font-family: "Verdana"}
@@ -67,7 +69,7 @@
         </div>
         <div id="content">
         {% for line in g.lines %}
-        <span class="time">{{ line.time }}</span> <span class="bracket">&lt;</span><span class="nick">{{ line.nick }}</span><span class="bracket">&gt;</span> <span class="message">{{ line.message |safe }}</span><br />
+        <span class="time">{{ line.time }}</span> <span class="bracket">&lt;</span><span class="nick">{{ line.nick }}</span><span class="bracket">&gt;</span> <span class="message">{{ line.message|safe }}</span><br />
         {% endfor %}
         </div>
     </body>