lacuscore 1.7.6__tar.gz → 1.7.7__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {lacuscore-1.7.6 → lacuscore-1.7.7}/PKG-INFO +2 -2
- {lacuscore-1.7.6 → lacuscore-1.7.7}/lacuscore/lacuscore.py +5 -5
- {lacuscore-1.7.6 → lacuscore-1.7.7}/pyproject.toml +5 -4
- {lacuscore-1.7.6 → lacuscore-1.7.7}/LICENSE +0 -0
- {lacuscore-1.7.6 → lacuscore-1.7.7}/README.md +0 -0
- {lacuscore-1.7.6 → lacuscore-1.7.7}/lacuscore/__init__.py +0 -0
- {lacuscore-1.7.6 → lacuscore-1.7.7}/lacuscore/lacus_monitoring.py +0 -0
- {lacuscore-1.7.6 → lacuscore-1.7.7}/lacuscore/py.typed +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: lacuscore
|
|
3
|
-
Version: 1.7.
|
|
3
|
+
Version: 1.7.7
|
|
4
4
|
Summary: Core of Lacus, usable as a module
|
|
5
5
|
Home-page: https://github.com/ail-project/LacusCore
|
|
6
6
|
License: BSD-3-Clause
|
|
@@ -26,7 +26,7 @@ Provides-Extra: docs
|
|
|
26
26
|
Requires-Dist: Sphinx (<7.2) ; (python_version < "3.9") and (extra == "docs")
|
|
27
27
|
Requires-Dist: Sphinx (>=7.2,<8.0) ; (python_version >= "3.9") and (extra == "docs")
|
|
28
28
|
Requires-Dist: defang (>=0.5.3,<0.6.0)
|
|
29
|
-
Requires-Dist: playwrightcapture[recaptcha] (>=1.22.
|
|
29
|
+
Requires-Dist: playwrightcapture[recaptcha] (>=1.22.5,<2.0.0)
|
|
30
30
|
Requires-Dist: redis[hiredis] (>=5.0.1,<6.0.0)
|
|
31
31
|
Requires-Dist: requests (>=2.31.0,<3.0.0)
|
|
32
32
|
Requires-Dist: ua-parser (>=0.18.0,<0.19.0)
|
|
@@ -795,11 +795,11 @@ class LacusCore():
|
|
|
795
795
|
capture_status = self.get_capture_status(uuid)
|
|
796
796
|
if capture_status == CaptureStatus.ONGOING:
|
|
797
797
|
# Check when it was started.
|
|
798
|
-
start_time
|
|
799
|
-
|
|
800
|
-
|
|
801
|
-
|
|
802
|
-
|
|
798
|
+
if start_time := self.redis.zscore('lacus:ongoing', uuid):
|
|
799
|
+
if start_time > time.time() - self.max_capture_time * 1.1:
|
|
800
|
+
# The capture started recently, wait before clearing it.
|
|
801
|
+
logger.warning('The capture is (probably) still going, not clearing.')
|
|
802
|
+
return
|
|
803
803
|
elif capture_status == CaptureStatus.QUEUED:
|
|
804
804
|
logger.warning('The capture is queued, not clearing.')
|
|
805
805
|
return
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[tool.poetry]
|
|
2
2
|
name = "lacuscore"
|
|
3
|
-
version = "1.7.
|
|
3
|
+
version = "1.7.7"
|
|
4
4
|
description = "Core of Lacus, usable as a module"
|
|
5
5
|
authors = ["Raphaël Vinot <raphael.vinot@circl.lu>"]
|
|
6
6
|
license = "BSD-3-Clause"
|
|
@@ -33,7 +33,7 @@ Sphinx = [
|
|
|
33
33
|
{version = "<7.2", python = "<3.9", optional = true},
|
|
34
34
|
{version = "^7.2", python = ">=3.9", optional = true}
|
|
35
35
|
]
|
|
36
|
-
playwrightcapture = {extras = ["recaptcha"], version = "^1.22.
|
|
36
|
+
playwrightcapture = {extras = ["recaptcha"], version = "^1.22.5"}
|
|
37
37
|
defang = "^0.5.3"
|
|
38
38
|
ua-parser = "^0.18.0"
|
|
39
39
|
redis = {version = "^5.0.1", extras = ["hiredis"]}
|
|
@@ -43,12 +43,13 @@ docs = ["Sphinx"]
|
|
|
43
43
|
|
|
44
44
|
[tool.poetry.group.dev.dependencies]
|
|
45
45
|
types-redis = {version = "^4.6.0.11"}
|
|
46
|
-
mypy = "^1.
|
|
46
|
+
mypy = "^1.8.0"
|
|
47
47
|
types-requests = "^2.31.0.10"
|
|
48
48
|
types-beautifulsoup4 = "^4.12.0.7"
|
|
49
49
|
ipython = [
|
|
50
50
|
{version = "<8.13.0", python = "<3.9"},
|
|
51
|
-
{version = "^8.
|
|
51
|
+
{version = "^8.18.0", python = ">=3.9"},
|
|
52
|
+
{version = "^8.19.0", python = ">=3.10"}
|
|
52
53
|
]
|
|
53
54
|
pytest = "^7.4.3"
|
|
54
55
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|