From 6f430a74788227e683316633d93b2f8c1612ec92 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Thu, 25 Jan 2024 23:27:15 -0800 Subject: [PATCH 1/1] =?utf8?q?Follow=20'Next=20Thread=20=E2=86=92'=20links?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- glowfic.py | 7 +++++-- glowfic_test.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/glowfic.py b/glowfic.py index ef71eef..94fbd34 100644 --- a/glowfic.py +++ b/glowfic.py @@ -5,7 +5,7 @@ # Free Software Foundation, version 3. -from dataclasses import dataclass +import dataclasses import itertools from urllib.parse import parse_qsl, urlencode, urljoin, urlparse, urlunparse @@ -40,7 +40,7 @@ def flatURL(url: str) -> str: return urlunparse(u._replace(query=urlencode(qs))) -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True) class Chunk: icon: str | None character: Tag | None @@ -116,6 +116,9 @@ class Thread: self._spec.texout.write( self._spec.texfilter(renderChunk(self._spec.texifier, chunk))) self._spec.log('') + next_url = self.next_thread() + if next_url is not None: + Thread(dataclasses.replace(self._spec, url=next_url)).emit() def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk: diff --git a/glowfic_test.py b/glowfic_test.py index befd0b5..d3fb2dd 100644 --- a/glowfic_test.py +++ b/glowfic_test.py @@ -4,6 +4,7 @@ # under the terms of the GNU General Public License as published by the # Free Software Foundation, version 3. +import dataclasses from io import BytesIO from sys import stderr import unittest @@ -164,6 +165,36 @@ class TestEmit(unittest.TestCase): \glowhead{}{}{}{}B ''') + def testEmitTwoThreads(self) -> None: + buf = BytesIO() + spec = dataclasses.replace(spec_for_testing(b'', buf), fetcher=FakeFetcher({ + 'https://fake/test': b''' +
+
Next Post »
 +
''', + 'https://fake/test?view=flat': b''' +
A
+
+
B
+
+ ''', + 'https://fake/page2': b'''''', + 'https://fake/page2?view=flat': b''' +
C
+
+
D
+
E
+
+ ''', + })) + Thread(spec).emit() + self.assertEqual(buf.getvalue(), rb'''\glowhead{}{}{}{}A +\glowhead{}{}{}{}B +\glowhead{}{}{}{}C +\glowhead{}{}{}{}D +\glowhead{}{}{}{}E +''') + if __name__ == '__main__': unittest.main() -- 2.44.1