From da5531a947dfc9456d5015ddbbb23123d9b325f1 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Mon, 12 Apr 2021 14:55:06 +0200
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=88=86=E7=B1=BB=E8=BF=87=E6=BB=A4,?=
 =?UTF-8?q?=20=E6=A3=80=E6=B5=8B=E5=85=B3=E9=94=AE=E8=AF=8D=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=8C=85=E5=90=AB=E5=88=86=E7=B1=BB=E5=90=8D.=20?=
 =?UTF-8?q?=E7=A6=8F=E5=88=A9=E8=BF=87=E6=BB=A4,=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=90=8D=E6=98=AF=E5=90=A6=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Film.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index 0d2d352..957eb6f 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -646,7 +646,16 @@ export default {
       })
     },
     containsClassFilterKeyword (name) {
-      return this.setting.classFilter?.some(v => v.includes(name))
+      let ret = false
+      // 主分类过滤, 检测关键词是否包含分类名
+      if (this.setting.excludeRootClasses) {
+        ret = this.setting.rootClassFilter?.some(v => v.includes(name))
+      }
+      // 福利过滤,检测分类名是否包含关键词
+      if (this.setting.excludeR18Films && !ret) {
+        ret = this.setting.r18ClassFilter?.some(v => name?.includes(v))
+      }
+      return ret
     },
     toFlipPagecount () {
       // 似乎需要解析的网站的视频排序和其他m3u8采集站的顺序正好相反