Fix flaky test: Increment request count before responding

[paperdoorknob] / glowfic.py

diff --git a/glowfic.py b/glowfic.py
index 0eab425d863dadb8669468af9ebc49a87527f19b..a4f3ca9b2e24eb5707c86cd3b03d1dc64db83bb6 100644 (file)
--- a/glowfic.py
+++ b/glowfic.py
@@ -81,9 +81,9 @@ def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk:
                  content)
 
 
                  content)
 
 

-def renderIcon(icon_path: str | None) -> bytes:
-    return b'\\includegraphics{%s}' % icon_path.encode(
-        'UTF-8') if icon_path else b''
+def renderIcon(icon_path: str | None, image_size: float) -> bytes:
+    return b'\\includegraphics[width=%fmm,height=%fmm,keepaspectratio]{%s}' % (
+        image_size, image_size, icon_path.encode('UTF-8')) if icon_path else b''

 
 
 class Layout(ABC):
 
 
 class Layout(ABC):


@@ -104,21 +104,27 @@ class ContentOnlyLayout(Layout):
 
 class BelowIconLayout(Layout):
 
 
 class BelowIconLayout(Layout):
 

-    def __init__(self, texifier: Texifier) -> None:
+    def __init__(self, texifier: Texifier, image_size: float) -> None:

         self._texifier = texifier
         self._texifier = texifier

+        self._image_size = image_size

 
     def renderChunk(self, chunk: Chunk) -> bytes:
         icon_width = b'0.25\\textwidth'  # TODO: Make this configurable
         return b'''\\begin{wrapfigure}{l}{%s}
 %s
 
     def renderChunk(self, chunk: Chunk) -> bytes:
         icon_width = b'0.25\\textwidth'  # TODO: Make this configurable
         return b'''\\begin{wrapfigure}{l}{%s}
 %s

+

 %s
 %s

+

 %s
 %s

+

 %s
 \\end{wrapfigure}
 %s
 \\end{wrapfigure}

+

 %s
 %s

+

 ''' % (
             icon_width,
 ''' % (
             icon_width,

-            renderIcon(chunk.icon),
+            renderIcon(chunk.icon, self._image_size),

             chunk.character.encode('UTF-8') if chunk.character else b'',
             chunk.screen_name.encode('UTF-8') if chunk.screen_name else b'',
             chunk.author.encode('UTF-8') if chunk.author else b'',
             chunk.character.encode('UTF-8') if chunk.character else b'',
             chunk.screen_name.encode('UTF-8') if chunk.screen_name else b'',
             chunk.author.encode('UTF-8') if chunk.author else b'',