Support _ in URLs

[paperdoorknob] / spec.py

diff --git a/spec.py b/spec.py
index 75d00c36f2040557d498eded29fde11dea2ea4e2..2eccbb5562fd359c2148f0039d8e637f9d10474d 100644 (file)
--- a/spec.py
+++ b/spec.py
@@ -12,14 +12,20 @@ from typing import Callable, IO
 from bs4.element import Tag
 
 from fetch import Fetcher
-from texify import Texifier
+from glowfic import Layout
+from images import ImageStore
 
 
+# pylint: disable=too-many-instance-attributes
 @dataclass(frozen=True)
 class Spec:
     url: str
     fetcher: Fetcher
+    images: ImageStore
     htmlfilter: Callable[[bytes], bytes]
     domfilter: Callable[[Tag], None]
-    texifier: Texifier
+    texfilter: Callable[[bytes], bytes]
+    layout: Layout
+    geometry: str | None
     texout: IO[bytes]
+    log: Callable[[str], None]