image filenames: Drop ? and following query parameters

[paperdoorknob] / spec.py

diff --git a/spec.py b/spec.py
index 98832bfddfed9978ea67e14edca2b5900d5bc56d..34e2e6b3593bf34a7ec773c20ac6a08de67d8797 100644 (file)
--- a/spec.py
+++ b/spec.py
@@ -9,14 +9,21 @@ from dataclasses import dataclass
 
 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]
-    texifier: Texifier
+    domfilter: Callable[[Tag], None]
+    layout: Layout
+    geometry: str | None
     texout: IO[bytes]