From 8610b41fad9c79ca9db8287f389a5b0a994182e8 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 10 Apr 2021 13:13:59 +0200
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AE=9A=E4=B9=89=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E8=BF=87=E6=BB=A4=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/EditSites.vue | 46 ++++++++++++++++++++++++++----------
 src/components/Film.vue      | 26 +++++---------------
 src/components/Setting.vue   |  3 ---
 src/lib/dexie/dexie.js       | 10 ++++++++
 4 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index 3071eee..7f6e981 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -2,7 +2,7 @@
   <div class="listpage" id="sites">
     <div class="listpage-header" v-show="!enableBatchEdit">
           <el-switch v-model="enableBatchEdit" active-text="批处理分组">></el-switch>
-          <el-checkbox v-model="setting.excludeR18Films" @change="excludeR18FilmsChangeEvent">屏蔽福利片</el-checkbox>
+          <el-button @click="openFilterKeywordsDiag" icon="el-icon-key">关键词过滤</el-button>
           <el-button @click="addSite" icon="el-icon-document-add">新增</el-button>
           <el-button @click="exportSites" icon="el-icon-upload2" title="导出全部，自动添加扩展名">导出</el-button>
           <el-button @click="importSites" icon="el-icon-download" title="支持同时导入多个文件">导入</el-button>
@@ -83,7 +83,7 @@
      </div>
     <!-- 编辑页面 -->
     <div>
-      <el-dialog :visible.sync="dialogVisible" v-if='dialogVisible' :title="dialogType==='edit'?'编辑源':'新增源'" :append-to-body="true" @close="closeDialog">
+      <el-dialog :visible.sync="editSiteDialogVisible" v-if='editSiteDialogVisible' :title="dialogType==='edit'?'编辑源':'新增源'" :append-to-body="true" @close="closeDialog">
         <el-form :model="siteInfo" ref='siteInfo' label-width="75px" label-position="left" :rules="rules">
           <el-form-item label="源站名" prop='name'>
             <el-input v-model="siteInfo.name" placeholder="请输入源站名" />
@@ -112,6 +112,20 @@
         </span>
       </el-dialog>
     </div>
+    <!-- 设置过滤关键词页面 -->
+    <div>
+      <el-dialog :visible.sync="filterKeywordsDialogVisible" v-if='filterKeywordsDialogVisible' :title="'过滤关键词'" :append-to-body="true" @close="closeDialog">
+        <el-form label-width="100px" label-position="left">
+          <el-form-item label="分类过滤">
+            <el-input v-model="filterKeywords" :autosize="{ minRows: 1, maxRows: 4}" type="textarea" placeholder="请输入过滤关键词" />
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="saveFilterKeywords">保存</el-button>
+        </span>
+      </el-dialog>
+    </div>
   </div>
 </template>
 <script>
