feat(brushtask): 支持当前站点任务数限制 (#564)

* feat(brushtask): 支持当前站点任务数限制

+ 新增：刷流任务 支持当前站点任务总数限制（需为站点或刷流任务添加标签）
+ 新增：刷流任务 支持当前站点下载中任务数限制（需为站点或刷流任务添加标签）

* fix(brushtask): 修复站点标签判断

Author: mhmzx2025

app/brushtask.py

@@ -200,7 +200,10 @@ def check_task_rss(self, taskid):
         log.info("【Brush】开始站点 %s 的刷流任务：%s..." % (site_name, task_name))
         # 检查是否达到保种体积
         if not self.__is_allow_new_torrent(taskinfo=taskinfo,
-                                           dlcount=rss_rule.get("dlcount")):
+                                           dlcount=rss_rule.get("dlcount"),
+                                           current_site_count=rss_rule.get("current_site_count"),
+                                           current_site_dlcount=rss_rule.get("current_site_dlcount"),
+                                           site_info=site_info):
             return
 
         rss_result = self.rsshelper.parse_rssxml(url=rss_url, proxy=site_proxy)
@@ -222,6 +225,11 @@ def check_task_rss(self, taskid):
             downloading_count = self.__get_downloading_count(downloader_id) or 0
             new_torrent_count = int(max_dlcount) - int(downloading_count)
 
+        # 当前站点任务总数
+        current_site_count = rss_rule.get("current_site_count")
+        # 当前站点下载任务数
+        current_site_dlcount = rss_rule.get("current_site_dlcount")
+
         for res in rss_result:
             try:
                 # 种子名
@@ -253,7 +261,10 @@ def check_task_rss(self, taskid):
                 # 检查能否添加当前种子，判断是否超过保种体积大小
                 if not self.__is_allow_new_torrent(taskinfo=taskinfo,
                                                    dlcount=max_dlcount,
-                                                   torrent_size=size):
+                                                   torrent_size=size,
+                                                   current_site_count=current_site_count,
+                                                   current_site_dlcount=current_site_dlcount,
+                                                   site_info=site_info):
                     continue
                 # 检查是否已处理过
                 if self.is_torrent_handled(enclosure=enclosure):
@@ -275,7 +286,10 @@ def check_task_rss(self, taskid):
 
                     # 再判断一次
                     if not self.__is_allow_new_torrent(taskinfo=taskinfo,
-                                                       dlcount=max_dlcount):
+                                                       dlcount=max_dlcount,
+                                                       current_site_count=current_site_count,
+                                                       current_site_dlcount=current_site_dlcount,
+                                                       site_info=site_info):
                         break
                     self._torrents_cache.append(enclosure)
             except Exception as err:
@@ -529,7 +543,7 @@ def __send_message(_task_name, _delete_type, _torrent_name, _download_name, _tor
             except Exception as e:
                 ExceptionUtils.exception_traceback(e)
 
-    def __is_allow_new_torrent(self, taskinfo, dlcount, torrent_size=None):
+    def __is_allow_new_torrent(self, taskinfo, dlcount, current_site_dlcount, current_site_count, site_info, torrent_size=None):
         """
         检查是否还能添加新的下载
         """
@@ -570,21 +584,59 @@ def __is_allow_new_torrent(self, taskinfo, dlcount, torrent_size=None):
 
         # 检查正在下载的任务数
         if dlcount:
-            downloading_count = self.__get_downloading_count(downloader_id)
-            if downloading_count is None:
+            downloading_total_count = self.__get_downloading_count(downloader_id)
+            if downloading_total_count is None:
                 log.error("【Brush】任务 %s 下载器 %s 无法连接" % (task_name, downloader_name))
                 return False
-            if int(downloading_count) >= int(dlcount):
+            if int(downloading_total_count) >= int(dlcount):
                 log.warn("【Brush】下载器 %s 正在下载任务数：%s，超过设定上限，暂不添加下载" % (
-                    downloader_name, downloading_count))
+                    downloader_name, downloading_total_count))
+                return False
+
+        # 检查是否添加标签
+        label = list(set((taskinfo.get("label").split(',') if taskinfo.get("label") else []) +
+                 (site_info.get("tags").split(',') if site_info.get("tags") else [])))
+        if label is None or len(label) <= 0:
+            return True
+
+        site_name = site_info.get("name")
+
+        # 检查当前站点正在下载的任务数量
+        if current_site_dlcount:
+            current_site_count_downloading = self.__get_downloading_count(downloader_id, tag=label)
+            if current_site_count_downloading is None:
+                log.error("【Brush】任务 %s 下载器 %s 无法连接" % (task_name, downloader_name))
+                return False
+            if int(current_site_count_downloading) >= int(current_site_count):
+                log.warn("【Brush】站点 %s 正在下载任务数：%s，超过设定上限，暂不添加下载" % (
+                    site_name, current_site_count_downloading))
                 return False
