From ac81dd943ce364bb6e2655bf00f82292a3b61cf8 Mon Sep 17 00:00:00 2001
From: Edward <73746306+WangEdward@users.noreply.github.com>
Date: Tue, 5 Mar 2024 09:25:23 +0000
Subject: [PATCH 1/2] feat: add min_seeders in filter_rule

---
 app/chain/subscribe.py | 1 +
 app/helper/torrent.py  | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/app/chain/subscribe.py b/app/chain/subscribe.py
index 6333d111..71cbea13 100644
--- a/app/chain/subscribe.py
+++ b/app/chain/subscribe.py
@@ -462,6 +462,7 @@ class SubscribeChain(ChainBase):
             "effect": subscribe.effect or default_rule.get("effect"),
             "tv_size": default_rule.get("tv_size"),
             "movie_size": default_rule.get("movie_size"),
+            "min_seeders": default_rule.get("min_seeders"),
         }
 
     def match(self, torrents: Dict[str, List[Context]]):
diff --git a/app/helper/torrent.py b/app/helper/torrent.py
index 2d07e2f7..638eb2ec 100644
--- a/app/helper/torrent.py
+++ b/app/helper/torrent.py
@@ -324,6 +324,13 @@ class TorrentHelper(metaclass=Singleton):
 
         if not filter_rule:
             return True
+        
+        # 最少做种人数
+        min_seeders = filter_rule.get("min_seeders")
+        if min_seeders:
+            if torrent_info.seeders < int(min_seeders):
+                logger.info(f"{torrent_info.title} 做种人数不足 {min_seeders}")
+                return False
         # 包含
         include = filter_rule.get("include")
         if include:

From 8bcb6a7cb68474a7cbfbbd9618213526e64a7c8b Mon Sep 17 00:00:00 2001
From: Edward <73746306+WangEdward@users.noreply.github.com>
Date: Tue, 5 Mar 2024 09:35:34 +0000
Subject: [PATCH 2/2] chore: merge nested if

---
 app/helper/torrent.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/helper/torrent.py b/app/helper/torrent.py
index 638eb2ec..ae662022 100644
--- a/app/helper/torrent.py
+++ b/app/helper/torrent.py
@@ -327,10 +327,9 @@ class TorrentHelper(metaclass=Singleton):
         
         # 最少做种人数
         min_seeders = filter_rule.get("min_seeders")
-        if min_seeders:
-            if torrent_info.seeders < int(min_seeders):
-                logger.info(f"{torrent_info.title} 做种人数不足 {min_seeders}")
-                return False
+        if min_seeders and torrent_info.seeders < int(min_seeders):
+            logger.info(f"{torrent_info.title} 做种人数不足 {min_seeders}")
+            return False
         # 包含
         include = filter_rule.get("include")
         if include: