PlaywrightCapture 1.25.5__py3-none-any.whl → 1.25.7__py3-none-any.whl

playwrightcapture/capture.py

@@ -339,19 +339,10 @@ class Capture():
         return self._headers
 
     @headers.setter
-    def headers(self, headers: str | dict[str, str] | None) -> None:
+    def headers(self, headers: dict[str, str] | None) -> None:
         if not headers:
             return
-        if isinstance(headers, str):
-            new_headers: dict[str, str] = {}
-            for header_line in headers.splitlines():
-                if header_line and ':' in header_line:
-                    splitted = header_line.split(':', 1)
-                    if splitted and len(splitted) == 2:
-                        header, h_value = splitted
-                        if header.strip() and h_value.strip():
-                            new_headers[header.strip()] = h_value.strip()
-        elif isinstance(headers, dict):
+        if isinstance(headers, dict):
             # Check if they are valid
             new_headers = {name.strip(): value.strip() for name, value in headers.items() if isinstance(name, str) and isinstance(value, str) and name.strip() and value.strip()}
             if new_headers != headers:
@@ -413,17 +404,24 @@ class Capture():
         device_context_settings = {}
         if self.device_name:
             device_context_settings = self.playwright.devices[self.device_name]
+            # We need to make sure the device_context_settings dict doesn't contains
+            # keys that are set by default in the context creation
+            if context_ua := device_context_settings.pop('user_agent', None):
+                ua = self.user_agent if self.user_agent else context_ua
+            if context_vp := device_context_settings.pop('viewport', self._default_viewport):
+                # Always true, but we also always want to pop it.
+                vp = self.viewport if self.viewport else context_vp
 
         self.context = await self.browser.new_context(
             record_har_path=self._temp_harfile.name,
             ignore_https_errors=True,
             bypass_csp=True,
             http_credentials=self.http_credentials if self.http_credentials else None,
-            user_agent=self.user_agent if self.user_agent else device_context_settings.pop('user_agent', None),
+            user_agent=ua,
             locale=self.locale if self.locale else None,
             timezone_id=self.timezone_id if self.timezone_id else None,
             color_scheme=self.color_scheme if self.color_scheme else None,
-            viewport=self.viewport if self.viewport else device_context_settings.pop('viewport', self._default_viewport),
+            viewport=vp,
             # For debug only
             # record_video_dir='./videos/',
             **device_context_settings
@@ -1096,7 +1094,7 @@ class Capture():
             try:
                 async with timeout(30):
                     return await page.content()
-            except (Error, TimeoutError):
+            except (Error, TimeoutError, asyncio.TimeoutError):
                 self.logger.debug('Unable to get page content, trying again.')
                 tries -= 1
                 await self._wait_for_random_timeout(page, 1)

{playwrightcapture-1.25.5.dist-info → playwrightcapture-1.25.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PlaywrightCapture
-Version: 1.25.5
+Version: 1.25.7
 Summary: A simple library to capture websites using playwright
 Home-page: https://github.com/Lookyloo/PlaywrightCapture
 License: BSD-3-Clause
@@ -31,7 +31,7 @@ Requires-Dist: playwright-stealth (>=1.0.6,<2.0.0)
 Requires-Dist: puremagic (>=1.26,<2.0)
 Requires-Dist: pydub (>=0.25.1,<0.26.0) ; extra == "recaptcha"
 Requires-Dist: pytz (>=2024.1,<2025.0) ; python_version < "3.9"
-Requires-Dist: setuptools (>=70.3.0,<71.0.0)
+Requires-Dist: setuptools (>=71.1.0,<72.0.0)
 Requires-Dist: tzdata (>=2024.1,<2025.0)
 Requires-Dist: w3lib (>=2.2.1,<3.0.0)
 Project-URL: Repository, https://github.com/Lookyloo/PlaywrightCapture

{playwrightcapture-1.25.5.dist-info → playwrightcapture-1.25.7.dist-info}/RECORD

@@ -1,9 +1,9 @@
 playwrightcapture/__init__.py,sha256=F90Y8wYS13tDjgsfjuFrCfmzQfdnH44G-ovuilJfLEE,511
-playwrightcapture/capture.py,sha256=rPzmotG1_o-SS0I6oJbMPnVoVweSS_BQ-zUdDaInEsg,70897
+playwrightcapture/capture.py,sha256=iB0hw4402_XrO14A4sblQdB5hVK1NZ-n7D_VkD7Y0hs,70768
 playwrightcapture/exceptions.py,sha256=LhGJQCGHzEu7Sx2Dfl28OFeDg1OmrwufFjAWXlxQnEA,366
 playwrightcapture/helpers.py,sha256=SXQLEuxMs8-bcWykMiUVosHzzxBKuS-QC0gBV3OmKmo,1764
 playwrightcapture/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-playwrightcapture-1.25.5.dist-info/LICENSE,sha256=uwFc39fTLacBUG-XTuxX6IQKTKhg4z14gWOLt3ex4Ho,1775
-playwrightcapture-1.25.5.dist-info/METADATA,sha256=KfTBTvcCfRoKhAZVGUXjoYfXODyrBFc0iWjTZeWwZ-I,3173
-playwrightcapture-1.25.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-playwrightcapture-1.25.5.dist-info/RECORD,,
+playwrightcapture-1.25.7.dist-info/LICENSE,sha256=uwFc39fTLacBUG-XTuxX6IQKTKhg4z14gWOLt3ex4Ho,1775
+playwrightcapture-1.25.7.dist-info/METADATA,sha256=h0djpVBPhsTTxH2Hm1kV6AkGMPfVwEHA2lcgtoWEx7M,3173
+playwrightcapture-1.25.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+playwrightcapture-1.25.7.dist-info/RECORD,,