+
+        # 检查当前站点任务数量
+        if current_site_count:
+            current_site_count_total = self.__get_task_count(downloader_id, tag=label)
+            if current_site_count_total is None:
+                log.error("【Brush】任务 %s 下载器 %s 无法连接" % (task_name, downloader_name))
+                return False
+            if int(current_site_count_total) >= int(current_site_count):
+                log.warn("【Brush】站点 %s 任务总数：%s，超过设定上限，暂不添加下载" % (
+                    site_name, current_site_count_total))
+                return False
+
         return True
 
-    def __get_downloading_count(self, downloader_id):
+    def __get_downloading_count(self, downloader_id, tag=None):
+        """
+        查询当前正在下载的任务数，支持限定 tag
+        """
+        torrents = self.downloader.get_downloading_torrents(downloader_id=downloader_id, tag=tag) or []
+        return len(torrents)
+
+    def __get_task_count(self, downloader_id, tag):
         """
-        查询当前正在下载的任务数
+        查询当前任务总数，限定 tag
         """
-        torrents = self.downloader.get_downloading_torrents(downloader_id=downloader_id) or []
+        torrents = self.downloader.get_torrents(downloader_id=downloader_id, tag=tag) or []
         return len(torrents)
 
     def __download_torrent(self,

web/action.py

@@ -1967,6 +1967,8 @@ def __add_brushtask(data):
         brushtask_include = data.get("brushtask_include")
         brushtask_exclude = data.get("brushtask_exclude")
         brushtask_dlcount = data.get("brushtask_dlcount")
+        brushtask_current_site_count = data.get("brushtask_current_site_count")
+        brushtask_current_site_dlcount = data.get("dl")
         brushtask_peercount = data.get("brushtask_peercount")
         brushtask_seedtime = data.get("brushtask_seedtime")
         brushtask_seedratio = data.get("brushtask_seedratio")
@@ -1985,6 +1987,8 @@ def __add_brushtask(data):
             "include": brushtask_include,
             "exclude": brushtask_exclude,
             "dlcount": brushtask_dlcount,
+            "current_site_count": brushtask_current_site_count,
+            "current_site_dlcount": brushtask_current_site_dlcount,
             "peercount": brushtask_peercount,
             "pubdate": brushtask_pubdate,
             "upspeed": brushtask_upspeed,

web/apiv1.py

@@ -1683,6 +1683,8 @@ class BrushTaskUpdate(ClientResource):
     parser.add_argument('brushtask_include', type=str, help='包含', location='form')
     parser.add_argument('brushtask_exclude', type=str, help='排除', location='form')
     parser.add_argument('brushtask_dlcount', type=int, help='同时下载任务数', location='form')
+    parser.add_argument('brushtask_current_site_count', type=int, help='当前站点任务总数', location='form')
+    parser.add_argument('brushtask_current_site_dlcount', type=int, help='当前站点下载任务数', location='form')
     parser.add_argument('brushtask_peercount', type=int, help='做种人数限制', location='form')
     parser.add_argument('brushtask_seedtime', type=float, help='做种时间(小时)', location='form')
     parser.add_argument('brushtask_seedratio', type=float, help='分享率', location='form')

web/templates/site/brushtask.html

@@ -446,6 +446,22 @@ <h5 class="modal-title" id="brushtask_modal_title">新建任务</h5>
                             <input type="text" id="brushtask_dlcount" class="form-control" placeholder="10">
                         </div>
                     </div>
+                    <div class="col-lg-4">
+                        <div class="mb-3">
+                            <label class="form-label">当前站点下载任务数 <span class="form-help"
+                                                                           title="当前站点下载任务数超过此值时不再添加下载，为站点或刷流任务添加标签后生效"
+                                                                           data-bs-toggle="tooltip">?</span></label>
+                            <input type="text" id="brushtask_current_site_dlcount" class="form-control" placeholder="5">
+                        </div>
+                    </div>
+                    <div class="col-lg-4">
+                        <div class="mb-3">
+                            <label class="form-label">当前站点任务总数 <span class="form-help"
+                                                                           title="当前站点任务总数超过此值时不再添加下载，为站点或刷流任务添加标签后生效"
+                                                                           data-bs-toggle="tooltip">?</span></label>
+                            <input type="text" id="brushtask_current_site_count" class="form-control" placeholder="10">
+                        </div>
+                    </div>
                     <div class="col-lg-4">
                         <div class="mb-3">
                             <label class="form-label">包含 <span class="form-help"
@@ -819,6 +835,8 @@ <h5 class="modal-title">刷流种子明细</h5>
           $("#brushtask_sendmessage").prop("checked", false);
         }
         $("#brushtask_dlcount").val(ret.task.rss_rule.dlcount)
