Pi66

merodi
A markdown-based static site generator.
git clone https://git.pi66.xyz/merodi

← back to log

errors: extract term_error/web_error, remove duplicate

author: pi66
date: 2026-07-21 10:15
hash: 4453a8e0038624cf4d7acceca08b4005fa748cbc

Diffstat:

M

src/errors.py
15 ++++++++++++++++++++----------
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
diff --git a/src/errors.py b/src/errors.py
index 587a8d0..debf659 100644
--- a/src/errors.py
+++ b/src/errors.py
@@ -25,18 +25,16 @@ def get_error_line(exc: Exception):
         return None
     return frame.line.strip() if frame.line else None

-def fatal(exc: Exception, message: str):
+def term_error(exc: Exception, message: str):
     frame = get_user_frame(exc)
     if settings.VERBOSE and frame:
         print(f"{BLUE(frame.name + '()')} {GRAY('—')} {basename(frame.filename)}:{YELLOW(str(frame.lineno))}")
         print(f"{GRAY('│')}  {frame.line}\n")
-    die(message)
+    warn(message)

-def html_fatal(exc: Exception, message: str) -> str:
+def web_error(exc: Exception, message: str) -> str:
     frame = get_user_frame(exc)
     source_line = get_error_line(exc)
-    warn(escape(message))
-    warn(f"{type(exc).__name__}: {exc.message if hasattr(exc, 'message') else exc}")
     line = escape(source_line) if source_line else "<i style='color:#666'>line not available</i>"
     detail = escape(str(exc.message)) if hasattr(exc, 'message') else escape(str(exc))

@@ -68,3 +66,10 @@ def html_fatal(exc: Exception, message: str) -> str:
         </div>
     </body>
     </html>"""
+
+def fatal(exc: Exception, message: str):
+    term_error(exc, message)
+    die(message)
+
+def html_fatal(exc: Exception, message: str) -> str:
+    return web_error(exc, message)