cobweb-launcher 3.1.15__tar.gz → 3.1.17__tar.gz

{cobweb-launcher-3.1.15 → cobweb-launcher-3.1.17}/PKG-INFO

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

{cobweb-launcher-3.1.15 → cobweb-launcher-3.1.17}/cobweb/schedulers/scheduler.py

@@ -65,12 +65,16 @@ class Scheduler(ABC, threading.Thread):
         with self.lock:
             return self.__WORKING_ITEMS__.copy()
 
-    def remove_working_items(self, items: list[str] = None):
+    def remove_working_items(self, items: list[str] = None) -> int:
         if not items:
-            return
+            return 0
         with self.lock:
+            deleted_count = 0
             for item in items:
-                self.__WORKING_ITEMS__.pop(item, None)
+                if item in self.__WORKING_ITEMS__:
+                    del self.__WORKING_ITEMS__[item]
+                    deleted_count += 1
+            return deleted_count
 
     def get_working_items_count(self) -> int:
         with self.lock:

{cobweb-launcher-3.1.15 → cobweb-launcher-3.1.17}/cobweb/schedulers/scheduler_with_redis.py

@@ -97,23 +97,25 @@ class RedisScheduler(Scheduler):
         """
         刷新doing种子过期时间，防止reset重新消费
         """
+        time.sleep(20)
         if item_info := self.get_working_items():
             refresh_time = int(time.time())
             seed_info = {k: -refresh_time - v / 1000 for k, v in item_info.items()}
             self.db.zadd(self.todo_key, seed_info, xx=True)
             self.set_working_items(seed_info)
-        time.sleep(20)
 
     @check_pause
     def delete(self):
         """
         删除队列种子，根据状态添加至成功或失败队列，移除doing字典种子索引
         """
-        seeds = [seed.to_string for seed in self.done.iter_items(limit=self.done_queue_max_size)]
+        seeds = [seed for seed in self.done.iter_items(limit=self.done_queue_max_size)]
+        items = [seed.to_string for seed in seeds]
 
-        if seeds:
-            self.db.zrem(self.todo_key, *seeds)
-            self.remove_working_items(seeds)
+        if self.remove_working_items(items):
+            self.db.zrem(self.todo_key, *items)
+        elif seeds:
+            self.done.push(seeds)
 
         if self.done.length < self.done_queue_max_size:
             time.sleep(self.done_queue_wait_seconds)

{cobweb-launcher-3.1.15 → cobweb-launcher-3.1.17}/cobweb_launcher.egg-info/PKG-INFO

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

{cobweb-launcher-3.1.15 → cobweb-launcher-3.1.17}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="cobweb-launcher",
-    version="3.1.15",
+    version="3.1.17",
     packages=find_packages(),
     url="https://github.com/Juannie-PP/cobweb",
     license="MIT",