Fix flaky test: Increment request count before responding

[paperdoorknob] / args.py

diff --git a/args.py b/args.py
index f343a84a71d2ef0a2394ec71c84d7e1c932cbd3a..e952c45040c77f503e7ec8cd2990540b87f3dbd0 100644 (file)
--- a/args.py
+++ b/args.py
@@ -15,7 +15,9 @@ from xdg_base_dirs import xdg_cache_home
 
 from domfilter import ApplyDOMFilters, DOMFilters
 from fetch import CachingFetcher
 
 from domfilter import ApplyDOMFilters, DOMFilters
 from fetch import CachingFetcher

+from glowfic import BelowIconLayout

 from htmlfilter import ApplyHTMLFilters, HTMLFilters
 from htmlfilter import ApplyHTMLFilters, HTMLFilters

+from images import DiskImageStore

 from spec import Spec
 from texify import PandocTexifier
 
 from spec import Spec
 from texify import PandocTexifier
 


@@ -42,6 +44,10 @@ See https://faculty.bard.edu/bloch/geometry.pdf for details
         '--htmlfilters',
         help='Which HTML filters to use (default: %(default)s)',
         default=','.join(f[0] for f in HTMLFilters))
         '--htmlfilters',
         help='Which HTML filters to use (default: %(default)s)',
         default=','.join(f[0] for f in HTMLFilters))

+    parser.add_argument(
+        '--image_size',
+        help='How large the icon images are, in mm',
+        default=20)

     parser.add_argument(
         '--out',
         help='The filename stem at which to write output ' +
     parser.add_argument(
         '--out',
         help='The filename stem at which to write output ' +


@@ -61,13 +67,15 @@ See https://faculty.bard.edu/bloch/geometry.pdf for details
 @contextmanager
 def spec_from_commandline_args() -> Iterator[Spec]:
     args = _command_line_parser().parse_args()
 @contextmanager
 def spec_from_commandline_args() -> Iterator[Spec]:
     args = _command_line_parser().parse_args()

+    texifier = PandocTexifier(args.pandoc or 'pandoc')

     with CachingFetcher(args.cache_path, args.timeout) as fetcher:
         with open(args.out + '.tex', 'wb') as texout:
             yield Spec(
                 args.url,
                 fetcher,
     with CachingFetcher(args.cache_path, args.timeout) as fetcher:
         with open(args.out + '.tex', 'wb') as texout:
             yield Spec(
                 args.url,
                 fetcher,

+                DiskImageStore(args.out + '_images', fetcher),

                 lambda x: ApplyHTMLFilters(args.htmlfilters, x),
                 lambda x: ApplyDOMFilters(args.domfilters, x),
                 lambda x: ApplyHTMLFilters(args.htmlfilters, x),
                 lambda x: ApplyDOMFilters(args.domfilters, x),

-                PandocTexifier(args.pandoc or 'pandoc'),
+                BelowIconLayout(texifier, args.image_size),

                 args.geometry,
                 texout)
                 args.geometry,
                 texout)