From 24b87badcef35a53477aec067ee61cc9dd97b2a5 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Thu, 25 Jan 2024 18:20:46 -0800 Subject: [PATCH 1/1] Move per-thread processing stuff into Thread --- glowfic.py | 21 ++++++++++++++++++++- paperdoorknob.py | 20 ++------------------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/glowfic.py b/glowfic.py index 9d863c8..ef71eef 100644 --- a/glowfic.py +++ b/glowfic.py @@ -9,7 +9,7 @@ from dataclasses import dataclass import itertools from urllib.parse import parse_qsl, urlencode, urljoin, urlparse, urlunparse -from typing import Iterable +from typing import Any, Iterable from bs4 import BeautifulSoup from bs4.element import Tag @@ -19,6 +19,10 @@ from spec import Spec from texify import Texifier +def ilen(it: Iterable[Any]) -> int: + return sum(1 for _ in it) + + def _removeViewFromURL(url: str) -> str: u = urlparse(url) old_qs = parse_qsl(u.query) @@ -73,6 +77,7 @@ class Thread: self._next_thread = find_next_thread( BeautifulSoup(spec.htmlfilter(html), 'html.parser')) self._dom = BeautifulSoup(spec.htmlfilter(flat_html), 'html.parser') + self._spec = spec def title(self) -> str | None: span = self._dom.findChild("span", id="post-title") @@ -98,6 +103,20 @@ class Thread: return itertools.chain([text()], the_replies()) + def emit(self) -> None: + self._spec.log('Counting chunks...\r') + num_chunks = ilen(self.chunkDOMs()) + title = self.title() or "chunk" + for i, r in enumerate(self.chunkDOMs()): + percent = 100.0 * i / num_chunks + self._spec.log( + f'Processing {title} {i} of {num_chunks} ({percent:.1f}%)\r') + self._spec.domfilter(r) + chunk = makeChunk(r, self._spec.images) + self._spec.texout.write( + self._spec.texfilter(renderChunk(self._spec.texifier, chunk))) + self._spec.log('') + def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk: diff --git a/paperdoorknob.py b/paperdoorknob.py index d545f61..ed7813b 100644 --- a/paperdoorknob.py +++ b/paperdoorknob.py @@ -4,17 +4,11 @@ # under the terms of the GNU General Public License as published by the # Free Software Foundation, version 3. -from typing import Any, Iterable - from args import spec_from_commandline_args -from glowfic import makeChunk, renderChunk, Thread +from glowfic import Thread from spec import Spec -def ilen(it: Iterable[Any]) -> int: - return sum(1 for _ in it) - - def process(spec: Spec) -> None: spec.texout.write(br'''\documentclass{article} \usepackage{booktabs} @@ -38,17 +32,7 @@ def process(spec: Spec) -> None: \detokenize{#1}\relax\else #2\fi} %s ''' % (spec.icon_size, spec.layout)) - thread = Thread(spec) - spec.log('Counting chunks...\r') - num_chunks = ilen(thread.chunkDOMs()) - title = thread.title() or "chunk" - for i, r in enumerate(thread.chunkDOMs()): - percent = 100.0 * i / num_chunks - spec.log(f'Processing {title} {i} of {num_chunks} ({percent:.1f}%)\r') - spec.domfilter(r) - chunk = makeChunk(r, spec.images) - spec.texout.write(spec.texfilter(renderChunk(spec.texifier, chunk))) - spec.log('') + Thread(spec).emit() spec.texout.write(b'\\end{document}\n') -- 2.44.1