v2.7.9

有更新项目,进入详情页面,也清除有更新标记
历史页面添加只显示有更新过滤开关
2026-02-15 00:16:26 +08:00 · 2021-03-29 17:49:11 +02:00 · 2021-03-29 15:49:03 +02:00 · 2021-03-29 15:33:10 +02:00 · 2021-03-29 15:31:08 +02:00 · 2021-03-29 15:12:11 +02:00
23 changed files with 51522 additions and 10000 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "zy",
-  "version": "2.7.5",
+  "version": "2.7.9",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve",
@@ -19,21 +19,21 @@
  "dependencies": {
    "axios": "^0.21.1",
    "cheerio": "^1.0.0-rc.5",
-    "core-js": "^3.9.0",
+    "core-js": "^3.9.1",
    "dexie": "^3.0.3",
    "electron-localshortcut": "^3.2.1",
    "electron-proxy-agent": "^1.2.0",
-    "electron-updater": "^4.3.5",
-    "element-ui": "^2.15.0",
-    "fast-xml-parser": "^3.18.0",
+    "electron-updater": "^4.3.8",
+    "element-ui": "^2.15.1",
+    "fast-xml-parser": "^3.19.0",
    "html2canvas": "^1.0.0-rc.7",
    "iptv-playlist-parser": "^0.6.0",
    "m3u": "0.0.2",
-    "m3u8-parser": "^4.5.2",
+    "m3u8-parser": "^4.6.0",
    "memcached": "^2.2.2",
    "modern-normalize": "^1.0.0",
    "mousetrap": "^1.6.5",
-    "pinyin-match": "^1.2.0",
+    "pinyin-match": "^1.2.1",
    "qrcode.vue": "^1.7.0",
    "randomstring": "^1.1.5",
    "session": "^0.1.0",
@@ -44,9 +44,9 @@
    "vue-waterfall-plugin": "^1.1.0",
    "vuedraggable": "^2.24.3",
    "vuex": "^3.6.2",
-    "xgplayer": "^2.18.0",
-    "xgplayer-flv.js": "^2.2.0",
-    "xgplayer-hls.js": "^2.4.1"
+    "xgplayer": "2.17.13",
+    "xgplayer-flv.js": "^2.3.0",
+    "xgplayer-hls.js": "^2.4.2"
  },
  "devDependencies": {
    "@vue/cli-plugin-babel": "~4.5.11",
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -178,7 +178,6 @@
      .el-select-dropdown__item.selected.hover{ //是上游的bug吗？临时性修补
        background-color: transparent;
      }
-      
      .el-select-dropdown__wrap{
        max-height: 574px
      }
@@ -284,7 +283,8 @@
        cursor: pointer;
        transition: 0.2s;
        &:hover {
-          top: -3px;
+          width: 102%;
+          height: 102%
        }
        .img{
          position: relative;
--- a/src/assets/scss/theme.scss
+++ b/src/assets/scss/theme.scss
@@ -14,6 +14,7 @@
  --l-fc-3: #823aa0;
  --l-bgc-1: #ffffff;
  --l-bgc-2: #f2f6f9;
+  --l-bgc-3: #F9FBFC;
  --l-bsc: 0 1px 3px #8e8da233, 0 1px 2px #8e8da244;
  --l-bsc-hover: 0 14px 28px #8e8da255, 0 10px 10px #8e8da244;
  --l-bsc-2: 0 -4px 23px 0 #8e8da233;
@@ -32,6 +33,7 @@
  --d-fc-3: #38dd77;
  --d-bgc-1: #222222;
  --d-bgc-2: #2f2f2f;
+  --d-bgc-3: #292929;
  --d-bsc: 0 1px 3px #38dd7733, 0 1px 2px #38dd7744;
  --d-bsc-hover: 0 14px 28px #38dd7755, 0 10px 10px #38dd7744;
  --d-bsc-2: 0 -4px 23px 0 #38dd7733;
@@ -50,6 +52,7 @@
  --g-fc-3: #C1D95C;
  --g-bgc-1: #4baea0;
  --g-bgc-2: #74b4ac;
+  --g-bgc-3: #60B1A6;
  --g-bsc: 0 1px 3px #e1ebe033, 0 1px 2px #e1ebe044;
  --g-bsc-hover: 0 14px 28px #e1ebe055, 0 10px 10px #e1ebe044;
  --g-bsc-2: 0 -4px 23px 0 #e1ebe033;
@@ -68,6 +71,7 @@
  --p-fc-3: #177ea7;
  --p-bgc-1: #ff8499;
  --p-bgc-2: #fea1b2;
+  --p-bgc-3: #FF93A6;
  --p-bsc: 0 1px 3px #ef528533, 0 1px 2px #ef528544;
  --p-bsc-hover: 0 14px 28px #ef528555, 0 10px 10px #ef528544;
  --p-bsc-2: 0 -4px 23px 0 #ef528533;
--- a/src/assets/scss/theme/dark.scss
+++ b/src/assets/scss/theme/dark.scss
@@ -461,7 +461,7 @@
      .show-picture{
        color: var(--d-fc-1);
        .card{
-          background-color: var(--d-bgc-1);
+          background-color: var(--d-bgc-3);
          box-shadow: var(--d-bsc);
          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
          &:hover{
--- a/src/assets/scss/theme/green.scss
+++ b/src/assets/scss/theme/green.scss
@@ -449,7 +449,7 @@
      .show-picture{
        color: var(--g-fc-1);
        .card{
-          background-color: var(--g-bgc-1);
+          background-color: var(--g-bgc-3);
          box-shadow: var(--g-bsc);
          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
          &:hover{
--- a/src/assets/scss/theme/light.scss
+++ b/src/assets/scss/theme/light.scss
@@ -449,7 +449,7 @@
      .show-picture{
        color: var(--l-fc-1);
        .card{
-          background-color: var(--l-bgc-1);
+          background-color: var(--l-bgc-3);
          box-shadow: var(--l-bsc);
          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
          &:hover{
--- a/src/assets/scss/theme/pink.scss
+++ b/src/assets/scss/theme/pink.scss
@@ -449,7 +449,7 @@
      .show-picture{
        color: var(--p-fc-1);
        .card{
-          background-color: var(--p-bgc-1);
+          background-color: var(--p-bgc-3);
          box-shadow: var(--p-bsc);
          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
          &:hover{
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -379,31 +379,57 @@ export default {
      }
      const options = {
        filters: [
-          { name: 'JSON file', extensions: ['json'] }
+          { name: '支持的文件格式', extensions: ['json', 'txt'] }
        ],
        properties: ['openFile', 'multiSelections']
      }
      remote.dialog.showOpenDialog(options).then(result => {
        if (!result.canceled) {
          result.filePaths.forEach(file => {
-            const str = fs.readFileSync(file)
-            const json = JSON.parse(str)
-            json.forEach(ele => {
-              if (ele.api && this.sites.filter(x => x.key === ele.key).length === 0 && this.sites.filter(x => x.name === ele.name && x.api === ele.api).length === 0) {
-                // 不含该key 同时也不含名字和url一样的
-                if (ele.isActive === undefined) {
-                  ele.isActive = true
+            if (file.endsWith('json')) {
+              const str = fs.readFileSync(file)
+              const json = JSON.parse(str)
+              json.forEach(ele => {
+                if (ele.api && this.sites.filter(x => x.key === ele.key).length === 0 && this.sites.filter(x => x.name === ele.name && x.api === ele.api).length === 0) {
+                  // 不含该key 同时也不含名字和url一样的
+                  if (ele.isActive === undefined) {
+                    ele.isActive = true
+                  }
+                  if (ele.group === undefined) {
+                    ele.group = '导入'
+                  }
+                  this.sites.push(ele)
                }
-                if (ele.group === undefined) {
-                  ele.group = '导入'
-                }
-                this.sites.push(ele)
+              })
+              this.resetId(this.sites)
+              sites.clear().then(sites.bulkAdd(this.sites))
+              this.$message.success('导入成功')
+              this.getSites()
+            }
+            if (file.endsWith('txt')) {
+              try {
+                const txt = fs.readFileSync(file, 'utf8')
+                const json = JSON.parse(txt)
+                json.forEach(ele => {
+                  if (ele.api && this.sites.filter(x => x.key === ele.key).length === 0 && this.sites.filter(x => x.name === ele.name && x.api === ele.api).length === 0) {
+                    // 不含该key 同时也不含名字和url一样的
+                    if (ele.isActive === undefined) {
+                      ele.isActive = true
+                    }
+                    if (ele.group === undefined) {
+                      ele.group = '导入'
+                    }
+                    this.sites.push(ele)
+                  }
+                })
+                this.resetId(this.sites)
+                sites.clear().then(sites.bulkAdd(this.sites))
+                this.$message.success('导入成功')
+                this.getSites()
+              } catch (error) {
+                this.$message.warning('导入失败')
              }
-            })
-            this.resetId(this.sites)
-            sites.clear().then(sites.bulkAdd(this.sites))
-            this.$message.success('导入成功')
-            this.getSites()
+            }
          })
        }
      })
@@ -414,14 +440,11 @@ export default {
        // 如果没有设置源站文件链接,使用默认的gitee源
        url = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json'
      }
-      const axios = require('axios')
-      axios.get(url).then(res => {
-        if (res.status === 200) {
-          if (res.data.length > 0) {
-            sites.clear().then(sites.bulkAdd(res.data))
-            this.$message.success('重置源成功')
-            this.getSites()
-          }
+      zy.getDefaultSites(url).then(res => {
+        if (res.length > 0) {
+          sites.clear().then(sites.bulkAdd(res))
+          this.$message.success('重置源成功')
+          this.getSites()
        }
      }).catch(error => {
        this.$message.error('导入云端源站失败. ' + error)
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -322,7 +322,6 @@ export default {
  data () {
    return {
      showFind: false,
-      showToolbar: false,
      showTableLastColumn: false,
      sites: [],
      site: {},
@@ -347,16 +346,18 @@ export default {
      searchGroup: '',
      searchGroups: [],
      // 福利片关键词
-      r18KeyWords: ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番'],
+      r18KeyWords: ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番', 'VIP'],
      filteredList: [],
      areas: [],
+      searchRunning: false,
+      siteSearchCount: 0,
+      infiniteHandlerCount: 0,
+      // Toolbar
+      showToolbar: false,
      selectedAreas: [],
      sortKeyword: '',
      sortKeywords: ['按片名', '按上映年份', '按更新时间'],
-      selectedYears: { start: 0, end: new Date().getFullYear() },
-      searchRunning: false,
-      siteSearchCount: 0,
-      infiniteHandlerCount: 0
+      selectedYears: { start: 0, end: new Date().getFullYear() }
    }
  },
  components: {
--- a/src/components/History.vue
+++ b/src/components/History.vue
@@ -1,15 +1,53 @@
 <template>
  <div class="listpage" id="history">
    <div class="listpage-header" id="history-header">
-        <el-switch v-model="setting.historyViewMode" active-text="海报" active-value="picture" inactive-text="列表" inactive-value="table" @change="updateViewMode"></el-switch>
        <el-button @click.stop="exportHistory" icon="el-icon-upload2" title="导出全部，自动添加扩展名">导出</el-button>
        <el-button @click.stop="importHistory" icon="el-icon-download" title="支持同时导入多个文件">导入</el-button>
        <el-button @click.stop="removeSelectedItems" icon="el-icon-delete-solid">{{ multipleSelection.length === 0 ? "清空" : "删除所选" }}</el-button>
+        <el-button @click.stop="updateAllEvent" icon="el-icon-refresh">检查更新</el-button>
    </div>
+   <div class="toolbar" v-show="showToolbar">
+      <el-switch v-model="onlyShowItemsHasUpdate" active-text="有更新" inactive-text="全部" @change="refreshFilteredList"></el-switch>
+      <el-select v-model="selectedAreas" size="small" multiple placeholder="地区" popper-class="popper" :popper-append-to-body="false" @remove-tag="refreshFilteredList" @change="refreshFilteredList">
+        <el-option
+          v-for="item in areas"
+          :key="item"
+          :label="item"
+          :value="item">
+        </el-option>
+      </el-select>
+      <el-select v-model="selectedTypes" size="small" multiple placeholder="类型" popper-class="popper" :popper-append-to-body="false" @remove-tag="refreshFilteredList" @change="refreshFilteredList">
+        <el-option
+          v-for="item in types"
+          :key="item"
+          :label="item"
+          :value="item">
+        </el-option>
+      </el-select>
+      <el-select v-model="sortKeyword" size="small" placeholder="排序" popper-class="popper" :popper-append-to-body="false" @change="refreshFilteredList">
+        <el-option
+          v-for="item in sortKeywords"
+          :key="item"
+          :label="item"
+          :value="item">
+        </el-option>
+      </el-select>
+      <span>
+       上映区间：
+       <el-input-number size="small" v-model="selectedYears.start" :min=0 :max="new Date().getFullYear()" controls-position="right" step-strictly @change="refreshFilteredList"></el-input-number>
+       至
+       <el-input-number size="small" v-model="selectedYears.end" :min=0 :max="new Date().getFullYear()" controls-position="right" step-strictly @change="refreshFilteredList"></el-input-number>
+       </span>
+    </div>
+    <el-divider class="listpage-header-divider" content-position="right">
+      <el-button type="text" size="mini" @click="toggleViewMode">视图切换</el-button>
+      <el-button type="text" size="mini" @click='() => { showToolbar = !showToolbar; if (!showToolbar) this.refreshFilteredList() }' title="收起工具栏会重置筛选排序">{{ showToolbar ? '隐藏工具栏' : '显示工具栏' }}</el-button>
+      <el-button type="text" size="mini" @click="backTop">回到顶部</el-button>
+    </el-divider>
    <div class="listpage-body" id="history-body">
      <div class="show-table" id="history-table" v-if="setting.historyViewMode === 'table'">
        <el-table size="mini" fit height="100%"
-          :data="history"
+          :data="filteredList"
          row-key="id"
          ref="historyTable"
          @select="selectionCellClick"
@@ -40,7 +78,7 @@
              </span>
            </template>
          </el-table-column>
-          <el-table-column v-if="history.some(e => e.time)"
+          <el-table-column v-if="list.some(e => e.time)"
            width="150"
            label="时间进度">
            <template slot-scope="scope">
@@ -63,7 +101,7 @@
        </el-table>
      </div>
      <div class="show-picture" id="star-picture" v-if="setting.historyViewMode === 'picture'">
-        <Waterfall ref="historyWaterfall" :list="history" :gutter="20" :width="240"
+        <Waterfall ref="historyWaterfall" :list="filteredList" :gutter="20" :width="240"
          :breakpoints="{
            1200: { //当屏幕宽度小于等于1200
              rowPerView: 4,
@@ -80,6 +118,9 @@
            <template slot="item" slot-scope="props">
              <div class="card">
                <div class="img">
+                  <div class="update" v-if="props.data.hasUpdate">
+                    <span>有更新</span>
+                  </div>
                  <img v-if="props.data.detail && props.data.detail.pic" style="width: 100%" :src="props.data.detail.pic" alt="" @load="$refs.historyWaterfall.refresh()" @click="detailEvent(props.data)">
                  <div class="operate">
                    <div class="operate-wrap">
@@ -120,12 +161,24 @@ export default {
  name: 'history',
  data () {
    return {
-      history: [],
+      list: [],
      sites: [],
      shiftDown: false,
      selectionBegin: '',
      selectionEnd: '',
-      multipleSelection: []
+      multipleSelection: [],
+      areas: [],
+      types: [],
+      // Update
+      numNoUpdate: 0,
+      // Toolbar
+      showToolbar: false,
+      selectedAreas: [],
+      selectedTypes: [],
+      sortKeyword: '',
+      sortKeywords: ['按片名', '按上映年份', '按更新时间'],
+      selectedYears: { start: 0, end: new Date().getFullYear() },
+      onlyShowItemsHasUpdate: false
    }
  },
  components: {
@@ -171,6 +224,14 @@ export default {
      set (val) {
        this.SET_SETTING(val)
      }
+    },
+    DetailCache: {
+      get () {
+        return this.$store.getters.getDetailCache
+      },
+      set (val) {
+        this.SET_DetailCache(val)
+      }
    }
  },
  watch: {
@@ -180,19 +241,122 @@ export default {
        this.getAllsites()
        if (this.setting.historyViewMode === 'table') this.showShiftPrompt()
      }
+    },
+    list: {
+      handler (list) {
+        this.areas = [...new Set(list.map(ele => ele.detail.area))].filter(x => x)
+        this.types = [...new Set(list.map(ele => ele.detail.type))].filter(x => x)
+        this.refreshFilteredList()
+      },
+      deep: true
+    },
+    numNoUpdate () {
+      // 如果所有历史都没有更新的话
+      if (this.numNoUpdate === this.list.length) {
+        this.numNoUpdate = 0
+        this.$message.warning('未查询到任何更新')
+      }
    }
  },
  methods: {
    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE', 'SET_SETTING']),
+    updateAllEvent () {
+      this.numNoUpdate = 0
+      this.list.forEach(e => {
+        this.updateEvent(e)
+      })
+    },
+    async updateEvent (e) {
+      try {
+        if (!this.DetailCache[e.site + '@' + e.ids]) {
+          this.DetailCache[e.site + '@' + e.ids] = await zy.detail(e.site, e.ids)
+        }
+        const newDetail = this.DetailCache[e.site + '@' + e.ids]
+        history.get(e.id).then(res => {
+          if (!e.hasUpdate && e.detail.last !== newDetail.last) {
+            res.hasUpdate = true
+            res.detail = newDetail
+            const msg = `检查到"${e.name}"有更新。`
+            this.$message.success(msg)
+          } else {
+            this.numNoUpdate += 1
+          }
+          history.update(e.id, res)
+          this.getAllhistory()
+        })
+      } catch (err) {
+        const msg = `更新"${e.name}"失败, 请重试。`
+        this.$message.warning(msg, err)
+      }
+    },
+    toggleViewMode () {
+      this.setting.historyViewMode = this.setting.historyViewMode === 'picture' ? 'table' : 'picture'
+      if (this.setting.historyViewMode === 'table') {
+        setTimeout(() => { this.rowDrop() }, 100)
+        this.showShiftPrompt()
+      } else {
+        setTimeout(() => { if (this.$refs.historyWaterfall) this.$refs.historyWaterfall.refresh() }, 700)
+      }
+      setting.find().then(res => {
+        res.historyViewMode = this.setting.historyViewMode
+        setting.update(res)
+      })
+    },
+    backTop () {
+      if (this.setting.starViewMode === 'picture') {
+        document.getElementById('history-body').scrollTop = 0
+      } else {
+        this.$refs.historyTable.bodyWrapper.scrollTop = 0
+      }
+    },
+    refreshFilteredList () {
+      if (!this.showToolbar) {
+        this.sortKeyword = ''
+        this.selectedAreas = []
+        this.selectedSearchClassNames = []
+        this.selectedYears.start = 0
+        this.selectedYears.end = new Date().getFullYear()
+        this.filteredList = this.list
+      } else {
+        let filteredData = this.list
+        filteredData = filteredData.filter(x => (this.selectedAreas.length === 0) || this.selectedAreas.includes(x.detail.area))
+        filteredData = filteredData.filter(x => (this.selectedTypes.length === 0) || this.selectedTypes.includes(x.detail.type))
+        filteredData = filteredData.filter(res => res.detail.year >= this.selectedYears.start)
+        filteredData = filteredData.filter(res => res.detail.year <= this.selectedYears.end)
+        switch (this.sortKeyword) {
+          case '按上映年份':
+            filteredData.sort(function (a, b) {
+              return a.detail.year - b.detail.year
+            })
+            break
+          case '按片名':
+            filteredData.sort(function (a, b) {
+              return a.detail.name.localeCompare(b.detail.name, 'zh')
+            })
+            break
+          case '按更新时间':
+            filteredData.sort(function (a, b) {
+              return new Date(b.detail.last) - new Date(a.detail.last)
+            })
+            break
+          default:
+            break
+        }
+        this.filteredList = filteredData
+      }
+      if (this.onlyShowItemsHasUpdate) {
+        this.filteredList = this.filteredList.filter(x => x.hasUpdate)
+      }
+    },
    fmtMSS (s) {
      return (s - (s %= 60)) / 60 + (s > 9 ? ':' : ':0') + s
    },
    selectionCellClick (selection, row) { // 历史id与顺序刚好相反，大的反而在前面
      if (this.shiftDown && this.selectionBegin !== '' && selection.includes(row)) {
        this.selectionEnd = row.id
-        const start = this.history.findIndex(e => e.id === Math.max(this.selectionBegin, this.selectionEnd))
-        const end = this.history.findIndex(e => e.id === Math.min(this.selectionBegin, this.selectionEnd))
-        const selections = this.history.slice(start, end + 1)
+        const start = this.list.findIndex(e => e.id === Math.max(this.selectionBegin, this.selectionEnd))
+        const end = this.list.findIndex(e => e.id === Math.min(this.selectionBegin, this.selectionEnd))
+        const selections = this.list.slice(start, end + 1)
        this.$nextTick(() => {
          selections.forEach(e => this.$refs.historyTable.toggleRowSelection(e, true))
        })
@@ -209,7 +373,7 @@ export default {
      this.multipleSelection = rows
    },
    removeSelectedItems () {
-      if (!this.multipleSelection.length) this.multipleSelection = this.history
+      if (!this.multipleSelection.length) this.multipleSelection = this.list
      this.multipleSelection.forEach(e => history.remove(e.id))
      this.multipleSelection = []
      this.getAllhistory()
@@ -224,6 +388,9 @@ export default {
          name: e.name
        }
      }
+      if (e.hasUpdate) {
+        this.clearHasUpdateFlag(e)
+      }
    },
    async playEvent (e) {
      const db = await history.find({ site: e.site, ids: e.ids })
@@ -232,8 +399,19 @@ export default {
      } else {
        this.video = { key: e.site, info: { id: e.ids, name: e.name, index: 0 } }
      }
+      if (e.hasUpdate) {
+        this.clearHasUpdateFlag(e)
+      }
      this.view = 'Play'
    },
+    async clearHasUpdateFlag (e) {
+      const db = await history.find({ id: e.id })
+      if (db) {
+        db.hasUpdate = false
+        history.update(e.id, db)
+        this.getAllhistory()
+      }
+    },
    shareEvent (e) {
      this.share = {
        show: true,
@@ -251,7 +429,7 @@ export default {
    },
    exportHistory () {
      this.getAllhistory()
-      const arr = [...this.history]
+      const arr = [...this.list]
      const str = JSON.stringify(arr, null, 2)
      const options = {
        filters: [
@@ -296,7 +474,7 @@ export default {
    },
    getAllhistory () {
      history.all().then(res => {
-        this.history = res.reverse()
+        this.list = res.reverse()
      })
    },
    getAllsites () {
@@ -320,24 +498,13 @@ export default {
    updateDatabase () {
      history.clear().then(res => {
        let id = length
-        this.history.forEach(ele => {
+        this.list.forEach(ele => {
          ele.id = id
          id -= 1
          history.add(ele)
        })
      })
    },
-    updateViewMode () {
-      if (this.setting.historyViewMode === 'table') {
-        this.showShiftPrompt()
-      } else {
-        setTimeout(() => { if (this.$refs.historyWaterfall) this.$refs.historyWaterfall.refresh() }, 700)
-      }
-      setting.find().then(res => {
-        res.historyViewMode = this.setting.historyViewMode
-        setting.update(res)
-      })
-    },
    showShiftPrompt () {
      if (this.setting.shiftTooltipLimitTimes === undefined) this.setting.shiftTooltipLimitTimes = 5
      if (this.setting.shiftTooltipLimitTimes) {
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -113,6 +113,7 @@ import zy from '../lib/site/tools'
 import { remote } from 'electron'
 import fs from 'fs'
 import Sortable from 'sortablejs'
+import axios from 'axios'
 export default {
  name: 'iptv',
  data () {
@@ -349,10 +350,55 @@ export default {
        this.$message.info('正在检测, 请勿操作.')
        return false
      }
+      this.$msgbox.prompt('请输入网址', '提示', {
+        distinguishCancelAndClose: true,
+        inputValue: 'http://y.qibaobaike.com/nzy.txt',
+        confirmButtonText: '确定',
+        cancelButtonText: '本地文件'
+      }).then(({ value }) => {
+        this.importOnlineChannels(value)
+      }).catch(action => {
+        if (action === 'cancel') {
+          this.importLocalChannels()
+        }
+      })
+    },
+    async importOnlineChannels (url) {
+      try {
+        const docs = []
+        let id = this.channelList.length ? this.channelList.slice(-1)[0].id + 1 : 1
+        const res = await axios.get(url)
+        const result = res.data.split('\n')
+        const supportFormats = /\.(m3u8|flv)$/
+        for (const i of result) {
+          if (i.includes('http') && supportFormats.test(i)) {
+            const j = i.split(',')
+            const doc = {
+              id: id,
+              name: j[0],
+              url: j[1],
+              isActive: true
+            }
+            id += 1
+            docs.push(doc)
+          }
+        }
+        // 获取url不重复的列表
+        const uniqueList = [...new Map(docs.map(item => [item.url, item])).values()]
+        iptv.clear().then(res => {
+          iptv.bulkAdd(uniqueList).then(e => { // 支持导入同名频道，群里反馈
+            this.updateChannelList()
+          })
+        })
+        this.$message.success('导入成功')
+      } catch (error) {
+        this.$message.warning('导入失败')
+      }
+    },
+    importLocalChannels () {
      const options = {
        filters: [
-          { name: 'm3u file', extensions: ['m3u', 'm3u8'] },
-          { name: 'JSON file', extensions: ['json'] }
+          { name: '支持的文件格式', extensions: ['m3u', 'm3u8', 'json', 'txt'] }
        ],
        properties: ['openFile', 'multiSelections']
      }
@@ -389,8 +435,9 @@ export default {
                  this.updateChannelList()
                })
              })
-            } else {
-              // Import Json file
+              this.$message.success('导入成功')
+            }
+            if (file.endsWith('json')) {
              const importedList = JSON.parse(fs.readFileSync(file))
              importedList.forEach(ele => {
                const commonEle = this.channelList.find(e => e.name === ele.name)
@@ -404,9 +451,41 @@ export default {
                }
              })
              this.updateDatabase()
+              this.$message.success('导入成功')
+            }
+            if (file.endsWith('txt')) {
+              try {
+                const docs = []
+                let id = this.channelList.length ? this.channelList.slice(-1)[0].id + 1 : 1
+                const playlist = fs.readFileSync(file, 'utf8')
+                const result = playlist.split('\n')
+                const supportFormats = /\.(m3u8|flv)$/
+                for (const i of result) {
+                  if (i.includes('http') && supportFormats.test(i)) {
+                    const j = i.split(',')
+                    const doc = {
+                      id: id,
+                      name: j[0],
+                      url: j[1],
+                      isActive: true
+                    }
+                    id += 1
+                    docs.push(doc)
+                  }
+                }
+                // 获取url不重复的列表
+                const uniqueList = [...new Map(docs.map(item => [item.url, item])).values()]
+                iptv.clear().then(res => {
+                  iptv.bulkAdd(uniqueList).then(e => { // 支持导入同名频道，群里反馈
+                    this.updateChannelList()
+                  })
+                })
+                this.$message.success('导入成功')
+              } catch (error) {
+                this.$message.warning('导入失败')
+              }
            }
          })
-          this.$message.success('导入成功')
        }
      })
    },
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -50,7 +50,7 @@
            <polyline points="12 5 12 12 16 16"></polyline>
          </svg>
        </span>
-        <span class="zy-svg" @click="starEvent" :class="isStar ? 'active' : ''" v-show="right.list.length > 0">
+        <span class="zy-svg" @click="starEvent" :class="isStar ? 'active' : ''" v-show="right.list.length > 0 || isStar">
          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="favouriteIconTitle">
            <title id="favouriteIconTitle">收藏</title>
            <path d="M12,21 L10.55,19.7051771 C5.4,15.1242507 2,12.1029973 2,8.39509537 C2,5.37384196 4.42,3 7.5,3 C9.24,3 10.91,3.79455041 12,5.05013624 C13.09,3.79455041 14.76,3 16.5,3 C19.58,3 22,5.37384196 22,8.39509537 C22,12.1029973 18.6,15.1242507 13.45,19.7149864 L12,21 Z"></path>
@@ -217,7 +217,7 @@
      </div>
    </transition>
    <transition name="slideX">
-      <div v-if="state.showChannelList" class="list" v-clickoutside="closeListEvent">
+      <div v-if="state.showChannelList && channelList && channelList.length > 0" class="list" v-clickoutside="closeListEvent">
         <div class="list-top">
          <span class="list-top-title">频道列表</span>
          <span class="list-top-close zy-svg" @click="state.showChannelList = false">
@@ -639,6 +639,7 @@ export default {
    },
    playVideo (index = 0, time = 0) {
      this.isLive = false
+      this.isStar = false
      this.exportablePlaylist = false
      this.fetchPlaylist().then(async (fullList) => {
        let playlist = fullList[0].list // ZY支持的已移到首位
@@ -710,7 +711,7 @@ export default {
              name: res.name
            })
            resolve(res.fullList)
-          })
+          }).catch(err => { this.$message.error('播放地址可能已失效，请换源并调整收藏', err); this.name = this.video.info.name; this.updateStar(); this.otherEvent() })
        } else {
          res = this.DetailCache[cacheKey]
          this.name = res.name
--- a/src/components/Recommendation.vue
+++ b/src/components/Recommendation.vue
@@ -1,39 +1,51 @@
 <template>
  <div class="listpage" id="recommendations">
    <div class="listpage-header" id="recommendations-header">
-        <el-switch v-model="setting.recommendationViewMode" active-text="海报" active-value="picture" inactive-text="列表" inactive-value="table" @change="updateViewMode"></el-switch>
        <el-button type="text">视频数：{{ recommendations.length }}</el-button>
-        <el-select v-model="selectedAreas" size="small" multiple placeholder="地区" popper-class="popper" :popper-append-to-body="false">
-          <el-option
-            v-for="item in areas"
-            :key="item"
-            :label="item"
-            :value="item">
-          </el-option>
-        </el-select>
-        <el-select v-model="selectedTypes" size="small" multiple placeholder="类型" popper-class="popper" :popper-append-to-body="false">
-          <el-option
-            v-for="item in types"
-            :key="item"
-            :label="item"
-            :value="item">
-          </el-option>
-        </el-select>
-        <el-select v-model="sortKeyword" size="small" placeholder="排序" popper-class="popper" :popper-append-to-body="false">
-          <el-option
-            v-for="item in sortKeywords"
-            :key="item"
-            :label="item"
-            :value="item">
-          </el-option>
-        </el-select>
        <el-button :loading="loading" @click.stop="updateEvent" icon="el-icon-refresh">更新推荐</el-button>
    </div>
+    <div class="toolbar" v-show="showToolbar">
+      <el-select v-model="selectedAreas" size="small" multiple placeholder="地区" popper-class="popper" :popper-append-to-body="false" @remove-tag="refreshFilteredList" @change="refreshFilteredList">
+        <el-option
+          v-for="item in areas"
+          :key="item"
+          :label="item"
+          :value="item">
+        </el-option>
+      </el-select>
+      <el-select v-model="selectedTypes" size="small" multiple placeholder="类型" popper-class="popper" :popper-append-to-body="false" @remove-tag="refreshFilteredList" @change="refreshFilteredList">
+        <el-option
+          v-for="item in types"
+          :key="item"
+          :label="item"
+          :value="item">
+        </el-option>
+      </el-select>
+      <el-select v-model="sortKeyword" size="small" placeholder="排序" popper-class="popper" :popper-append-to-body="false" @change="refreshFilteredList">
+        <el-option
+          v-for="item in sortKeywords"
+          :key="item"
+          :label="item"
+          :value="item">
+        </el-option>
+      </el-select>
+      <span>
+       上映区间：
+       <el-input-number size="small" v-model="selectedYears.start" :min=0 :max="new Date().getFullYear()" controls-position="right" step-strictly @change="refreshFilteredList"></el-input-number>
+       至
+       <el-input-number size="small" v-model="selectedYears.end" :min=0 :max="new Date().getFullYear()" controls-position="right" step-strictly @change="refreshFilteredList"></el-input-number>
+       </span>
+    </div>
+    <el-divider class="listpage-header-divider" content-position="right">
+      <el-button type="text" size="mini" @click="toggleViewMode">视图切换</el-button>
+      <el-button type="text" size="mini" @click='() => { showToolbar = !showToolbar; if (!showToolbar) this.refreshFilteredList() }' title="收起工具栏会重置筛选排序">{{ showToolbar ? '隐藏工具栏' : '显示工具栏' }}</el-button>
+      <el-button type="text" size="mini" @click="backTop">回到顶部</el-button>
+    </el-divider>
    <div class="listpage-body" id="recommendations-body" >
      <div class="show-table" id="star-table" v-if="setting.recommendationViewMode === 'table'">
        <el-table size="mini" fit height="100%" row-key="id"
        ref="recommendationsTable"
-        :data="filteredRecommendations"
+        :data="filteredList"
        @row-click="detailEvent">
          <el-table-column
            prop="name"
@@ -55,13 +67,13 @@
            width="100"
            align="center">
          </el-table-column>
-          <el-table-column v-if="filteredRecommendations.some(e => e.rate)"
+          <el-table-column v-if="filteredList.some(e => e.rate)"
            prop="rate"
            align="center"
            width="100"
            label="豆瓣评分">
          </el-table-column>
-          <el-table-column v-if="filteredRecommendations.some(e => e.detail.note)"
+          <el-table-column v-if="filteredList.some(e => e.detail.note)"
            prop="detail.note"
            label="备注">
          </el-table-column>
@@ -80,7 +92,7 @@
        </el-table>
      </div>
      <div class="show-picture" id="star-picture" v-if="setting.recommendationViewMode === 'picture'">
-        <Waterfall ref="recommendationsWaterfall" :list="filteredRecommendations" :gutter="20" :width="240"
+        <Waterfall ref="recommendationsWaterfall" :list="filteredList" :gutter="20" :width="240"
          :breakpoints="{
            1200: { //当屏幕宽度小于等于1200
              rowPerView: 4,
@@ -138,11 +150,15 @@ export default {
      sites: [],
      loading: false,
      types: [],
-      selectedTypes: [],
      areas: [],
+      filteredList: [],
+      // Toolbar
+      showToolbar: false,
      selectedAreas: [],
+      selectedTypes: [],
      sortKeyword: '',
-      sortKeywords: ['上映', '评分', '默认']
+      sortKeywords: ['按片名', '按上映年份', '按更新时间'],
+      selectedYears: { start: 0, end: new Date().getFullYear() }
    }
  },
  components: {
@@ -188,11 +204,6 @@ export default {
      set (val) {
        this.SET_SETTING(val)
      }
-    },
-    filteredRecommendations () {
-      let filteredData = this.recommendations.filter(x => (this.selectedAreas.length === 0) || this.selectedAreas.includes(x.detail.area))
-      filteredData = filteredData.filter(x => (this.selectedTypes.length === 0) || this.selectedTypes.includes(x.detail.type))
-      return filteredData
    }
  },
  watch: {
@@ -201,30 +212,72 @@ export default {
        if (this.$refs.recommendationsWaterfall) this.$refs.recommendationsWaterfall.resize()
      }
    },
-    sortKeyword () {
-      switch (this.sortKeyword) {
-        case '上映':
-          this.recommendations = this.recommendations.sort(function (a, b) {
-            return b.detail.year - a.detail.year
-          })
-          break
-        case '评分':
-          this.recommendations.sort(function (a, b) {
-            return b.rate - a.rate
-          })
-          break
-        case '默认':
-          this.recommendations.sort(function (a, b) {
-            return b.id - a.id
-          })
-          break
-        default:
-          break
-      }
+    recommendations: {
+      handler (recommendations) {
+        this.areas = [...new Set(recommendations.map(ele => ele.detail.area))].filter(x => x)
+        this.types = [...new Set(recommendations.map(ele => ele.detail.type))].filter(x => x)
+        this.refreshFilteredList()
+      },
+      deep: true
    }
  },
  methods: {
    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE', 'SET_SETTING']),
+    toggleViewMode () {
+      this.setting.recommendationViewMode = this.setting.recommendationViewMode === 'picture' ? 'table' : 'picture'
+      if (this.setting.recommendationViewMode === 'table') {
+        setTimeout(() => { this.rowDrop() }, 100)
+      } else {
+        setTimeout(() => { if (this.$refs.recommendationsWaterfall) this.$refs.recommendationsWaterfall.refresh() }, 700)
+      }
+      setting.find().then(res => {
+        res.recommendationViewMode = this.setting.recommendationViewMode
+        setting.update(res)
+      })
+    },
+    backTop () {
+      if (this.setting.recommendationViewMode === 'picture') {
+        document.getElementById('recommendations-body').scrollTop = 0
+      } else {
+        this.$refs.recommendationsTable.bodyWrapper.scrollTop = 0
+      }
+    },
+    refreshFilteredList () {
+      if (!this.showToolbar) {
+        this.sortKeyword = ''
+        this.selectedAreas = []
+        this.selectedSearchClassNames = []
+        this.selectedYears.start = 0
+        this.selectedYears.end = new Date().getFullYear()
+        this.filteredList = this.recommendations
+      } else {
+        let filteredData = this.recommendations
+        filteredData = filteredData.filter(x => (this.selectedAreas.length === 0) || this.selectedAreas.includes(x.detail.area))
+        filteredData = filteredData.filter(x => (this.selectedTypes.length === 0) || this.selectedTypes.includes(x.detail.type))
+        filteredData = filteredData.filter(res => res.detail.year >= this.selectedYears.start)
+        filteredData = filteredData.filter(res => res.detail.year <= this.selectedYears.end)
+        switch (this.sortKeyword) {
+          case '按上映年份':
+            filteredData.sort(function (a, b) {
+              return a.detail.year - b.detail.year
+            })
+            break
+          case '按片名':
+            filteredData.sort(function (a, b) {
+              return a.detail.name.localeCompare(b.detail.name, 'zh')
+            })
+            break
+          case '按更新时间':
+            filteredData.sort(function (a, b) {
+              return new Date(b.detail.last) - new Date(a.detail.last)
+            })
+            break
+          default:
+            break
+        }
+        this.filteredList = filteredData
+      }
+    },
    detailEvent (e) {
      this.detail = {
        show: true,
@@ -236,7 +289,7 @@ export default {
      }
    },
    updateEvent () {
-      const url = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Recommendations/Recommendations.json'
+      const url = 'https://raw.githubusercontent.com/cuiocean/ZY-Player-Resources/main/Recommendations/Recommendations.json'
      this.loading = true
      const axios = require('axios')
      axios.get(url).then(res => {
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -332,13 +332,9 @@ export default {
      })
    },
    getDefaultSites () {
-      this.getDefaultdeSitesDataURL()
-      const axios = require('axios')
-      axios.get(this.setting.sitesDataURL).then(res => {
-        if (res.status === 200) {
-          if (res.data.length > 0) {
-            sites.clear().then(sites.bulkAdd(res.data))
-          }
+      zy.getDefaultSites(this.setting.sitesDataURL).then(res => {
+        if (res.length > 0) {
+          sites.clear().then(sites.bulkAdd(res))
        }
      }).catch(error => {
        this.$message.error('获取云端源站失败. ' + error)
@@ -388,7 +384,7 @@ export default {
    },
    async configDefaultParseURL () {
      if (!this.setting.defaultParseURL) await this.get7kParseURL()
-      this.d.defaultParseURL = this.setting.defaultParseURL.trim()
+      this.d.defaultParseURL = this.setting.defaultParseURL?.trim()
      this.show.configDefaultParseUrlDialog = false
      this.updateSettingEvent()
    },
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -1,17 +1,54 @@
 <template>
  <div class="listpage" id="star">
    <div class="listpage-header" id="star-header">
-        <el-switch v-model="setting.starViewMode" active-text="海报" active-value="picture" inactive-text="列表" inactive-value="table" @change="updateViewMode"></el-switch>
        <el-button @click.stop="exportFavoritesEvent" icon="el-icon-upload2" title="导出全部，自动添加扩展名">导出</el-button>
        <el-button @click.stop="importFavoritesEvent" icon="el-icon-download" title="支持同时导入多个文件">导入</el-button>
        <el-button @click.stop="removeSelectedItems" icon="el-icon-delete-solid">{{ multipleSelection.length === 0 ? "清空" : "删除所选" }}</el-button>
-        <el-button @click.stop="updateAllEvent" icon="el-icon-refresh">同步所有收藏</el-button>
+        <el-button @click.stop="updateAllEvent" icon="el-icon-refresh">检查更新</el-button>
    </div>
+    <div class="toolbar" v-show="showToolbar">
+      <el-switch v-model="onlyShowItemsHasUpdate" active-text="有更新" inactive-text="全部" @change="refreshFilteredList"></el-switch>
+      <el-select v-model="selectedAreas" size="small" multiple placeholder="地区" popper-class="popper" :popper-append-to-body="false" @remove-tag="refreshFilteredList" @change="refreshFilteredList">
+        <el-option
+          v-for="item in areas"
+          :key="item"
+          :label="item"
+          :value="item">
+        </el-option>
+      </el-select>
+      <el-select v-model="selectedTypes" size="small" multiple placeholder="类型" popper-class="popper" :popper-append-to-body="false" @remove-tag="refreshFilteredList" @change="refreshFilteredList">
+        <el-option
+          v-for="item in types"
+          :key="item"
+          :label="item"
+          :value="item">
+        </el-option>
+      </el-select>
+      <el-select v-model="sortKeyword" size="small" placeholder="排序" popper-class="popper" :popper-append-to-body="false" @change="refreshFilteredList">
+        <el-option
+          v-for="item in sortKeywords"
+          :key="item"
+          :label="item"
+          :value="item">
+        </el-option>
+      </el-select>
+      <span>
+       上映区间：
+       <el-input-number size="small" v-model="selectedYears.start" :min=0 :max="new Date().getFullYear()" controls-position="right" step-strictly @change="refreshFilteredList"></el-input-number>
+       至
+       <el-input-number size="small" v-model="selectedYears.end" :min=0 :max="new Date().getFullYear()" controls-position="right" step-strictly @change="refreshFilteredList"></el-input-number>
+       </span>
+    </div>
+    <el-divider class="listpage-header-divider" content-position="right">
+      <el-button type="text" size="mini" @click="toggleViewMode">视图切换</el-button>
+      <el-button type="text" size="mini" @click='() => { showToolbar = !showToolbar; if (!showToolbar) this.refreshFilteredList() }' title="收起工具栏会重置筛选排序">{{ showToolbar ? '隐藏工具栏' : '显示工具栏' }}</el-button>
+      <el-button type="text" size="mini" @click="backTop">回到顶部</el-button>
+    </el-divider>
    <div class="listpage-body" id="star-body">
      <div class="show-table" id="star-table"  v-if="setting.starViewMode === 'table'">
        <el-table size="mini" fit height="100%" row-key="id"
          ref="starTable"
-          :data="list"
+          :data="filteredList"
          :cell-class-name="checkUpdate"
          @row-click="detailEvent"
          @sort-change="handleSortChange"
@@ -84,7 +121,7 @@
        </el-table>
      </div>
      <div class="show-picture" id="star-picture" v-if="setting.starViewMode === 'picture'">
-        <Waterfall ref="starWaterfall" :list="list" :gutter="20" :width="240"
+        <Waterfall ref="starWaterfall" :list="filteredList" :gutter="20" :width="240"
          :breakpoints="{
            1200: { //当屏幕宽度小于等于1200
              rowPerView: 4,
@@ -155,7 +192,18 @@ export default {
      shiftDown: false,
      selectionBegin: '',
      selectionEnd: '',
-      multipleSelection: []
+      multipleSelection: [],
+      filteredList: [],
+      areas: [],
+      types: [],
+      // Toolbar
+      showToolbar: false,
+      selectedAreas: [],
+      selectedTypes: [],
+      sortKeyword: '',
+      sortKeywords: ['按片名', '按上映年份', '按更新时间'],
+      selectedYears: { start: 0, end: new Date().getFullYear() },
+      onlyShowItemsHasUpdate: false
    }
  },
  components: {
@@ -225,10 +273,77 @@ export default {
        this.numNoUpdate = 0
        this.$message.warning('未查询到任何更新')
      }
+    },
+    list: {
+      handler (list) {
+        this.areas = [...new Set(list.map(ele => ele.detail.area))].filter(x => x)
+        this.types = [...new Set(list.map(ele => ele.detail.type))].filter(x => x)
+        this.refreshFilteredList()
+      },
+      deep: true
    }
  },
  methods: {
    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE', 'SET_SETTING']),
+    toggleViewMode () {
+      this.setting.starViewMode = this.setting.starViewMode === 'picture' ? 'table' : 'picture'
+      if (this.setting.starViewMode === 'table') {
+        setTimeout(() => { this.rowDrop() }, 100)
+        this.showShiftPrompt()
+      } else {
+        setTimeout(() => { if (this.$refs.starWaterfall) this.$refs.starWaterfall.refresh() }, 700)
+      }
+      setting.find().then(res => {
+        res.starViewMode = this.setting.starViewMode
+        setting.update(res)
+      })
+    },
+    backTop () {
+      if (this.setting.starViewMode === 'picture') {
+        document.getElementById('star-body').scrollTop = 0
+      } else {
+        this.$refs.starTable.bodyWrapper.scrollTop = 0
+      }
+    },
+    refreshFilteredList () {
+      if (!this.showToolbar) {
+        this.sortKeyword = ''
+        this.selectedAreas = []
+        this.selectedSearchClassNames = []
+        this.selectedYears.start = 0
+        this.selectedYears.end = new Date().getFullYear()
+        this.filteredList = this.list
+      } else {
+        let filteredData = this.list
+        filteredData = filteredData.filter(x => (this.selectedAreas.length === 0) || this.selectedAreas.includes(x.detail.area))
+        filteredData = filteredData.filter(x => (this.selectedTypes.length === 0) || this.selectedTypes.includes(x.detail.type))
+        filteredData = filteredData.filter(res => res.detail.year >= this.selectedYears.start)
+        filteredData = filteredData.filter(res => res.detail.year <= this.selectedYears.end)
+        switch (this.sortKeyword) {
+          case '按上映年份':
+            filteredData.sort(function (a, b) {
+              return a.detail.year - b.detail.year
+            })
+            break
+          case '按片名':
+            filteredData.sort(function (a, b) {
+              return a.detail.name.localeCompare(b.detail.name, 'zh')
+            })
+            break
+          case '按更新时间':
+            filteredData.sort(function (a, b) {
+              return new Date(b.detail.last) - new Date(a.detail.last)
+            })
+            break
+          default:
+            break
+        }
+        this.filteredList = filteredData
+      }
+      if (this.onlyShowItemsHasUpdate) {
+        this.filteredList = this.filteredList.filter(x => x.hasUpdate)
+      }
+    },
    handleSortChange (column, prop, order) {
      this.updateDatabase()
    },
@@ -331,7 +446,7 @@ export default {
        star.get(e.id).then(resStar => {
          if (!e.hasUpdate && e.detail.last !== doc.detail.last) {
            doc.hasUpdate = true
-            const msg = `同步"${e.name}"成功, 检查到更新。`
+            const msg = `检查到"${e.name}"有更新。`
            this.$message.success(msg)
          } else {
            this.numNoUpdate += 1
@@ -340,7 +455,7 @@ export default {
          this.getFavorites()
        })
      } catch (err) {
-        const msg = `同步"${e.name}"失败, 请重试。`
+        const msg = `更新"${e.name}"失败, 请重试。`
        this.$message.warning(msg, err)
      }
    },
@@ -488,18 +603,6 @@ export default {
        }
      })
    },
-    updateViewMode () {
-      if (this.setting.starViewMode === 'table') {
-        setTimeout(() => { this.rowDrop() }, 100)
-        this.showShiftPrompt()
-      } else {
-        setTimeout(() => { if (this.$refs.starWaterfall) this.$refs.starWaterfall.refresh() }, 700)
-      }
-      setting.find().then(res => {
-        res.starViewMode = this.setting.starViewMode
-        setting.update(res)
-      })
-    },
    showShiftPrompt () {
      if (this.setting.shiftTooltipLimitTimes === undefined) this.setting.shiftTooltipLimitTimes = 5
      if (this.setting.shiftTooltipLimitTimes) {
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -59,6 +59,10 @@ db.version(8).stores({
  })
 })

+db.version(9).stores({
+  history: '++id, [site+ids], name, type, year, index, time, duration, detail, onlinePlay, hasUpdate'
+})
+
 db.on('populate', () => {
  db.setting.bulkAdd(setting)
  db.sites.bulkAdd(sites)
--- a/src/lib/dexie/history.js
+++ b/src/lib/dexie/history.js
@@ -19,6 +19,9 @@ export default {
  async remove (id) {
    return await history.delete(id)
  },
+  async get (id) {
+    return await history.get(id)
+  },
  async clear () {
    return await history.clear()
  }
--- a/src/lib/dexie/iniData/Recommendations.json
+++ b/src/lib/dexie/iniData/Recommendations.json
--- a/src/lib/element/index.js
+++ b/src/lib/element/index.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { Message, Button, Table, TableColumn, Tag, Input, InputNumber, Dialog, Form, FormItem, Switch, Select, Option, Checkbox, Autocomplete, Col, Tree, Divider, Progress } from 'element-ui'
+import { Message, Button, Table, TableColumn, Tag, Input, InputNumber, Dialog, Form, FormItem, Switch, Select, Option, Checkbox, Autocomplete, Col, Tree, Divider, Progress, MessageBox } from 'element-ui'
 import Plugin from 'v-fit-columns'
 Vue.use(Button)
 Vue.use(Col)
@@ -21,3 +21,4 @@ Vue.use(Tree)
 Vue.use(Divider)
 Vue.use(Progress)
 Vue.prototype.$message = Message
+Vue.prototype.$msgbox = MessageBox
--- a/src/lib/site/onlineVideo.js
+++ b/src/lib/site/onlineVideo.js
@@ -35,29 +35,29 @@ const onlineVideo = {
  },
  playVideoOnBde4 (videoName, videoIndex) {
    videoName = videoName.replace(/\s/g, '')
-    var url = `https://bde4.com/search/${videoName}`
+    const url = `https://bde4.com/search/${videoName}`
    axios.get(url).then(res => {
      const $ = cheerio.load(res.data)
-      var e = $('div.search-list')
-      var searchResult = $(e).find('div>div>div>div>a').toArray()
+      const e = $('div.search-list')
+      const searchResult = $(e).find('div>div>div>div>a').toArray()
      // 获取第一个搜索结果的视频链接
-      var detailPageLink = $(searchResult[0]).attr('href')
+      const detailPageLink = $(searchResult[0]).attr('href')
      // 获取第一个搜索结果的title
-      var title = $(searchResult[0]).attr('title')
+      const title = $(searchResult[0]).attr('title')
      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
        // 如果第一个搜索结果不符合，打开搜索页面
        open(url)
      } else {
-        var detailPageFullLink = 'https://bde4.com/' + detailPageLink
+        const detailPageFullLink = 'https://bde4.com/' + detailPageLink
        // 解析详情页面
        axios.get(detailPageFullLink).then(res => {
          const $ = cheerio.load(res.data)
-          var e = $('div.info1')
-          var videoList = $(e).find('a').toArray()
-          var videoFullLink = detailPageFullLink
+          const d = $('div.info1')
+          const videoList = $(d).find('a').toArray()
+          let videoFullLink = detailPageFullLink
          // 获取index视频链接
          if (videoIndex < videoList.length) {
-            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            const indexVideoLink = $(videoList[videoIndex]).attr('href')
            if (indexVideoLink.includes('.htm')) {
              videoFullLink = 'https://bde4.com' + indexVideoLink
            }
@@ -69,31 +69,31 @@ const onlineVideo = {
  },
  playVideoOnK1080 (videoName, videoIndex) {
    videoName = videoName.replace(/\s/g, '')
-    var url = `https://k1080.net/vodsearch123/-------------.html?wd=${videoName}&submit=`
+    const url = `https://k1080.net/vodsearch123/-------------.html?wd=${videoName}&submit=`
    axios.get(url).then(res => {
      const $ = cheerio.load(res.data)
-      var e = $('#searchList')
-      var searchResult = $(e).find('li>div>a').toArray()
+      const e = $('#searchList')
+      const searchResult = $(e).find('li>div>a').toArray()
      // 获取第一个搜索结果的视频链接
-      var detailPageLink = $(searchResult[0]).attr('href')
+      const detailPageLink = $(searchResult[0]).attr('href')
      // 获取第一个搜索结果的title
-      var title = $(searchResult[0]).attr('title')
+      const title = $(searchResult[0]).attr('title')
      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
        // 如果第一个搜索结果不符合，打开搜索页面
        open(url)
      } else {
        // 解析详情页面
-        var detailPageFullLink = 'https://k1080.net' + detailPageLink
+        const detailPageFullLink = 'https://k1080.net' + detailPageLink
        axios.get(detailPageFullLink).then(res2 => {
          const $ = cheerio.load(res2.data)
          // 获取playlist1
-          var e = $('#playlist1')
+          const d = $('#playlist1')
          // 获取所有视频链接
-          var videoList = $(e).find('div>ul>li>a').toArray()
-          var videoFullLink = detailPageFullLink
+          const videoList = $(d).find('div>ul>li>a').toArray()
+          let videoFullLink = detailPageFullLink
          // 获取index视频链接
          if (videoIndex < videoList.length) {
-            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            const indexVideoLink = $(videoList[videoIndex]).attr('href')
            if (indexVideoLink.includes('.htm')) {
              videoFullLink = 'https://k1080.net' + indexVideoLink
            }
@@ -105,31 +105,31 @@ const onlineVideo = {
  },
  playVideoOnSubaibai (videoName, videoIndex) {
    videoName = videoName.replace(/\s/g, '')
-    var url = `https://www.subaibai.com/xssearch?q=${videoName}`
+    const url = `https://www.subaibai.com/xssearch?q=${videoName}`
    axios.get(url).then(res => {
      const $ = cheerio.load(res.data)
-      var e = $('div.search_list')
-      var searchResult = $(e).find('div>ul>li>h3>a').toArray()
+      const e = $('div.search_list')
+      const searchResult = $(e).find('div>ul>li>h3>a').toArray()
      // 获取第一个搜索结果的视频链接
-      var detailPageLink = $(searchResult[0]).attr('href')
+      const detailPageLink = $(searchResult[0]).attr('href')
      // 获取第一个搜索结果的title
-      var title = $(searchResult[0]).text()
+      const title = $(searchResult[0]).text()
      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
        // 如果第一个搜索结果不符合，打开搜索页面
        open(url)
      } else {
        // 解析详情页面
-        var detailPageFullLink = detailPageLink
+        const detailPageFullLink = detailPageLink
        axios.get(detailPageFullLink).then(res2 => {
          const $ = cheerio.load(res2.data)
          // 获取playlist1
-          var e = $('div.paly_list_btn')
+          const d = $('div.paly_list_btn')
          // 获取所有视频链接
-          var videoList = $(e).find('a').toArray()
+          const videoList = $(d).find('a').toArray()
          // 获取index视频链接
-          var videoFullLink = detailPageFullLink
+          let videoFullLink = detailPageFullLink
          if (videoIndex < videoList.length) {
-            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            const indexVideoLink = $(videoList[videoIndex]).attr('href')
            if (indexVideoLink.includes('.htm')) {
              videoFullLink = indexVideoLink
            }
@@ -141,31 +141,31 @@ const onlineVideo = {
  },
  playVideoOnYhdm (videoName, videoIndex) {
    videoName = videoName.replace(/\s/g, '')
-    var url = `http://www.yhdm.tv/search/${videoName}`
+    const url = `http://www.yhdm.tv/search/${videoName}`
    axios.get(url).then(res => {
      const $ = cheerio.load(res.data)
-      var e = $('div.lpic')
-      var searchResult = $(e).find('div>ul>li>h2>a').toArray()
+      const e = $('div.lpic')
+      const searchResult = $(e).find('div>ul>li>h2>a').toArray()
      // 获取第一个搜索结果的视频链接
-      var detailPageLink = $(searchResult[0]).attr('href')
+      const detailPageLink = $(searchResult[0]).attr('href')
      // 获取第一个搜索结果的title
-      var title = $(searchResult[0]).attr('title')
+      const title = $(searchResult[0]).attr('title')
      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
        // 如果第一个搜索结果不符合，打开搜索页面
        open(url)
      } else {
        // 解析详情页面
-        var detailPageFullLink = 'http://www.yhdm.tv/' + detailPageLink
+        const detailPageFullLink = 'http://www.yhdm.tv/' + detailPageLink
        axios.get(detailPageFullLink).then(res2 => {
          const $ = cheerio.load(res2.data)
          // 获取playlist1
-          var e = $('div.movurl')
+          const d = $('div.movurl')
          // 获取所有视频链接
-          var videoList = $(e).find('div>ul>li>a').toArray()
+          const videoList = $(d).find('div>ul>li>a').toArray()
          // 获取index视频链接
-          var videoFullLink = detailPageFullLink
+          let videoFullLink = detailPageFullLink
          if (videoIndex < videoList.length) {
-            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            const indexVideoLink = $(videoList[videoIndex]).attr('href')
            if (indexVideoLink.includes('.htm')) {
              videoFullLink = 'http://www.yhdm.tv/' + indexVideoLink
            }
@@ -177,31 +177,31 @@ const onlineVideo = {
  },
  playVideoOndmdm2020 (videoName, videoIndex) {
    videoName = videoName.replace(/\s/g, '')
-    var url = `http://www.dmdm2020.com/dongmansearch.html?wd=${videoName}&submit=`
+    const url = `http://www.dmdm2020.com/dongmansearch.html?wd=${videoName}&submit=`
    axios.get(url).then(res => {
      const $ = cheerio.load(res.data)
-      var e = $('#searchList')
-      var searchResult = $(e).find('ul>li>div>h4>a').toArray()
+      const e = $('#searchList')
+      const searchResult = $(e).find('ul>li>div>h4>a').toArray()
      // 获取第一个搜索结果的视频链接
-      var detailPageLink = $(searchResult[0]).attr('href')
+      const detailPageLink = $(searchResult[0]).attr('href')
      // 获取第一个搜索结果的title
-      var title = $(searchResult[0]).text()
+      const title = $(searchResult[0]).text()
      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
        // 如果第一个搜索结果不符合，打开搜索页面
        open(url)
      } else {
        // 解析详情页面
-        var detailPageFullLink = 'http://www.dmdm2020.com' + detailPageLink
+        const detailPageFullLink = 'http://www.dmdm2020.com' + detailPageLink
        axios.get(detailPageFullLink).then(res2 => {
          const $ = cheerio.load(res2.data)
          // 获取playlist1
-          var e = $('#playlist1')
+          const d = $('#playlist1')
          // 获取所有视频链接
-          var videoList = $(e).find('div>ul>li>a').toArray()
+          const videoList = $(d).find('div>ul>li>a').toArray()
          // 获取index视频链接
-          var videoFullLink = detailPageFullLink
+          let videoFullLink = detailPageFullLink
          if (videoIndex < videoList.length) {
-            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            const indexVideoLink = $(videoList[videoIndex]).attr('href')
            if (indexVideoLink.includes('.htm')) {
              videoFullLink = 'http://www.dmdm2020.com' + indexVideoLink
            }
@@ -213,31 +213,31 @@ const onlineVideo = {
  },
  playVideoOnSyrme (videoName, videoIndex) {
    videoName = videoName.replace(/\s/g, '')
-    var url = `https://syrme.top/searchs?q=${videoName}`
+    const url = `https://syrme.top/searchs?q=${videoName}`
    axios.get(url).then(res => {
      const $ = cheerio.load(res.data)
-      var e = $('ul.MovieList')
-      var searchResult = $(e).find('ul>li>article>a').toArray()
+      const e = $('ul.MovieList')
+      const searchResult = $(e).find('ul>li>article>a').toArray()
      // 获取第一个搜索结果的视频链接
-      var detailPageLink = $(searchResult[0]).attr('href')
+      const detailPageLink = $(searchResult[0]).attr('href')
      // 获取第一个搜索结果的title
-      var title = $(searchResult[0]).find('a>h2').text()
+      const title = $(searchResult[0]).find('a>h2').text()
      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
        // 如果第一个搜索结果不符合，打开搜索页面
        open(url)
      } else {
        // 解析详情页面
-        var detailPageFullLink = 'https://syrme.top' + detailPageLink
+        const detailPageFullLink = 'https://syrme.top' + detailPageLink
        axios.get(detailPageFullLink).then(res2 => {
          const $ = cheerio.load(res2.data)
          // 获取playlist1
-          var e = $('#categories-2')
+          const d = $('#categories-2')
          // 获取所有视频链接
-          var videoList = $(e).find('div>ul>li>a').toArray()
+          const videoList = $(d).find('div>ul>li>a').toArray()
          // 获取index视频链接
-          var videoFullLink = detailPageFullLink
+          let videoFullLink = detailPageFullLink
          if (videoIndex < videoList.length) {
-            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            const indexVideoLink = $(videoList[videoIndex]).attr('href')
            videoFullLink = 'https://syrme.top' + indexVideoLink
          }
          open(videoFullLink)
@@ -247,31 +247,31 @@ const onlineVideo = {
  },
  playVideoOnJpysvip (videoName, videoIndex) {
    videoName = videoName.replace(/\s/g, '')
-    var url = `https://www.jpysvip.net/vodsearch/-------------.html?wd=${videoName}&submit=`
+    const url = `https://www.jpysvip.net/vodsearch/-------------.html?wd=${videoName}&submit=`
    axios.get(url).then(res => {
      const $ = cheerio.load(res.data)
-      var e = $('#searchList')
-      var searchResult = $(e).find('ul>li>div>a').toArray()
+      const e = $('#searchList')
+      const searchResult = $(e).find('ul>li>div>a').toArray()
      // 获取第一个搜索结果的视频链接
-      var detailPageLink = $(searchResult[0]).attr('href')
+      const detailPageLink = $(searchResult[0]).attr('href')
      // 获取第一个搜索结果的title
-      var title = $(searchResult[0]).attr('title')
+      const title = $(searchResult[0]).attr('title')
      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
        // 如果第一个搜索结果不符合，打开搜索页面
        open(url)
      } else {
        // 解析详情页面
-        var detailPageFullLink = 'https://www.jpysvip.net' + detailPageLink
+        const detailPageFullLink = 'https://www.jpysvip.net' + detailPageLink
        axios.get(detailPageFullLink).then(res2 => {
          const $ = cheerio.load(res2.data)
          // 获取playlist1
-          var e = $('#playlist1')
+          const d = $('#playlist1')
          // 获取所有视频链接
-          var videoList = $(e).find('div>ul>li>a').toArray()
+          const videoList = $(d).find('div>ul>li>a').toArray()
          // 获取index视频链接
-          var videoFullLink = detailPageFullLink
+          let videoFullLink = detailPageFullLink
          if (videoIndex < videoList.length) {
-            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            const indexVideoLink = $(videoList[videoIndex]).attr('href')
            videoFullLink = 'https://www.jpysvip.net/' + indexVideoLink
          }
          open(videoFullLink)
@@ -281,31 +281,31 @@ const onlineVideo = {
  },
  playVideoOnXhkan (videoName, videoIndex) {
    videoName = videoName.replace(/\s/g, '')
-    var url = `https://www.xhkan.com/vodsearch.html?wd=${videoName}&submit=`
+    const url = `https://www.xhkan.com/vodsearch.html?wd=${videoName}&submit=`
    axios.get(url).then(res => {
      const $ = cheerio.load(res.data)
-      var e = $('#searchList')
-      var searchResult = $(e).find('ul>li>div>a').toArray()
+      const e = $('#searchList')
+      const searchResult = $(e).find('ul>li>div>a').toArray()
      // 获取第一个搜索结果的视频链接
-      var detailPageLink = $(searchResult[0]).attr('href')
+      const detailPageLink = $(searchResult[0]).attr('href')
      // 获取第一个搜索结果的title
-      var title = $(searchResult[0]).attr('title')
+      const title = $(searchResult[0]).attr('title')
      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
        // 如果第一个搜索结果不符合，打开搜索页面
        open(url)
      } else {
        // 解析详情页面
-        var detailPageFullLink = detailPageLink
+        const detailPageFullLink = detailPageLink
        axios.get(detailPageFullLink).then(res2 => {
          const $ = cheerio.load(res2.data)
          // 获取playlist1
-          var e = $('#playlist1')
+          const d = $('#playlist1')
          // 获取所有视频链接
-          var videoList = $(e).find('div>ul>li>a').toArray()
+          const videoList = $(d).find('div>ul>li>a').toArray()
          // 获取index视频链接
-          var videoFullLink = detailPageFullLink
+          let videoFullLink = detailPageFullLink
          if (videoIndex < videoList.length) {
-            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            const indexVideoLink = $(videoList[videoIndex]).attr('href')
            videoFullLink = indexVideoLink
          }
          open(videoFullLink)
--- a/src/lib/site/tools.js
+++ b/src/lib/site/tools.js
@@ -500,6 +500,14 @@ const zy = {
      }).catch(err => { reject(err) })
    })
  },
+  getDefaultSites () {
+    const url = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json'
+    return new Promise((resolve, reject) => {
+      axios.get(url).then(res => {
+        resolve(res.data)
+      }).catch(err => { reject(err) })
+    })
+  },
  proxy () {
    return new Promise((resolve, reject) => {
      setting.find().then(db => {
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
haiyangcui	7f6be795b5	v2.7.9	2021-03-29 17:49:11 +02:00
haiyangcui	d7fc97b3d7	有更新项目,进入详情页面,也清除有更新标记	2021-03-29 15:49:03 +02:00
haiyangcui	4a2aa9ee4b	历史页面添加只显示有更新过滤开关	2021-03-29 15:33:10 +02:00
haiyangcui	f4aeec0937	收藏页面添加有更新过滤开关	2021-03-29 15:31:08 +02:00
haiyangcui	ea06a52921	历史页面添加检查更新按钮	2021-03-29 15:12:11 +02:00
haiyangcui	26dc24d216	v2.7.8	2021-03-28 17:31:13 +02:00
haiyangcui	1c57c37997	降级xgplayer回2.17.3, 否则精简模式不工作	2021-03-28 17:28:49 +02:00
haiyangcui	15a6370785	增加推荐页面工具栏	2021-03-28 17:17:45 +02:00
haiyangcui	c8580ff6e6	增加历史页面工具栏	2021-03-28 16:48:33 +02:00
haiyangcui	a104e7cfa8	收藏页面工具栏	2021-03-28 16:31:48 +02:00
haiyangcui	c649d97021	升级依赖	2021-03-28 13:39:24 +02:00
haiyangcui	17601935f1	v2.7.7	2021-03-27 22:27:08 +01:00
haiyangcui	0f85e65e26	更新默认推荐视频列表	2021-03-21 23:06:10 +01:00
haiyangcui	8eb4ca5090	Gitee上的推荐文件显示"根据相关法律政策,该内容无法显示",重新指向为github上的文件	2021-03-21 22:45:19 +01:00
Hunlongyu	d6fcd151e3	直播源支持网址导入.	2021-03-17 10:06:54 +08:00
Hunlongyu	711637ac8b	var => let or const	2021-03-17 09:07:25 +08:00
Hunlongyu	1769fb9780	修改成正确的内容格式	2021-03-16 19:06:21 +08:00
Hunlongyu	40de0337be	默认显示所有支持的格式文件, 不做过滤	2021-03-16 18:35:29 +08:00
Hunlongyu	b0fbdeef15	支持 txt 文件格式的直播源和视频源本地导入.	2021-03-16 18:30:52 +08:00
cuiocean	f75d961aaa	Merge pull request #661 from cuiocean/dependabot/npm_and_yarn/elliptic-6.5.4 Bump elliptic from 6.5.3 to 6.5.4	2021-03-15 15:24:39 +01:00
buvta	12e2500fd7	点播视频地址失效时可换源并调整收藏	2021-03-13 18:21:43 +08:00
dependabot[bot]	e405225e02	Bump elliptic from 6.5.3 to 6.5.4 Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4) Signed-off-by: dependabot[bot] <support@github.com>	2021-03-11 01:23:54 +00:00
haiyangcui	dcba96a773	v2.7.6	2021-03-07 13:09:05 +01:00
haiyangcui	9910daa7c0	添加福利片过滤关键词	2021-03-07 12:54:52 +01:00
buvta	5ac57092db	停止时亦隐藏(频道列表为空)	2021-02-28 17:10:30 +08:00
buvta	8864a624f5	Revert "详情页默认选中历史播放的那集"该功能已实现，移动鼠标变换选中以切换分享播放指定集数 This reverts commit `52562a1a12`.	2021-02-28 16:14:46 +08:00
haiyangcui	72ae7494d2	当IPTV的列表为空时，不显示频道列表	2021-02-27 22:23:25 +01:00
haiyangcui	877b564322	改变海报卡片背景，增强与背景的对比	2021-02-27 21:37:37 +01:00
haiyangcui	52562a1a12	详情页默认选中历史播放的那集	2021-02-27 21:18:03 +01:00
haiyangcui	43ff812b21	实现鼠标划过card时的放大效果	2021-02-27 16:08:37 +01:00
haiyangcui	a3a26e0deb	转移getDefaultSites函数到tools.js	2021-02-23 22:51:40 +01:00
haiyangcui	289f3c3c2d	xgplayer2.18版本精简模式不工作,降级回2.17版本	2021-02-23 15:53:53 +01:00