cobweb-launcher 1.1.15__tar.gz → 1.1.17__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.

Potentially problematic release.


This version of cobweb-launcher might be problematic. Click here for more details.

Files changed (37) hide show
  1. {cobweb-launcher-1.1.15/cobweb_launcher.egg-info → cobweb-launcher-1.1.17}/PKG-INFO +1 -1
  2. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/base/seed.py +5 -1
  3. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/crawlers/base_crawler.py +1 -1
  4. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/launchers/launcher_pro.py +1 -1
  5. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/setting.py +1 -1
  6. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17/cobweb_launcher.egg-info}/PKG-INFO +1 -1
  7. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/setup.py +1 -1
  8. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/LICENSE +0 -0
  9. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/README.md +0 -0
  10. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/__init__.py +0 -0
  11. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/base/__init__.py +0 -0
  12. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/base/common_queue.py +0 -0
  13. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/base/decorators.py +0 -0
  14. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/base/item.py +0 -0
  15. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/base/log.py +0 -0
  16. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/base/request.py +0 -0
  17. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/base/response.py +0 -0
  18. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/constant.py +0 -0
  19. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/crawlers/__init__.py +0 -0
  20. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/crawlers/file_crawler.py +0 -0
  21. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/db/__init__.py +0 -0
  22. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/db/redis_db.py +0 -0
  23. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/exceptions/__init__.py +0 -0
  24. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/exceptions/oss_db_exception.py +0 -0
  25. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/launchers/__init__.py +0 -0
  26. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/launchers/launcher.py +0 -0
  27. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/pipelines/__init__.py +0 -0
  28. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/pipelines/base_pipeline.py +0 -0
  29. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/pipelines/loghub_pipeline.py +0 -0
  30. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/utils/__init__.py +0 -0
  31. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/utils/oss.py +0 -0
  32. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb/utils/tools.py +0 -0
  33. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb_launcher.egg-info/SOURCES.txt +0 -0
  34. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb_launcher.egg-info/dependency_links.txt +0 -0
  35. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb_launcher.egg-info/requires.txt +0 -0
  36. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/cobweb_launcher.egg-info/top_level.txt +0 -0
  37. {cobweb-launcher-1.1.15 → cobweb-launcher-1.1.17}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cobweb-launcher
3
- Version: 1.1.15
3
+ Version: 1.1.17
4
4
  Summary: spider_hole
5
5
  Home-page: https://github.com/Juannie-PP/cobweb
6
6
  Author: Juannie-PP
@@ -5,10 +5,11 @@ import hashlib
5
5
 
6
6
  class SeedParams:
7
7
 
8
- def __init__(self, retry, priority, seed_version):
8
+ def __init__(self, retry, priority, seed_version, seed_status=None):
9
9
  self.retry = retry or 0
10
10
  self.priority = priority or 300
11
11
  self.seed_version = seed_version or int(time.time())
12
+ self.seed_status = seed_status
12
13
 
13
14
 
14
15
  class Seed:
@@ -17,6 +18,7 @@ class Seed:
17
18
  "retry",
18
19
  "priority",
19
20
  "seed_version",
21
+ "seed_status"
20
22
  ]
21
23
 
22
24
  def __init__(
@@ -26,6 +28,7 @@ class Seed:
26
28
  retry=None,
27
29
  priority=None,
28
30
  seed_version=None,
31
+ seed_status=None,
29
32
  **kwargs
30
33
  ):
31
34
  if any(isinstance(seed, t) for t in (str, bytes)):
@@ -47,6 +50,7 @@ class Seed:
47
50
  "retry": retry,
48
51
  "priority": priority,
49
52
  "seed_version": seed_version,
53
+ "seed_status": seed_status,
50
54
  }
51
55
 
52
56
  if kwargs:
@@ -56,7 +56,7 @@ class Crawler(threading.Thread):
56
56
  elif isinstance(item, str) and item == DealModel.done:
57
57
  self.launcher_queue['done'].push(seed)
58
58
  elif isinstance(item, str) and item == DealModel.fail:
59
- seed.identifier = DealModel.fail
59
+ seed.params.seed_status = DealModel.fail
60
60
  self.launcher_queue['done'].push(seed)
61
61
  else:
62
62
  raise TypeError("yield value type error!")
@@ -117,7 +117,7 @@ class LauncherPro(Launcher):
117
117
  seed = self.__LAUNCHER_QUEUE__['done'].pop()
118
118
  if not seed:
119
119
  break
120
- if seed.identifier == DealModel.fail:
120
+ if seed.params.seed_status == DealModel.fail:
121
121
  f_seeds.append(seed.to_string)
122
122
  elif self._done_model == 1:
123
123
  s_seeds.append(seed.to_string)
@@ -60,4 +60,4 @@ SPIDER_THREAD_NUM = 10
60
60
  SPIDER_MAX_RETRIES = 5
61
61
 
62
62
  # 文件下载响应类型过滤
63
- FILE_FILTER_CONTENT_TYPE = ["text/html", "application/xhtml+xml"]
63
+ FILE_FILTER_CONTENT_TYPE = ["text/html", "application/xhtml+xml"]
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cobweb-launcher
3
- Version: 1.1.15
3
+ Version: 1.1.17
4
4
  Summary: spider_hole
5
5
  Home-page: https://github.com/Juannie-PP/cobweb
6
6
  Author: Juannie-PP
@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
5
5
 
6
6
  setup(
7
7
  name="cobweb-launcher",
8
- version="1.1.15",
8
+ version="1.1.17",
9
9
  packages=find_packages(),
10
10
  url="https://github.com/Juannie-PP/cobweb",
11
11
  license="MIT",