+        $("#brushtask_current_site_count").val(ret.task.rss_rule.current_site_count)
+        $("#brushtask_current_site_dlcount").val(ret.task.rss_rule.current_site_dlcount)
         $("#brushtask_peercount").val(ret.task.rss_rule.peercount)
         $("#brushtask_include").val(ret.task.rss_rule.include);
         $("#brushtask_exclude").val(ret.task.rss_rule.exclude);
@@ -1025,6 +1043,22 @@ <h5 class="modal-title">刷流种子明细</h5>
     } else {
       $("#brushtask_dlcount").removeClass("is-invalid");
     }
+    //当前站点任务总数
+    let brushtask_current_site_count = $("#brushtask_current_site_count").val();
+    if (brushtask_current_site_count && isNaN(brushtask_current_site_count)) {
+      $("#brushtask_current_site_count").addClass("is-invalid");
+      return;
+    } else {
+      $("#brushtask_current_site_count").removeClass("is-invalid");
+    }
+    //当前站点任务下载数
+    let brushtask_current_site_dlcount = $("#brushtask_current_site_dlcount").val();
+    if (brushtask_current_site_dlcount && isNaN(brushtask_current_site_dlcount)) {
+      $("#brushtask_current_site_dlcount").addClass("is-invalid");
+      return;
+    } else {
+      $("#brushtask_current_site_dlcount").removeClass("is-invalid");
+    }
     //上传限速
     let brushtask_upspeed = $("#brushtask_upspeed").val();
     if (brushtask_upspeed && isNaN(brushtask_upspeed)) {
@@ -1174,6 +1208,8 @@ <h5 class="modal-title">刷流种子明细</h5>
       brushtask_include: brushtask_include,
       brushtask_exclude: brushtask_exclude,
       brushtask_dlcount: brushtask_dlcount,
+      brushtask_current_site_count: brushtask_current_site_count,
+      brushtask_current_site_dlcount: brushtask_current_site_dlcount,
       brushtask_peercount: brushtask_peercount_do + "#" + brushtask_peercount,
       brushtask_seedtime: brushtask_seedtime_do + "#" + brushtask_seedtime,
       brushtask_seedratio: brushtask_seedratio_do + "#" + brushtask_seedratio,