X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/70adfbff16123a62d6b25f8ead23789d831d1d70..53f396b459889b46e6feea48e8fa8e89b2452e9f:/glowfic.py diff --git a/glowfic.py b/glowfic.py index 8029b5d..81a5342 100644 --- a/glowfic.py +++ b/glowfic.py @@ -57,15 +57,22 @@ class Chunk: class Thread: - def __init__(self, thing: BeautifulSoup | Spec) -> None: - if isinstance(thing, Spec): - spec = thing - spec.log('Fetching HTML...\r') - html = spec.fetcher.fetch(flatURL(spec.url)) - spec.log('Parsing HTML...\r') - self._dom = BeautifulSoup(spec.htmlfilter(html), 'html.parser') - else: - self._dom = thing + def __init__(self, spec: Spec) -> None: + def find_next_thread(dom: BeautifulSoup) -> str | None: + for c in dom.findChildren('div', class_='post-navheader'): + for a in c.findChildren('a'): + if 'Next Post' in a.text and 'href' in a.attrs and isinstance( + a.attrs['href'], str): + return a.attrs['href'] + return None + + spec.log('Fetching HTML...\r') + html = spec.fetcher.fetch(spec.url) + flat_html = spec.fetcher.fetch(flatURL(spec.url)) + spec.log('Parsing HTML...\r') + self._next_thread = find_next_thread( + BeautifulSoup(spec.htmlfilter(html), 'html.parser')) + self._dom = BeautifulSoup(spec.htmlfilter(flat_html), 'html.parser') def title(self) -> str | None: span = self._dom.findChild("span", id="post-title") @@ -73,6 +80,9 @@ class Thread: return None return span.text.strip() + def next_thread(self) -> str | None: + return self._next_thread + def chunkDOMs(self) -> Iterable[Tag]: def text() -> Tag: body = self._dom.body