cobweb-launcher 1.1.5__tar.gz → 1.1.9__tar.gz

{cobweb-launcher-1.1.5/cobweb_launcher.egg-info → cobweb-launcher-1.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 1.1.5
+Version: 1.1.9
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-1.1.5 → cobweb-launcher-1.1.9}/cobweb/crawlers/file_crawler.py

@@ -123,12 +123,14 @@ class FileCrawlerPro(Crawler):
                         item.seed, response, filter=True, msg=f"response content type is {content_type}",
                         bucket_name=bucket_name, data_size=content_length, **seed_dict
                     )
+                    response.close()
                 elif position == 1 and min_upload_size >= content_length > 0:
                     """过小文件标识返回"""
                     yield Response(
                         item.seed, response, filter=True, msg="file size is too small",
                         bucket_name=bucket_name, data_size=content_length, **seed_dict
                     )
+                    response.close()
                 elif position == 1 and chunk_size > content_length > min_upload_size:
                     """小文件直接下载"""
                     for part_data in response.iter_content(chunk_size):
@@ -153,12 +155,12 @@ class FileCrawlerPro(Crawler):
                             seed_dict['position'] = position
                             seed_dict['start'] = upload_content_length
 
-                    response.close()
                     if content:
                         oss_util.put_part(key, upload_id, position, content)
                         content_length += len(content)
                     oss_util.merge(key, upload_id)
                     yield Response(item.seed, response, bucket_name=bucket_name, data_size=content_length, **seed_dict)
+                    response.close()
 
             elif item.seed.params.identifier == "merge":
                 oss_util.merge(key, seed_dict["upload_id"])

{cobweb-launcher-1.1.5 → cobweb-launcher-1.1.9}/cobweb/launchers/launcher.py

@@ -34,7 +34,7 @@ class Launcher(threading.Thread):
         "_delete",
     ]
 
-    def __init__(self, task, project, custom_setting=None):
+    def __init__(self, task, project, custom_setting=None, **kwargs):
         super().__init__()
         self.task = task
         self.project = project
@@ -42,10 +42,11 @@ class Launcher(threading.Thread):
         self._stop = threading.Event()  # 结束事件
         self._pause = threading.Event()  # 暂停事件
 
+        _setting = dict()
+
         if custom_setting:
-            setting_ = dict()
             if isinstance(custom_setting, dict):
-                setting_ = custom_setting
+                _setting = custom_setting
             else:
                 if isinstance(custom_setting, str):
                     custom_setting = importlib.import_module(custom_setting)
@@ -53,9 +54,12 @@ class Launcher(threading.Thread):
                     raise Exception
                 for k, v in custom_setting.__dict__.items():
                     if not k.startswith("__") and not inspect.ismodule(v):
-                        setting_[k] = v
-            for k, v in setting_.items():
-                setattr(setting, k, v)
+                        _setting[k] = v
+
+        _setting.update(**kwargs)
+
+        for k, v in _setting.items():
+            setattr(setting, k, v)
 
         self._Crawler = dynamic_load_class(setting.CRAWLER)
         self._Pipeline = dynamic_load_class(setting.PIPELINE)

{cobweb-launcher-1.1.5 → cobweb-launcher-1.1.9}/cobweb/launchers/launcher_pro.py

@@ -9,8 +9,8 @@ from cobweb.constant import DealModel, LogTemplate
 
 class LauncherPro(Launcher):
 
-    def __init__(self, task, project, custom_setting=None):
-        super().__init__(task, project, custom_setting)
+    def __init__(self, task, project, custom_setting=None, **kwargs):
+        super().__init__(task, project, custom_setting, **kwargs)
         self._todo = "{%s:%s}:todo" % (project, task)
         self._done = "{%s:%s}:done" % (project, task)
         self._fail = "{%s:%s}:fail" % (project, task)
@@ -140,22 +140,23 @@ class LauncherPro(Launcher):
         while not self._stop.is_set():
             queue_not_empty_count = 0
             pooling_wait_seconds = 30
-            if not self._db.zcard(self._todo):
-                for q in self.__LAUNCHER_QUEUE__.values():
-                    if q.length != 0:
-                        queue_not_empty_count += 1
-                if self._pause.is_set():
-                    self._pause.clear()
-                    self._execute()
-                elif queue_not_empty_count == 0:
-                    pooling_wait_seconds = 3
-                    check_emtpy_times += 1
-                else:
-                    check_emtpy_times = 0
-                if check_emtpy_times > 2:
-                    check_emtpy_times = 0
-                    self.__DOING__ = {}
-                    self._pause.set()
+            for q in self.__LAUNCHER_QUEUE__.values():
+                if q.length != 0:
+                    queue_not_empty_count += 1
+            if self._pause.is_set():
+                self._pause.clear()
+                self._execute()
+            elif queue_not_empty_count == 0:
+                pooling_wait_seconds = 5
+                check_emtpy_times += 1
+            else:
+                check_emtpy_times = 0
+
+            if not self._db.zcount(self._todo, _min=0, _max="(1000") and check_emtpy_times > 2:
+                check_emtpy_times = 0
+                self.__DOING__ = {}
+                self._pause.set()
+
             if not self._pause.is_set():
                 logger.info(LogTemplate.launcher_pro_polling.format(
                     task=self.task,

{cobweb-launcher-1.1.5 → cobweb-launcher-1.1.9/cobweb_launcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 1.1.5
+Version: 1.1.9
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-1.1.5 → cobweb-launcher-1.1.9}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="cobweb-launcher",
-    version="1.1.5",
+    version="1.1.9",
     packages=find_packages(),
     url="https://github.com/Juannie-PP/cobweb",
     license="MIT",
@@ -22,4 +22,4 @@ setup(
         "cobweb-launcher, cobweb",
     ],
     python_requires=">=3.7",
-)
+)