Progress messages for fetch and parse

[paperdoorknob] / glowfic.py

diff --git a/glowfic.py b/glowfic.py
index 76a9a840738259f4f925bf68ece537d794872711..573050872d3d3d3ef6e5647c02dcb4f238e65e21 100644 (file)
--- a/glowfic.py
+++ b/glowfic.py
@@ -8,6 +8,7 @@
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 import itertools
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 import itertools

+from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse

 
 from typing import Iterable
 
 
 from typing import Iterable
 


@@ -18,6 +19,23 @@ from images import ImageStore
 from texify import Texifier
 
 
 from texify import Texifier
 
 

+def _removeViewFromURL(url: str) -> str:
+    u = urlparse(url)
+    old_qs = parse_qsl(u.query)
+    new_qs = [(k, v) for k, v in old_qs if k != 'view']
+    return urlunparse(u._replace(query=urlencode(new_qs)))
+
+
+def nonFlatURL(url: str) -> str:
+    return _removeViewFromURL(url)
+
+
+def flatURL(url: str) -> str:
+    u = urlparse(_removeViewFromURL(url))
+    qs = parse_qsl(u.query) + [('view', 'flat')]
+    return urlunparse(u._replace(query=urlencode(qs)))
+
+

 @dataclass(frozen=True)
 class Chunk:
     icon: str | None
 @dataclass(frozen=True)
 class Chunk:
     icon: str | None


@@ -136,7 +154,42 @@ class BelowIconLayout(Layout):
 
 \\strut
 
 
 \\strut
 

+\\noindent %s
+''' % (
+            b'\\\\*'.join(x.encode('UTF-8') for x in meta if x is not None),
+            self._texifier.texify(chunk.content))
+
+
+class BesideIconLayout(Layout):
+
+    def __init__(self, texifier: Texifier, image_size: float) -> None:
+        self._texifier = texifier
+        self._image_size = image_size
+
+    def renderChunk(self, chunk: Chunk) -> bytes:
+        icon = renderIcon(chunk.icon, self._image_size)
+        meta = [
+            chunk.character,
+            chunk.screen_name,
+            chunk.author,
+        ]
+
+        # Why is \textwidth not the width of the text?
+        # Why is the width of the text .765\textwidth?
+        return b'''\\noindent\\fbox{

 %s
 %s

+\\parbox[b]{.765\\textwidth}{
+\\begin{center}
+%s
+\\end{center}
+}
+}\\\\*
+\\vspace{-0.75em}\\\\*
+\\noindent %s
+
+\\strut
+

 ''' % (
 ''' % (

+            icon.encode('UTF-8') if icon else b'',

             b'\\\\*'.join(x.encode('UTF-8') for x in meta if x is not None),
             self._texifier.texify(chunk.content))
             b'\\\\*'.join(x.encode('UTF-8') for x in meta if x is not None),
             self._texifier.texify(chunk.content))