@@ -129,7 +143,8 @@ export default {
       show: false,
       sites: [],
       dialogType: 'new',
-      dialogVisible: false,
+      editSiteDialogVisible: false,
+      filterKeywordsDialogVisible: false,
       siteInfo: {
         key: '',
         name: '',
@@ -139,6 +154,7 @@ export default {
         group: '',
         isActive: true
       },
+      filterKeywords: [],
       siteGroup: [],
       rules: {
         name: [
@@ -204,12 +220,6 @@ export default {
   },
   methods: {
     ...mapMutations(['SET_SETTING']),
-    excludeR18FilmsChangeEvent () {
-      setting.find().then(res => {
-        res.excludeR18Films = this.setting.excludeR18Films
-        setting.update(res)
-      })
-    },
     selectionCellClick (selection, row) {
       if (this.shiftDown && this.selectionBegin !== '' && selection.includes(row)) {
         this.selectionEnd = row.id
@@ -261,6 +271,15 @@ export default {
       }
       this.siteGroup = arr
     },
+    openFilterKeywordsDiag () {
+      this.filterKeywords = this.setting.classFilter.join()
+      this.filterKeywordsDialogVisible = true
+    },
+    saveFilterKeywords () {
+      this.setting.classFilter = this.filterKeywords.split(',')
+      setting.update(this.setting)
+      this.filterKeywordsDialogVisible = false
+    },
     addSite () {
       if (this.checkAllSitesLoading) {
         this.$message.info('正在检测, 请勿操作.')
@@ -268,7 +287,7 @@ export default {
       }
       this.getSitesGroup()
       this.dialogType = 'new'
-      this.dialogVisible = true
+      this.editSiteDialogVisible = true
       this.siteInfo = {
         key: '',
         name: '',
@@ -286,12 +305,13 @@ export default {
       }
       this.getSitesGroup()
       this.dialogType = 'edit'
-      this.dialogVisible = true
+      this.editSiteDialogVisible = true
       this.siteInfo = siteInfo
       this.editOldkey = siteInfo.key
     },
     closeDialog () {
-      this.dialogVisible = false
+      this.editSiteDialogVisible = false
+      this.filterKeywordsDialogVisible = false
       this.getSites()
     },
     removeEvent (e) {
@@ -348,7 +368,7 @@ export default {
           group: ''
         }
         this.dialogType === 'edit' ? this.$message.success('修改成功！') : this.$message.success('新增源成功！')
-        this.dialogVisible = false
+        this.editSiteDialogVisible = false
         this.getSites()
       })
       this.editOldkey = ''
diff --git a/src/components/Film.vue b/src/components/Film.vue
index 60d13f8..1bc438a 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -345,8 +345,7 @@ export default {
       currentColumn: '',
       searchGroup: '',
       searchGroups: ['站内', '组内', '全站'],
-      // 福利片关键词
-      r18KeyWords: ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番', 'VIP'],
+      classFilterKeywords: [],
       filteredList: [],
       areas: [],
       searchRunning: false,
@@ -414,7 +413,7 @@ export default {
       }
     },
     filterSettings () {
-      return this.$store.getters.getSetting.excludeR18Films // 需要监听的数据
+      return this.$store.getters.getSetting.classFilter // 需要监听的数据
     },
     searchSites () {
       if (this.searchGroup === '站内') return [this.site]
@@ -620,20 +619,11 @@ export default {
     getClass () {
       return new Promise((resolve, reject) => {
         const key = this.site.key
-        // 屏蔽主分类
-        const classToHide = ['电影', '电影片', '电视剧', '连续剧', '综艺', '动漫']
         zy.class(key).then(res => {
           const allClass = [{ name: '最新', tid: 0 }]
           res.class.forEach(element => {
-            if (!this.setting.excludeRootClasses || !classToHide.includes(element.name)) {
-              if (this.setting.excludeR18Films) {
-                const containKeyWord = this.containsR18Keywords(element.name)
-                if (!containKeyWord) {
-                  allClass.push(element)
-                }
-              } else {
-                allClass.push(element)
-              }
+            if (!this.containsClassFilterKeyword(element.name)) {
+              allClass.push(element)
             }
           })
           resolve(allClass)
@@ -642,12 +632,8 @@ export default {
         })
       })
     },
-    containsR18Keywords (name) {
-      const containKeyWord = false
-      if (!name) {
-        return containKeyWord
-      }
-      return this.r18KeyWords.some(v => name.includes(v))
+    containsClassFilterKeyword (name) {
+      return this.setting.classFilter?.some(v => name?.includes(v))
     },
     toFlipPagecount () {
       // 似乎需要解析的网站的视频排序和其他m3u8采集站的顺序正好相反
diff --git a/src/components/Setting.vue b/src/components/Setting.vue
index a83757e..ed27951 100644
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -93,9 +93,6 @@
           <div class="zy-select">
             <div class="vs-placeholder vs-noAfter" @click="show.configSitesDataUrlDialog = true">设置源站接口文件</div>
           </div>
-          <div class="zy-input" @click="toggleExcludeRootClasses">
-           <input type="checkbox" v-model = "d.excludeRootClasses" @change="updateSettingEvent"> 屏蔽主分类
-          </div>
         </div>
       </div>
       <div class="site">
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index 5e9df57..e2e5d9e 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -63,6 +63,16 @@ db.version(9).stores({
   history: '++id, [site+ids], name, type, year, index, time, duration, detail, onlinePlay, hasUpdate'
 })
 
+db.version(10).stores({
+  setting: 'id, theme, site, shortcut, view, volume, externalPlayer, searchGroup, forwardTimeInSec, starViewMode, recommandationViewMode, searchViewMode, password, proxy, allowPassWhenIptvCheck, autocleanWhenIptvCheck, classFilter'
+}).upgrade(trans => {
+  trans.setting.toCollection().modify(setting => {
+    delete setting.excludeRootClasses
+    delete setting.excludeR18Films
+    setting.classFilter = ['电影', '电影片', '电视剧', '连续剧', '综艺', '动漫', '伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番', 'VIP']
+  })
+})
+
 db.on('populate', () => {
   db.setting.bulkAdd(setting)
   db.sites.bulkAdd(sites)