lacuscore 1.7.6__py3-none-any.whl → 1.7.8__py3-none-any.whl

lacuscore/lacuscore.py

@@ -721,6 +721,9 @@ class LacusCore():
             hash_to_set['cookies'] = pickle.dumps(results['cookies'])
         if results.get('potential_favicons'):
             hash_to_set['potential_favicons'] = pickle.dumps(results['potential_favicons'])
+        if results.get('html') and results['html'] is not None:
+            # Need to avoid unicode encore errors, and surrogates are not allowed
+            hash_to_set['html'] = results['html'].encode('utf-8', 'surrogateescape')
         if 'children' in results and results['children'] is not None:
             padding_length = len(str(len(results['children'])))
             children = set()
@@ -735,7 +738,7 @@ class LacusCore():
             hash_to_set['children'] = pickle.dumps(children)
 
         for key in results.keys():
-            if key in ['har', 'cookies', 'potential_favicons', 'children'] or not results.get(key):
+            if key in ['har', 'cookies', 'potential_favicons', 'html', 'children'] or not results.get(key):
                 continue
             # these entries can be stored directly
             hash_to_set[key] = results[key]  # type: ignore
@@ -795,11 +798,11 @@ class LacusCore():
         capture_status = self.get_capture_status(uuid)
         if capture_status == CaptureStatus.ONGOING:
             # Check when it was started.
-            start_time = self.redis.zscore('lacus:ongoing', uuid)
-            if start_time > time.time() - self.max_capture_time * 1.1:
-                # The capture started recently, wait before clearing it.
-                logger.warning('The capture is (probably) still going, not clearing.')
-                return
+            if start_time := self.redis.zscore('lacus:ongoing', uuid):
+                if start_time > time.time() - self.max_capture_time * 1.1:
+                    # The capture started recently, wait before clearing it.
+                    logger.warning('The capture is (probably) still going, not clearing.')
+                    return
         elif capture_status == CaptureStatus.QUEUED:
             logger.warning('The capture is queued, not clearing.')
             return

{lacuscore-1.7.6.dist-info → lacuscore-1.7.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lacuscore
-Version: 1.7.6
+Version: 1.7.8
 Summary: Core of Lacus, usable as a module
 Home-page: https://github.com/ail-project/LacusCore
 License: BSD-3-Clause
@@ -26,7 +26,7 @@ Provides-Extra: docs
 Requires-Dist: Sphinx (<7.2) ; (python_version < "3.9") and (extra == "docs")
 Requires-Dist: Sphinx (>=7.2,<8.0) ; (python_version >= "3.9") and (extra == "docs")
 Requires-Dist: defang (>=0.5.3,<0.6.0)
-Requires-Dist: playwrightcapture[recaptcha] (>=1.22.4,<2.0.0)
+Requires-Dist: playwrightcapture[recaptcha] (>=1.22.5,<2.0.0)
 Requires-Dist: redis[hiredis] (>=5.0.1,<6.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: ua-parser (>=0.18.0,<0.19.0)

lacuscore-1.7.8.dist-info/RECORD

@@ -0,0 +1,8 @@
+lacuscore/__init__.py,sha256=ytBrQRBXO1Q5yV72qyS16Q7Auqebl3EMhhLQUa0Sg4g,169
+lacuscore/lacus_monitoring.py,sha256=3kbjz_ONjOXzaLzc8Vp7bUmEDKQDMi2uQgVSSfpqdXQ,2732
+lacuscore/lacuscore.py,sha256=yZ6YfhpiGMjil_Gl7FsFOwrK6924RklBscVSyGvC3RM,39926
+lacuscore/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lacuscore-1.7.8.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
+lacuscore-1.7.8.dist-info/METADATA,sha256=zW_QO9qtsDIN4lVw_lU4cL1cHOgtq5lUDpPGtAo1btk,2514
+lacuscore-1.7.8.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+lacuscore-1.7.8.dist-info/RECORD,,

lacuscore-1.7.6.dist-info/RECORD

@@ -1,8 +0,0 @@
-lacuscore/__init__.py,sha256=ytBrQRBXO1Q5yV72qyS16Q7Auqebl3EMhhLQUa0Sg4g,169
-lacuscore/lacus_monitoring.py,sha256=3kbjz_ONjOXzaLzc8Vp7bUmEDKQDMi2uQgVSSfpqdXQ,2732
-lacuscore/lacuscore.py,sha256=AIJBPDSEWL4tcMoHHuTiBxc98Hxv5NDq3siMSX2Ylzc,39666
-lacuscore/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lacuscore-1.7.6.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
-lacuscore-1.7.6.dist-info/METADATA,sha256=qhd6JXfgqtJqN8pgHkYmttMHtlLGVYWulOS0lLITCFU,2514
-lacuscore-1.7.6.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-lacuscore-1.7.6.dist-info/RECORD,,