fix: timeout option not being honored

Fixes #30.
adrienbrignon · Jul 23, 2024 · b45c531 · b45c531
1 parent 53c84e7
commit b45c531
Show file tree

Hide file tree

Showing 5 changed files with 123 additions and 99 deletions.
diff --git a/mkdocs_exporter/formats/pdf/aggregator.py b/mkdocs_exporter/formats/pdf/aggregator.py
@@ -68,7 +68,7 @@ def preprocess(self, page: Page) -> str:
 
     preprocessor.teleport()
     preprocessor.metadata({
-      'page': sum(page.formats['pdf']['pages'] - page.formats['pdf']['skipped_pages'] for page in self.pages[:page.index]),
+      'page': sum(page.formats['pdf']['pages'] - page.formats['pdf']['skipped_pages'] for page in self.pages[:page.index]) + 1,
       'pages': sum(page.formats['pdf']['pages'] - page.formats['pdf']['skipped_pages'] for page in self.pages),
     })
 
@@ -103,6 +103,7 @@ def _skip(self, page: Page, covers: list[str]) -> Aggregator:
     for cover in covers:
       if cover in page.formats['pdf']['covers']:
         page.formats['pdf']['covers'].remove(cover)
+
         page.formats['pdf']['skipped_pages'] = page.formats['pdf']['skipped_pages'] + 1
 
     return self
diff --git a/mkdocs_exporter/formats/pdf/browser.py b/mkdocs_exporter/formats/pdf/browser.py
@@ -96,10 +96,10 @@ async def print(self, html: str) -> tuple[bytes, int]:
     file.write(html)
     file.close()
 
-    await context.goto('file://' + file.name, wait_until='networkidle')
+    await context.goto('file://' + file.name, wait_until='networkidle', timeout=self.timeout)
     await context.locator('body[mkdocs-exporter="true"]').wait_for(timeout=self.timeout)
 
-    pages = int(await context.locator('body').get_attribute('mkdocs-exporter-pages') or 0)
+    pages = int(await context.locator('body').get_attribute('mkdocs-exporter-pages', timeout=self.timeout) or 0)
     pdf = await context.pdf(prefer_css_page_size=True, print_background=True, display_header_footer=False)
 
     await context.close()

diff --git a/mkdocs_exporter/formats/pdf/resources/js/pdf.js b/mkdocs_exporter/formats/pdf/resources/js/pdf.js
@@ -36,7 +36,7 @@ window.PagedConfig = {
         }
 
         if ('page' in __MKDOCS_EXPORTER__ && pages.children[0]) {
-          pages.children[0].style.setProperty('counter-reset', `page ${__MKDOCS_EXPORTER__.page}`);
+          pages.children[0].style.setProperty('counter-set', `page ${__MKDOCS_EXPORTER__.page}`);
         }
       }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ window.PagedConfig = { @@
             }
             if ('page' in __MKDOCS_EXPORTER__ && pages.children[0]) {
-              pages.children[0].style.setProperty('counter-reset', `page ${__MKDOCS_EXPORTER__.page}`);
+              pages.children[0].style.setProperty('counter-set', `page ${__MKDOCS_EXPORTER__.page}`);
             }
           }
         }
@@ Expand Down @@