v2.5.4

This reverts commit aa4583898a.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -41,7 +41,7 @@
     "vue-waterfall-plugin": "^1.1.0",
     "vuedraggable": "^2.24.2",
     "vuex": "^3.5.1",
-    "xgplayer": "^2.12.2",
+    "xgplayer": "^2.13.0",
     "xgplayer-hls.js": "^2.2.5"
   },
   "devDependencies": {

public/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>icon.png">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= htmlWebpackPlugin.options.title %></title>
     <script>
       var _hmt = _hmt || [];

src/assets/scss/style.scss

@@ -183,7 +183,7 @@
 // scroll
 .zy-scroll{
   &::-webkit-scrollbar{
-    width: 5px;
+    width: 10px;
     height: 1px;
   }
   &::-webkit-scrollbar-thumb {
@@ -209,6 +209,7 @@
   .listpage-content{
     height: 100%;
     position: relative;
+    font-size: 1rem;
     .listpage-header{
       width: 100%;
       height: 40px;
@@ -217,11 +218,6 @@
       justify-content: space-between;
       padding-left: 50px;
       padding-right: 50px;
-      .btn{
-        &:hover{
-          cursor: pointer;
-        }
-      }
       .el-button{
         font-size: 1rem;
         border: none;
@@ -241,15 +237,33 @@
       }
       .el-table{
         height: 100%;
+        width: 100%;
         overflow-y: auto;
         font-size: 1rem;
       }
+      .el-table__body-wrapper{
+        &::-webkit-scrollbar{
+          width: 10px;
+          height: 1px;
+        }
+        &::-webkit-scrollbar-thumb {
+          border-radius: 10px;
+          position: absolute;
+        }
+        &::-webkit-scrollbar-track {
+          border-radius: 10px;
+          position: absolute;
+        }
+      }
       .el-input{
         width: 200px;
       }
       .el-table__body td,.el-table__body th{
         border-bottom: 1px solid;
       }
+      .el-table--enable-row-hover .el-table__body tr:hover>td{
+        transform: scale(1.02);
+      }
       .el-table .highlight{
         color: var(--highlight-color) !important;
       }
@@ -303,19 +317,4 @@
       box-shadow: 0em -3em 0 0, 2em -2em 0 -1em, 3em 0 0 -1em, 2em 2em 0 -1em, 0 3em 0 -1em, -2em 2em 0 0, -3em 0em 0 0, -2em -2em 0 0.2em;
     }
   }
-}
-
-.el-table, .el-table__body-wrapper{
-  &::-webkit-scrollbar{
-    width: 5px;
-    height: 1px;
-  }
-  &::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    position: absolute;
-  }
-  &::-webkit-scrollbar-track {
-    border-radius: 10px;
-    position: absolute;
-  }
 }

src/assets/scss/theme/dark.scss

@@ -399,6 +399,18 @@
           background-color: var(--d-bgc-1);
           border-bottom-color: var(--d-c-2);
         }
+        .el-table__body-wrapper{
+          &:hover{
+            &::-webkit-scrollbar-thumb {
+              box-shadow: var(--d-bsc-scroll);
+              background: var(--d-c-5);
+            }
+            &::-webkit-scrollbar-track {
+              box-shadow: var(--d-bsc-scroll);
+              background: var(--d-bgc-1);
+            }
+          }
+        }
         .el-table--enable-row-hover .el-table__body tr:hover>td{
           background-color: var(--d-bgc-2);
         }

src/assets/scss/theme/green.scss

@@ -395,6 +395,18 @@
           background-color: var(--g-bgc-1);
           border-bottom-color: var(--g-c-2);
         }
+        .el-table__body-wrapper{
+          &:hover{
+            &::-webkit-scrollbar-thumb {
+              box-shadow: var(--g-bsc-scroll);
+              background: var(--g-c-5);
+            }
+            &::-webkit-scrollbar-track {
+              box-shadow: var(--g-bsc-scroll);
+              background: var(--g-bgc-1);
+            }
+          }
+        }
         .el-table--enable-row-hover .el-table__body tr:hover>td{
           background-color: var(--g-bgc-2);
         }

src/assets/scss/theme/light.scss

@@ -395,6 +395,18 @@
           background-color: var(--l-bgc-1);
           border-bottom-color: var(--l-c-2);
         }
+        .el-table__body-wrapper{
+          &:hover{
+            &::-webkit-scrollbar-thumb {
+              box-shadow: var(--l-bsc-scroll);
+              background: var(--l-c-5);
+            }
+            &::-webkit-scrollbar-track {
+              box-shadow: var(--l-bsc-scroll);
+              background: var(--l-bgc-1);
+            }
+          }
+        }
         .el-table--enable-row-hover .el-table__body tr:hover>td{
           background-color: var(--l-bgc-2);
         }

src/assets/scss/theme/pink.scss

@@ -394,6 +394,18 @@
           background-color: var(--p-bgc-1);
           border-bottom-color: var(--p-c-2);
         }
+        .el-table__body-wrapper{
+          &:hover{
+            &::-webkit-scrollbar-thumb {
+              box-shadow: var(--p-bsc-scroll);
+              background: var(--p-c-5);
+            }
+            &::-webkit-scrollbar-track {
+              box-shadow: var(--p-bsc-scroll);
+              background: var(--p-bgc-1);
+            }
+          }
+        }
         .el-table--enable-row-hover .el-table__body tr:hover>td{
           background-color: var(--p-bgc-2);
         }

src/background.js

@@ -3,8 +3,8 @@
 import './lib/site/server'
 import { app, protocol, BrowserWindow, globalShortcut, ipcMain } from 'electron'
 import { createProtocol } from 'vue-cli-plugin-electron-builder/lib'
-import { autoUpdater } from 'electron-updater'
 import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer'
+import { initUpdater } from './lib/update/update'
 const isDevelopment = process.env.NODE_ENV !== 'production'
 
 // 允许跨域
@@ -15,8 +15,6 @@ let mini
 
 protocol.registerSchemesAsPrivileged([{ scheme: 'app', privileges: { secure: true, standard: true } }])
 
-autoUpdater.autoDownload = false
-
 function createWindow () {
   win = new BrowserWindow({
     width: 1080,
@@ -38,6 +36,8 @@ function createWindow () {
     win.loadURL('app://./index.html')
   }
 
+  initUpdater(win)
+
   win.on('closed', () => {
     win = null
   })
@@ -100,16 +100,6 @@ ipcMain.on('win', () => {
   win.webContents.send('miniClosed')
 })
 
-ipcMain.on('update', async () => {
-  const checkForUpdates = await autoUpdater.checkForUpdates()
-  win.webContents.send('update-replay-check', checkForUpdates)
-  const res = await autoUpdater.downloadUpdate()
-  win.webContents.send('update-replay-download', res)
-  autoUpdater.on('update-downloaded', () => {
-    win.webContents.send('update-replay-downloaded', 'downloaded')
-  })
-})
-
 const gotTheLock = app.requestSingleInstanceLock()
 if (!gotTheLock) {
   app.quit()

src/components/Detail.vue

@@ -141,59 +141,56 @@ export default {
         this.m3u8List = dd._t.split('#')
       }
     },
-    playEvent (n) {
+    async playEvent (n) {
       if (!this.playOnline) {
-        history.find({ site: this.detail.key, ids: this.detail.info.id }).then(res => {
-          if (res) {
-            this.video = { key: res.site, info: { id: res.ids, name: res.name, index: n, site: this.detail.site } }
-          } else {
-            this.video = { key: this.detail.key, info: { id: this.detail.info.id, name: this.detail.info.name, index: n, site: this.detail.site } }
-          }
-        })
+        const db = await history.find({ site: this.detail.key, ids: this.detail.info.id })
+        if (db) {
+          this.video = { key: db.site, info: { id: db.ids, name: db.name, index: n, site: this.detail.site } }
+        } else {
+          this.video = { key: this.detail.key, info: { id: this.detail.info.id, name: this.detail.info.name, index: n, site: this.detail.site } }
+        }
         this.view = 'Play'
         this.detail.show = false
       } else {
-        history.find({ site: this.detail.key, ids: this.detail.info.id }).then(res => {
-          if (res) {
-            res.index = n
-            history.update(res.id, res)
-          } else {
-            const doc = {
-              site: this.detail.key,
-              ids: this.detail.info.id,
-              name: this.detail.info.name,
-              type: this.detail.info.type,
-              year: this.detail.info.year,
-              index: n,
-              time: ''
-            }
-            history.add(doc)
+        const db = await history.find({ site: this.detail.key, ids: this.detail.info.id })
+        if (db) {
+          db.index = n
+          history.update(db.id, db)
+        } else {
+          const doc = {
+            site: this.detail.key,
+            ids: this.detail.info.id,
+            name: this.detail.info.name,
+            type: this.detail.info.type,
+            year: this.detail.info.year,
+            index: n,
+            time: ''
           }
-        })
+          history.add(doc)
+        }
         onlineVideo.playVideoOnline(this.selectedOnlineSite, this.detail.info.name, n)
       }
     },
-    starEvent () {
-      star.find({ key: this.detail.key, ids: this.info.id }).then(res => {
-        if (res) {
-          this.$message.info('该影片已被收藏')
-        } else {
-          const docs = {
-            key: this.detail.key,
-            ids: this.info.id,
-            name: this.info.name,
-            type: this.info.type,
-            year: this.info.year,
-            last: this.info.last,
-            note: this.info.note
-          }
-          star.add(docs).then(res => {
-            this.$message.success('收藏成功')
-          })
+    async starEvent () {
+      const db = await star.find({ key: this.detail.key, ids: this.info.id })
+      if (db) {
+        this.$message.info('该影片已被收藏')
+      } else {
+        const docs = {
+          key: this.detail.key,
+          ids: this.info.id,
+          site: this.detail.site,
+          name: this.info.name,
+          type: this.info.type,
+          year: this.info.year,
+          note: this.info.note,
+          last: this.info.last
+
         }
-      }).catch(() => {
-        this.$message.warning('收藏失败')
-      })
+        star.add(docs).then(res => {
+          this.$message.success('收藏成功')
+        })
+      }
     },
     togglePlayOnlineEvent () {
       this.playOnline = !this.playOnline

src/components/EditSites.vue

@@ -1,37 +1,36 @@
 <template>
   <div class="listpage" id="editSites">
     <div class="listpage-content">
-      <div class="listpage-header" v-show="!eableBatchEdit">
-        <el-switch v-model="eableBatchEdit" active-text="批处理分组">></el-switch>
-        <el-button @click.stop="addSite" type="text">添加</el-button>
-        <el-button @click.stop="exportSites" type="text">导出</el-button>
-        <el-button @click.stop="importSites" type="text">导入</el-button>
-        <el-button @click.stop="removeAllSites" type="text">清空</el-button>
-        <el-button @click.stop="resetSitesEvent" type="text">重置</el-button>
+      <div class="listpage-header" v-show="!enableBatchEdit">
+        <el-switch v-model="enableBatchEdit" active-text="批处理分组">></el-switch>
+        <el-button @click.stop="addSite" icon="el-icon-document-add">新增</el-button>
+        <el-button @click.stop="exportSites" icon="el-icon-upload2" >导出</el-button>
+        <el-button @click.stop="importSites" icon="el-icon-download">导入</el-button>
+        <el-button @click.stop="removeAllSites" icon="el-icon-delete-solid">清空</el-button>
+        <el-button @click.stop="resetSitesEvent" icon="el-icon-refresh-left">重置</el-button>
       </div>
-      <div class="listpage-header" v-show="eableBatchEdit">
-        <el-switch v-model="eableBatchEdit" active-text="批处理分组"></el-switch>
+      <div class="listpage-header" v-show="enableBatchEdit">
+        <el-switch v-model="enableBatchEdit" active-text="批处理分组"></el-switch>
         <el-input placeholder="新组名" v-model="batchGroupName"></el-input>
         <el-switch v-model="batchIsActive" :active-value="1" :inactive-value="0" active-text="自选源"></el-switch>
         <el-button type="primary" icon="el-icon-edit" @click.stop="saveBatchEdit">保存</el-button>
       </div>
       <div class="listpage-body" id="sites-table">
         <el-table
-          size="mini"
+          ref="editSitesTable"
+          size="mini" fit height="100%" row-key="id"
           :data="sites"
-          row-key="id"
-          @selection-change="handleSelectionChange">
+          @selection-change="handleSelectionChange"
+          @sort-change="handleSortChange">
           <el-table-column
             type="selection"
-            v-if="eableBatchEdit">
+            v-if="enableBatchEdit">
           </el-table-column>
           <el-table-column
             prop="name"
             label="资源名">
           </el-table-column>
           <el-table-column
-            :sort-by="['isActive', 'name']"
-            sortable
             prop="isActive"
             label="自选源">
             <template slot-scope="scope">
@@ -55,7 +54,7 @@
           </el-table-column>
           <el-table-column
             label="操作"
-            header-align="center"
+            header-align="right"
             align="right">
             <template slot-scope="scope">
               <el-button size="mini" @click.stop="moveToTopEvent(scope.row)" type="text">置顶</el-button>
@@ -67,7 +66,7 @@
     </div>
     <!-- 编辑页面 -->
     <div>
-      <el-dialog :visible.sync="dialogVisible" v-if='dialogVisible' :title="dialogType==='edit'?'编辑源':'添加源'" :append-to-body="true" @close="closeDialog">
+      <el-dialog :visible.sync="dialogVisible" v-if='dialogVisible' :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="请输入源站名" />
@@ -78,6 +77,12 @@
           <el-form-item label="下载接口" prop='download'>
             <el-input v-model="siteInfo.download" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="请输入Download接口地址，可以空着"/>
           </el-form-item>
+          <el-form-item label="分组" prop='group'>
+            <el-input v-model="siteInfo.group" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="请输入分组"/>
+          </el-form-item>
+          <el-form-item label="源站标识" prop='key'>
+            <el-input v-model="siteInfo.key" placeholder="请输入源站标识，如果为空，系统则自动生成" />
+          </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
           <el-button @click="closeDialog">取消</el-button>
@@ -106,9 +111,12 @@ export default {
       dialogType: 'new',
       dialogVisible: false,
       siteInfo: {
+        key: '',
         name: '',
         api: '',
-        download: ''
+        download: '',
+        group: '',
+        isActive: 1
       },
       rules: {
         name: [
@@ -121,7 +129,7 @@ export default {
           { required: false, trigger: 'blur' }
         ]
       },
-      eableBatchEdit: false,
+      enableBatchEdit: false,
       batchGroupName: '',
       batchIsActive: 1,
       multipleSelection: []
@@ -165,6 +173,9 @@ export default {
     handleSelectionChange (rows) {
       this.multipleSelection = rows
     },
+    handleSortChange (column, prop, order) {
+      this.updateDatabase(this.sites)
+    },
     saveBatchEdit () {
       this.multipleSelection.forEach(ele => {
         if (this.batchGroupName) {
@@ -186,9 +197,12 @@ export default {
       this.dialogType = 'new'
       this.dialogVisible = true
       this.siteInfo = {
+        key: '',
         name: '',
         api: '',
-        download: ''
+        download: '',
+        group: '',
+        isActive: 1
       }
     },
     editSite (siteInfo) {
@@ -225,22 +239,26 @@ export default {
       }
       var randomstring = require('randomstring')
       var doc = {
-        key: this.dialogType === 'edit' ? this.siteInfo.key : randomstring.generate(6),
+        key: this.dialogType === 'edit' ? this.siteInfo.key : this.siteInfo.key ? this.siteInfo.key : randomstring.generate(6),
         id: this.dialogType === 'edit' ? this.siteInfo.id : this.sites[this.sites.length - 1].id + 1,
         name: this.siteInfo.name,
         api: this.siteInfo.api,
-        download: this.siteInfo.download
+        download: this.siteInfo.download,
+        group: this.siteInfo.group,
+        isActive: this.siteInfo.isActive
       }
       const _hmt = window._hmt
       _hmt.push(['_trackEvent', 'site', 'add', `${this.siteInfo.name}: ${this.siteInfo.api}`])
       if (this.dialogType === 'edit') sites.remove(this.siteInfo.id)
       sites.add(doc).then(res => {
         this.siteInfo = {
+          key: '',
           name: '',
           api: '',
-          download: ''
+          download: '',
+          group: ''
         }
-        this.dialogType === 'edit' ? this.$message.success('修改成功！') : this.$message.success('添加新源成功！')
+        this.dialogType === 'edit' ? this.$message.success('修改成功！') : this.$message.success('新增源成功！')
         this.dialogVisible = false
         this.getSites()
       })
@@ -307,7 +325,12 @@ export default {
       this.sites.sort(function (x, y) { return x.key === i.key ? -1 : y.key === i.key ? 1 : 0 })
       this.updateDatabase()
     },
-    isActiveChangeEvent () {
+    syncTableData () {
+      if (this.$refs.editSitesTable.tableData && this.$refs.editSitesTable.tableData.length === this.sites.length) {
+        this.sites = this.$refs.editSitesTable.tableData
+      }
+    },
+    isActiveChangeEvent (row) {
       this.updateDatabase()
     },
     resetId (inArray) {
@@ -318,6 +341,8 @@ export default {
       })
     },
     updateDatabase () {
+      // 因为el-table的数据是单向绑定,我们先同步el-table里的数据和其绑定的数据
+      this.syncTableData()
       sites.clear().then(res => {
         var id = 1
         this.sites.forEach(ele => {
@@ -332,7 +357,7 @@ export default {
     },
     rowDrop () {
       const tbody = document.getElementById('sites-table').querySelector('.el-table__body-wrapper tbody')
-      const _this = this
+      var _this = this
       Sortable.create(tbody, {
         onEnd ({ newIndex, oldIndex }) {
           const currRow = _this.sites.splice(oldIndex, 1)[0]

src/components/Film.vue

@@ -87,6 +87,7 @@
               <ul>
                 <li v-for="(i, j) in searchContents" :key="j" @click="detailEvent(i.site, i)">
                   <span class="name">{{i.name}}</span>
+                  <span class="site">{{i.site.name}}</span>
                   <span class="type">{{i.type}}</span>
                   <span class="time">{{i.year}}</span>
                   <span class="note">{{i.note}}</span>
@@ -136,7 +137,7 @@ export default {
       searchTxt: '',
       searchContents: [],
       // 福利片关键词
-      r18KeyWords: ['伦理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番']
+      r18KeyWords: ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番']
     }
   },
   components: {
@@ -313,37 +314,34 @@ export default {
         info: e
       }
     },
-    playEvent (site, e) {
-      history.find({ site: site.key, ids: e.id }).then(res => {
-        if (res) {
-          this.video = { key: res.site, info: { id: res.ids, name: res.name, index: res.index, site: site } }
-        } else {
-          this.video = { key: site.key, info: { id: e.id, name: e.name, index: 0, site: site } }
-        }
-      })
+    async playEvent (site, e) {
+      const db = await history.find({ site: site.key, ids: e.id })
+      if (db) {
+        this.video = { key: db.site, info: { id: db.ids, name: db.name, index: db.index, site: site } }
+      } else {
+        this.video = { key: site.key, info: { id: e.id, name: e.name, index: 0, site: site } }
+      }
       this.view = 'Play'
     },
-    starEvent (site, e) {
-      star.find({ key: site.key, ids: e.id }).then(res => {
-        if (res) {
-          this.$message.info('已存在')
-        } else {
-          const docs = {
-            key: site.key,
-            ids: e.id,
-            name: e.name,
-            type: e.type,
-            year: e.year,
-            last: e.last,
-            note: e.note
-          }
-          star.add(docs).then(res => {
-            this.$message.success('收藏成功')
-          })
+    async starEvent (site, e) {
+      const db = await star.find({ key: site.key, ids: e.id })
+      if (db) {
+        this.$message.info('已存在')
+      } else {
+        const docs = {
+          key: site.key,
+          ids: e.id,
+          site: site,
+          name: e.name,
+          type: e.type,
+          year: e.year,
+          last: e.last,
+          note: e.note
         }
-      }).catch(() => {
-        this.$message.warning('收藏失败')
-      })
+        star.add(docs).then(res => {
+          this.$message.success('收藏成功')
+        })
+      }
     },
     shareEvent (site, e) {
       this.share = {
@@ -481,7 +479,9 @@ export default {
           this.type = {}
           this.list = []
         } else {
-          this.sites = res.filter(x => x.isActive)
+          this.sites = res.filter((item, index, self) => {
+            return self.indexOf(item) >= 0 && item.isActive
+          })
           this.site = this.sites[0]
           this.siteClick(this.site)
         }

src/components/History.vue

@@ -2,12 +2,12 @@
   <div class="listpage" id="history">
     <div class="listpage-content">
       <div class="listpage-header">
-        <el-button @click.stop="exportHistory" type="text">导出</el-button>
-        <el-button @click.stop="importHistory" type="text">导入</el-button>
-        <el-button @click.stop="clearAllHistory" type="text">清空</el-button>
+        <el-button @click.stop="exportHistory" icon="el-icon-upload2">导出</el-button>
+        <el-button @click.stop="importHistory" icon="el-icon-download">导入</el-button>
+        <el-button @click.stop="clearAllHistory" icon="el-icon-delete-solid">清空</el-button>
       </div>
       <div class="listpage-body" id="history-table">
-        <el-table size="mini" fit :data="history" row-key="id" @row-click="detailEvent">
+        <el-table size="mini" fit height="100%" :data="history" row-key="id" @row-click="detailEvent">
           <el-table-column
             prop="name"
             label="片名">
@@ -30,7 +30,7 @@
           </el-table-column>
           <el-table-column
             label="操作"
-            header-align="center"
+            header-align="right"
             align="right">
             <template slot-scope="scope">
               <el-button @click.stop="playEvent(scope.row)" type="text">播放</el-button>
@@ -113,14 +113,13 @@ export default {
         }
       }
     },
-    playEvent (e) {
-      history.find({ site: e.site, ids: e.ids }).then(res => {
-        if (res) {
-          this.video = { key: res.site, info: { id: res.ids, name: res.name, index: res.index } }
-        } else {
-          this.video = { key: e.site, info: { id: e.ids, name: e.name, index: 0 } }
-        }
-      })
+    async playEvent (e) {
+      const db = await history.find({ site: e.site, ids: e.ids })
+      if (db) {
+        this.video = { key: db.site, info: { id: db.ids, name: db.name, index: db.index } }
+      } else {
+        this.video = { key: e.site, info: { id: e.ids, name: e.name, index: 0 } }
+      }
       this.view = 'Play'
     },
     shareEvent (e) {

src/components/IPTV.vue

@@ -1,60 +1,68 @@
 <template>
   <div class="listpage" id="IPTV">
     <div class="listpage-content">
-      <div class="listpage-header" v-show="!eableBatchEdit">
-        <el-switch v-model="eableBatchEdit" active-text="批处理分组"></el-switch>
-        <el-button type="text">总频道数:{{iptvList.length}}</el-button>
-        <el-button @click.stop="exportChannels" type="text">导出</el-button>
-        <el-button @click.stop="importChannels" type="text">导入</el-button>
-        <el-button @click.stop="removeAllChannels" type="text">清空</el-button>
-        <el-button @click.stop="resetChannelsEvent" type="text">重置</el-button>
+      <div class="listpage-header" v-show="!enableBatchEdit">
+        <el-switch v-model="enableBatchEdit" active-text="批处理分组"></el-switch>
+        <el-button @click.stop="exportChannels" icon="el-icon-upload2" >导出</el-button>
+        <el-button @click.stop="importChannels" icon="el-icon-download">导入</el-button>
+        <el-button @click.stop="removeAllChannels" icon="el-icon-delete-solid">清空</el-button>
+        <el-button @click.stop="resetChannelsEvent" icon="el-icon-refresh-left">重置</el-button>
       </div>
-      <div class="listpage-header" v-show="eableBatchEdit">
-        <el-switch v-model="eableBatchEdit" active-text="批处理分组"></el-switch>
+      <div class="listpage-header" v-show="enableBatchEdit">
+        <el-switch v-model="enableBatchEdit" active-text="批处理分组"></el-switch>
         <el-input placeholder="新组名" v-model="batchGroupName"></el-input>
         <el-button type="primary" icon="el-icon-edit" @click.stop="saveBatchEdit">保存</el-button>
       </div>
       <div class="listpage-body" id="iptv-table">
         <el-table
-              :data="filteredTableData"
-              row-key="id"
-              @row-click="playEvent"
-              @selection-change="handleSelectionChange">
-              <el-table-column
-                type="selection"
-                v-if="eableBatchEdit">
-              </el-table-column>
-              <el-table-column
-                prop="name"
-                label="频道名">
-                <template #header>
-                  <el-input
-                  placeholder="搜索"
-                  size="mini"
-                  v-model.trim="searchTxt">
-                  <i slot="prefix" class="el-input__icon el-icon-search"></i>
-                  </el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="group"
-                label="分组"
-                :filters="getFilters"
-                :filter-method="filterHandle"
-                filter-placement="bottom-end">
-                <template slot-scope="scope">
-                  <el-button type="text">{{scope.row.group}}</el-button>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="操作"
-                header-align="center"
+          ref="iptvTable"
+          size="mini" fit height="100%" row-key="id"
+          :data="filteredTableData"
+          @row-click="playEvent"
+          @selection-change="handleSelectionChange"
+          @sort-change="handleSortChange">>
+          <el-table-column
+            type="selection"
+            v-if="enableBatchEdit">
+          </el-table-column>
+          <el-table-column
+            default-sort="ascending"
+            prop="name"
+            label="频道名">
+            <template #header>
+              <el-input
+              placeholder="搜索"
+              size="mini"
+              v-model.trim="searchTxt">
+              <i slot="prefix" class="el-input__icon el-icon-search"></i>
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            sort-by="['group', 'name']"
+            sortable
+            :sort-method="sortByGroup"
+            prop="group"
+            label="分组"
+            :filters="getFilters"
+            :filter-method="filterHandle"
+            filter-placement="bottom-end">
+            <template slot-scope="scope">
+              <el-button type="text">{{scope.row.group}}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            header-align="right"
             align="right">
-                <template slot-scope="scope">
-                  <el-button @click.stop="moveToTopEvent(scope.row)" type="text">置顶</el-button>
-                  <el-button @click.stop="removeEvent(scope.row)" type="text">删除</el-button>
-                </template>
-              </el-table-column>
+            <template #header>
+              <span>总频道数:{{ iptvList.length }}</span>
+            </template>
+            <template slot-scope="scope">
+              <el-button @click.stop="moveToTopEvent(scope.row)" type="text">置顶</el-button>
+              <el-button @click.stop="removeEvent(scope.row)" type="text">删除</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
     </div>
@@ -74,7 +82,7 @@ export default {
       iptvList: [],
       searchTxt: '',
       searchRecordList: [],
-      eableBatchEdit: false,
+      enableBatchEdit: false,
       batchGroupName: '',
       multipleSelection: [],
       show: {
@@ -131,9 +139,15 @@ export default {
   },
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
+    sortByGroup (a, b) {
+      return a.group.localeCompare(b.group, 'zh')
+    },
     handleSelectionChange (rows) {
       this.multipleSelection = rows
     },
+    handleSortChange (column, prop, order) {
+      this.updateDatabase()
+    },
     saveBatchEdit () {
       if (this.multipleSelection && this.batchGroupName) {
         this.multipleSelection.forEach(ele => {
@@ -214,17 +228,17 @@ export default {
           var docs = this.iptvList
           var id = docs.length
           result.filePaths.forEach(file => {
-            if (file.endsWith('m3u')) {
+            if (file.endsWith('m3u') || file.endsWith('m3u8')) {
               const parser = require('iptv-playlist-parser')
               const playlist = fs.readFileSync(file, { encoding: 'utf-8' })
               const result = parser.parse(playlist)
               result.items.forEach(ele => {
-                if (ele.name && ele.url && ele.url.includes('.m3u8')) {
+                if (ele.name && ele.url && ele.url.endsWith('.m3u8')) {
                   var doc = {
                     id: id,
                     name: ele.name,
                     url: ele.url,
-                    group: this.determineGroup(ele.group, ele.name)
+                    group: this.determineGroup(ele.name)
                   }
                   id += 1
                   docs.push(doc)
@@ -235,12 +249,12 @@ export default {
               var str = fs.readFileSync(file)
               const json = JSON.parse(str)
               json.forEach(ele => {
-                if (ele.name && ele.url && ele.url.includes('.m3u8')) {
+                if (ele.name && ele.url && ele.url.endsWith('.m3u8')) {
                   var doc = {
                     id: id,
                     name: ele.name,
                     url: ele.url,
-                    group: ele.group === undefined ? this.determineGroup(ele.group, ele.name) : ele.group
+                    group: this.determineGroup(ele.name)
                   }
                   id += 1
                   docs.push(doc)
@@ -248,8 +262,8 @@ export default {
               })
             }
           })
-          // 获取url不重复的列表
-          const uniqueList = [...new Map(docs.map(item => [item.url, item])).values()]
+          // 获取name不重复的列表
+          const uniqueList = [...new Map(docs.map(item => [item.name, item])).values()]
           iptv.clear().then(res => {
             iptv.bulkAdd(uniqueList).then(e => {
               this.getChannels()
@@ -259,13 +273,17 @@ export default {
         }
       })
     },
-    determineGroup (group, name) {
-      if (!group) {
-        return group
+    determineGroup (name) {
+      if (name.toLowerCase().includes('cctv') && (name.includes('蓝光') || name.includes('高清'))) {
+        return '央视高清'
       } else if (name.toLowerCase().includes('cctv')) {
         return '央视'
       } else if (name.includes('卫视')) {
         return '卫视'
+      } else if (name.includes('香港') || name.includes('澳门') || name.includes('台湾') || name.includes('凤凰')) {
+        return '港澳台'
+      } else if (name.includes('高清') || name.includes('蓝光') || name.includes('1080P')) {
+        return '高清'
       } else {
         return '其他'
       }
@@ -313,10 +331,16 @@ export default {
       this.iptvList.sort(function (x, y) { return (x.name === i.name && x.url === i.url) ? -1 : (y.name === i.name && y.url === i.url) ? 1 : 0 })
       this.updateDatabase()
     },
+    syncTableData () {
+      if (this.$refs.iptvTable.tableData && this.$refs.iptvTable.tableData.length === this.iptvList.length) {
+        this.iptvList = this.$refs.iptvTable.tableData
+      }
+    },
     updateDatabase () {
+      this.syncTableData()
       iptv.clear().then(res => {
         this.resetId(this.iptvList)
-        iptv.bulkAdd(this.iptvList).then(this.getChannels())
+        iptv.bulkAdd(this.iptvList)
       })
     },
     resetId (inArray) {

src/components/Play.vue

@@ -287,7 +287,7 @@ export default {
   },
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
-    getUrls () {
+    async getUrls () {
       this.name = ''
       if (this.timer !== null) {
         clearInterval(this.timer)
@@ -307,14 +307,13 @@ export default {
       } else {
         const index = this.video.info.index | 0
         let time = 0
-        history.find({ site: this.video.key, ids: this.video.info.id }).then(res => {
-          if (res) {
-            if (res.index === index) {
-              time = res.time
-            }
+        const db = await history.find({ site: this.video.key, ids: this.video.info.id })
+        if (db) {
+          if (db.index === index) {
+            time = db.time
           }
-          this.playVideo(index, time)
-        })
+        }
+        this.playVideo(index, time)
       }
     },
     playUrl (url) {
@@ -393,34 +392,33 @@ export default {
         })
       })
     },
-    videoPlaying () {
+    async videoPlaying () {
       this.changeVideo()
-      history.find({ site: this.video.key, ids: this.video.info.id }).then(res => {
-        if (res) {
-          const doc = {
-            site: res.site,
-            ids: res.ids,
-            name: res.name,
-            type: res.type,
-            year: res.year,
-            index: this.video.info.index,
-            time: res.time
-          }
-          history.remove(res.id)
-          history.add(doc)
-        } else {
-          const doc = {
-            site: this.video.key,
-            ids: this.video.info.id,
-            name: this.video.info.name,
-            type: this.video.info.type,
-            year: this.video.info.year,
-            index: this.video.info.index,
-            time: ''
-          }
-          history.add(doc)
+      const db = await history.find({ site: this.video.key, ids: this.video.info.id })
+      if (db) {
+        const doc = {
+          site: db.site,
+          ids: db.ids,
+          name: db.name,
+          type: db.type,
+          year: db.year,
+          index: this.video.info.index,
+          time: db.time
         }
-      })
+        history.remove(db.id)
+        history.add(doc)
+      } else {
+        const doc = {
+          site: this.video.key,
+          ids: this.video.info.id,
+          name: this.video.info.name,
+          type: this.video.info.type,
+          year: this.video.info.year,
+          index: this.video.info.index,
+          time: ''
+        }
+        history.add(doc)
+      }
       this.updateStar()
       this.timerEvent()
     },
@@ -429,15 +427,14 @@ export default {
       this.checkTop()
     },
     timerEvent () {
-      this.timer = setInterval(() => {
-        history.find({ site: this.video.key, ids: this.video.info.id }).then(res => {
-          if (res) {
-            const doc = { ...res }
-            doc.time = this.xg.currentTime
-            delete doc.id
-            history.update(res.id, doc)
-          }
-        })
+      this.timer = setInterval(async () => {
+        const db = await history.find({ site: this.video.key, ids: this.video.info.id })
+        if (db) {
+          const doc = { ...db }
+          doc.time = this.xg.currentTime
+          delete doc.id
+          history.update(db.id, doc)
+        }
       }, 10000)
     },
     prevEvent () {
@@ -502,21 +499,28 @@ export default {
         this.right.history = res.reverse()
       })
     },
-    updateStar () {
+    async updateStar () {
       const info = this.video.info
-      star.find({ key: this.video.key, ids: info.id }).then(res => {
-        if (res) {
-          res.index = info.index
-          star.update(res.id, res)
-        }
-      }).catch(() => {
-        this.$message.warning('检查收藏失败')
-      })
+      const db = await star.find({ key: this.video.key, ids: info.id })
+      if (db) {
+        db.index = info.index
+        star.update(db.id, db)
+      }
     },
-    starEvent () {
+    async starEvent () {
       const info = this.video.info
-      star.find({ key: this.video.key, ids: info.id }).then(res => {
-        const doc = {
+      const db = await star.find({ key: this.video.key, ids: info.id })
+      if (db) {
+        star.remove(db.id).then(res => {
+          if (res) {
+            this.$message.warning('取消收藏失败')
+          } else {
+            this.$message.success('取消收藏成功')
+            this.isStar = false
+          }
+        })
+      } else {
+        const docs = {
           key: this.video.key,
           ids: info.id,
           name: info.name,
@@ -526,17 +530,11 @@ export default {
           note: info.note,
           index: info.index
         }
-        if (res) {
-          star.update(res.id, doc)
-        } else {
-          star.add(doc).then(starRes => {
-            this.$message.success('收藏成功')
-            this.isStar = true
-          })
-        }
-      }).catch(() => {
-        this.$message.warning('检查收藏失败')
-      })
+        star.add(docs).then(res => {
+          this.$message.success('收藏成功')
+          this.isStar = true
+        })
+      }
     },
     detailEvent () {
       this.detail = {
@@ -628,14 +626,13 @@ export default {
       fs.writeFileSync(filePath, str)
       return filePath
     },
-    checkStar () {
-      star.find({ key: this.video.key, ids: this.video.info.id }).then(res => {
-        if (res) {
-          this.isStar = true
-        } else {
-          this.isStar = false
-        }
-      })
+    async checkStar () {
+      const db = await star.find({ key: this.video.key, ids: this.video.info.id })
+      if (db) {
+        this.isStar = true
+      } else {
+        this.isStar = false
+      }
     },
     checkTop () {
       const win = remote.getCurrentWindow()
@@ -690,6 +687,7 @@ export default {
       if (this.video.iptv) {
         var channel = this.iptvList[n]
         this.video.iptv = channel
+        this.name = this.video.iptv.name
         // 是直播源，直接播放
         this.playUrl(channel.url)
       } else {
@@ -1025,16 +1023,18 @@ export default {
       if (this.xg.fullscreen) {
         this.xg.exitFullscreen()
       }
-      this.xg.destroy()
+      this.xg.src = ''
       this.config.src = ''
+      this.xg.destroy(false)
+      this.xg = null
       this.name = ''
       this.right.list = []
       this.showNext = false
       setTimeout(() => {
-        this.playerInstall()
         this.xg = new Hls(this.config)
+        this.playerInstall()
         this.bindEvent()
-      }, 500)
+      }, 1000)
     },
     minMaxEvent () {
       const win = remote.getCurrentWindow()
@@ -1084,16 +1084,15 @@ export default {
   mounted () {
     this.playerInstall()
     this.xg = new Hls(this.config)
-    ipcRenderer.on('miniClosed', () => {
-      history.find({ site: this.video.key, ids: this.video.info.id }).then(res => {
-        if (res) {
-          if (this.video.info.index !== res.index) {
-            this.video.info.index = res.index
-          } else {
-            this.getUrls()
-          }
+    ipcRenderer.on('miniClosed', async () => {
+      const db = await history.find({ site: this.video.key, ids: this.video.info.id })
+      if (db) {
+        if (this.video.info.index !== db.index) {
+          this.video.info.index = db.index
+        } else {
+          this.getUrls()
         }
-      })
+      }
     })
     this.bindEvent()
     this.minMaxEvent()

src/components/Setting.vue

@@ -6,8 +6,7 @@
         <a @click="linkOpen('http://zyplayer.fun/')">官网</a>
         <a @click="linkOpen('https://github.com/Hunlongyu/ZY-Player')">Github</a>
         <a @click="linkOpen('https://github.com/Hunlongyu/ZY-Player/issues')">当前版本v{{pkg.version}} 反馈</a>
-        <a style="color:#38dd77" @click="linkOpen('https://github.com/Hunlongyu/ZY-Player/releases/tag/v' + latestVersion)" v-show="latestVersion !== pkg.version" >最新版本v{{latestVersion}}</a>
-        <a @click="checkUpdate()">检查更新</a>
+        <a style="color:#38dd77" @click="quitAndInstall()" v-show="latestVersion !== pkg.version" >最新版本v{{latestVersion}}</a>
       </div>
       <div class="view">
         <div class="title">视图</div>
@@ -353,15 +352,19 @@ export default {
       }
     },
     getLatestVersion () {
-      const cheerio = require('cheerio')
-      const axios = require('axios')
-      var url = 'https://github.com/Hunlongyu/ZY-Player/releases'
-      axios.get(url).then(res => {
-        const $ = cheerio.load(res.data)
-        var e = $('div.release-header')[0]
-        var firstResult = $(e).find('div>div>a')
-        this.latestVersion = firstResult.text()
+      ipcRenderer.send('checkForUpdate')
+      ipcRenderer.on('update-available', (e, info) => {
+        this.latestVersion = info.version
       })
+      ipcRenderer.on('update-error', () => {
+        this.$message.warning = '更新出错.'
+      })
+      ipcRenderer.on('update-downloaded', () => {
+        this.$message.info = '下载完毕, 退出安装'
+      })
+    },
+    quitAndInstall () {
+      ipcRenderer.send('quitAndInstall')
     },
     createContextMenu () {
       const { Menu, MenuItem } = remote
@@ -373,18 +376,6 @@ export default {
         e.preventDefault()
         menu.popup(remote.getCurrentWindow())
       })
-    },
-    checkUpdate () {
-      ipcRenderer.send('update')
-      ipcRenderer.on('update-replay-check', (e, res) => {
-        console.log(res, 'update-replay-check')
-      })
-      ipcRenderer.on('update-replay-download', (e, res) => {
-        console.log(res, 'update-replay-download')
-      })
-      ipcRenderer.on('update-replay-downloaded', (e, res) => {
-        console.log(res, 'update-replay-downloaded')
-      })
     }
   },
   created () {

src/components/Star.vue

@@ -2,13 +2,18 @@
   <div class="listpage" id="star">
     <div class="listpage-content">
       <div class="listpage-header">
-        <el-button @click.stop="exportFavoritesEvent" type="text">导出</el-button>
-        <el-button @click.stop="importFavoritesEvent" type="text">导入</el-button>
-        <el-button @click.stop="clearFavoritesEvent" type="text">清空</el-button>
-        <el-button @click.stop="updateAllEvent" type="text">同步所有收藏</el-button>
+        <el-button @click.stop="exportFavoritesEvent" icon="el-icon-upload2">导出</el-button>
+        <el-button @click.stop="importFavoritesEvent" icon="el-icon-download">导入</el-button>
+        <el-button @click.stop="clearFavoritesEvent" icon="el-icon-delete-solid">清空</el-button>
+        <el-button @click.stop="updateAllEvent" icon="el-icon-refresh">同步所有收藏</el-button>
       </div>
       <div class="listpage-body" id="star-table">
-        <el-table size="mini" fit :data="list" height="100%" row-key="id" :cell-class-name="checkUpdate" @row-click="detailEvent">
+        <el-table size="mini" fit height="100%" row-key="id"
+        ref="starTable"
+        :data="list"
+        :cell-class-name="checkUpdate"
+        @row-click="detailEvent"
+        @sort-change="handleSortChange">
           <el-table-column
             sortable
             :sort-method="sortByName"
@@ -57,7 +62,7 @@
           </el-table-column>
           <el-table-column
             label="操作"
-            header-align="center"
+            header-align="right"
             align="right">
             <template slot-scope="scope">
               <el-button @click.stop="playEvent(scope.row)" type="text">播放</el-button>
@@ -123,14 +128,17 @@ export default {
   },
   watch: {
     view () {
-      this.getFavorites()
       this.getAllsites()
+      this.getFavorites()
     }
   },
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
+    handleSortChange (column, prop, order) {
+      this.updateDatabase()
+    },
     sortByName (a, b) {
-      return a.name.localeCompare(b.name)
+      return a.name.localeCompare(b.name, 'zh')
     },
     sortByType (a, b) {
       return a.type.localeCompare(b.type)
@@ -156,14 +164,13 @@ export default {
         this.clearHasUpdateFlag(e)
       }
     },
-    playEvent (e) {
-      history.find({ site: e.key, ids: e.ids }).then(res => {
-        if (res) {
-          this.video = { key: e.key, info: { id: res.ids, name: res.name, index: res.index } }
-        } else {
-          this.video = { key: e.key, info: { id: e.ids, name: e.name, index: 0 } }
-        }
-      })
+    async playEvent (e) {
+      const db = await history.find({ site: e.key, ids: e.ids })
+      if (db) {
+        this.video = { key: e.key, info: { id: db.ids, name: db.name, index: db.index } }
+      } else {
+        this.video = { key: e.key, info: { id: e.ids, name: e.name, index: 0 } }
+      }
       if (e.hasUpdate) {
         this.clearHasUpdateFlag(e)
       }
@@ -191,24 +198,28 @@ export default {
         return 'highlight'
       }
     },
-    clearHasUpdateFlag (e) {
-      star.find({ id: e.id }).then(res => {
-        res.hasUpdate = false
-        star.update(e.id, res)
+    async clearHasUpdateFlag (e) {
+      const db = await star.find({ id: e.id })
+      if (db) {
+        db.hasUpdate = false
+        star.update(e.id, db)
         this.getFavorites()
-      })
+      }
     },
     updateEvent (e) {
       zy.detail(e.key, e.ids).then(res => {
         var doc = {
-          key: e.key,
           id: e.id,
+          key: e.key,
           ids: res.id,
-          last: res.last,
+          site: res.site,
           name: res.name,
           type: res.type,
           year: res.year,
-          note: res.note
+          note: res.note,
+          index: res.index,
+          last: res.last,
+          hasUpdate: res.hasUpdate
         }
         star.get(e.id).then(resStar => {
           doc.hasUpdate = resStar.hasUpdate
@@ -329,54 +340,57 @@ export default {
       }
       remote.dialog.showOpenDialog(options).then(result => {
         if (!result.canceled) {
+          var starList = this.list
           result.filePaths.forEach(file => {
             var str = fs.readFileSync(file)
             const json = JSON.parse(str)
-            star.bulkAdd(json).then(e => {
-              this.getFavorites()
+            json.forEach(ele => {
+              const starExists = starList.includes(x => x.key === ele.key && x.ids === ele.ids)
+              if (!starExists) {
+                var doc = {
+                  key: ele.key,
+                  ids: ele.ids,
+                  site: ele.site === undefined ? ele.site = this.sites.find(x => x.key === ele.key) : ele.site,
+                  name: ele.name,
+                  type: ele.type,
+                  year: ele.year,
+                  note: ele.note,
+                  index: ele.index,
+                  last: ele.last,
+                  hasUpdate: ele.hasUpdate
+                }
+                starList.push(doc)
+              }
             })
-            this.upgradeFavorites()
           })
-          this.$message.success('导入收藏成功')
+          star.clear().then(star.bulkAdd(starList).then(res => {
+            this.getFavorites()
+            this.$message.success('导入收藏成功')
+          }))
         }
       }).catch(err => {
         this.$message.error(err)
       })
     },
-    upgradeFavorites () {
-      star.all().then(res => {
-        res.forEach(element => {
-          const docs = {
-            key: element.key,
-            ids: element.ids,
-            name: element.name,
-            type: element.type,
-            year: element.year,
-            last: element.last,
-            note: element.note
-          }
-          star.find({ key: element.key, ids: element.ids }).then(res => {
-            if (!res) {
-              star.add(docs)
-            }
-          })
-        })
-        this.getFavorites()
-      })
-    },
     clearFavoritesEvent () {
       star.clear().then(e => {
         this.getFavorites()
       })
     },
-    updateDatabase (data) {
+    syncTableData () {
+      if (this.$refs.starTable.tableData && this.$refs.starTable.tableData.length === this.list.length) {
+        this.list = this.$refs.starTable.tableData
+      }
+    },
+    updateDatabase () {
+      this.syncTableData()
       star.clear().then(res => {
-        var id = length
-        data.forEach(ele => {
+        var id = this.list.length
+        this.list.forEach(ele => {
           ele.id = id
           id -= 1
         })
-        star.bulkAdd(data)
+        star.bulkAdd(this.list)
       })
     },
     rowDrop () {
@@ -386,7 +400,7 @@ export default {
         onEnd ({ newIndex, oldIndex }) {
           const currRow = _this.list.splice(oldIndex, 1)[0]
           _this.list.splice(newIndex, 0, currRow)
-          _this.updateDatabase(_this.list)
+          _this.updateDatabase()
         }
       })
     }

src/lib/dexie/dexie.js

@@ -3,14 +3,14 @@ import { setting, sites, localKey, iptv } from './initData'
 
 const db = new Dexie('zy')
 
-db.version(3).stores({
+db.version(4).stores({
   search: '++id, keywords',
   iptvSearch: '++id, keywords',
   setting: 'id, theme, site, shortcut, view, externalPlayer, searchAllSites, excludeRootClasses, excludeR18Films, forwardTimeInSec',
   shortcut: 'name, key, desc',
-  star: '++id, site, ids, name, type, year, index',
+  star: '++id, [key+ids], site, name, type, year, note, index, last, hasUpdate',
   sites: '++id, key, name, api, download, isActive, group',
-  history: '++id, site, ids, name, type, year, index, time',
+  history: '++id, [site+ids], name, type, year, index, time',
   mini: 'id, site, ids, name, index, time',
   iptv: '++id, name, url, group'
 })

src/lib/dexie/history.js

@@ -8,7 +8,7 @@ export default {
     return await history.bulkAdd(doc)
   },
   async find (doc) {
-    return await history.get(doc)
+    return await history.where(doc).first()
   },
   async update (id, docs) {
     return await history.update(id, docs)

src/lib/dexie/star.js

@@ -8,7 +8,7 @@ export default {
     return await star.bulkAdd(doc)
   },
   async find (doc) {
-    return await star.get(doc)
+    return await star.where(doc).first()
   },
   async update (id, docs) {
     return await star.update(id, docs)

src/lib/update/update.js

@@ -0,0 +1,48 @@
+import { BrowserWindow, ipcMain } from 'electron'
+import { autoUpdater } from 'electron-updater'
+
+export function initUpdater (win = BrowserWindow) {
+  autoUpdater.autoDownload = false
+  autoUpdater.autoInstallOnAppQuit = false
+
+  // 主进程监听检查更新事件
+  ipcMain.on('checkForUpdate', () => {
+    autoUpdater.checkForUpdates()
+  })
+
+  // 主进程监听退出并安装事件
+  ipcMain.on('quitAndInstall', () => {
+    autoUpdater.downloadUpdate()
+  })
+
+  // 开始检测是否有更新
+  autoUpdater.on('checking-for-update', () => {
+    win.webContents.send('checking-for-update')
+  })
+
+  // 检测到有可用的更新
+  autoUpdater.on('update-available', (info) => {
+    win.webContents.send('update-available', info)
+  })
+
+  // 没有检测到有可用的更新
+  autoUpdater.on('update-not-available', () => {
+    win.webContents.send('update-not-available')
+  })
+
+  // 更新出错
+  autoUpdater.on('update-error', err => {
+    win.webContents.send('update-error', err)
+  })
+
+  // 下载更新进度
+  autoUpdater.on('download-progress', (progressObj) => {
+    win.webContents.send('download-progress', progressObj)
+  })
+
+  // 下载完成并退出安装
+  autoUpdater.on('update-downloaded', () => {
+    win.webContents.send('update-downloaded')
+    autoUpdater.quitAndInstall()
+  })
+}

src/mini/Mini.vue

@@ -175,49 +175,48 @@ export default {
         })
       })
     },
-    videoPlaying () {
-      history.find({ site: this.video.site, ids: this.video.ids }).then(res => {
-        if (res) {
-          res.index = this.video.index
-          history.update(res.id, res)
-        } else {
-          const doc = {
-            site: this.video.site,
-            ids: this.video.ids,
-            name: this.video.name,
-            index: this.video.index,
-            time: 0
-          }
-          history.add(doc)
+    async videoPlaying () {
+      const db = await history.find({ site: this.video.site, ids: this.video.ids })
+      if (db) {
+        db.index = this.video.index
+        history.update(db.id, db)
+      } else {
+        const doc = {
+          site: this.video.site,
+          ids: this.video.ids,
+          name: this.video.name,
+          index: this.video.index,
+          time: 0
         }
-      })
+        history.add(doc)
+      }
       this.timerEvent()
     },
     timerEvent () {
-      this.timer = setInterval(() => {
+      this.timer = setInterval(async () => {
         const endTime = this.xg.duration
         const currentTime = this.xg.currentTime
         const progress = (currentTime / endTime) * 100
         this.progress = progress.toFixed(2)
-        history.find({ site: this.video.site, ids: this.video.ids }).then(res => {
-          if (res) {
-            const v = res
-            v.time = this.xg.currentTime
-            v.index = this.video.index
-            const id = v.id
-            delete v.id
-            history.update(id, v)
-          }
-        })
+        const db = await history.find({ site: this.video.site, ids: this.video.ids })
+        if (db) {
+          const v = db
+          v.time = this.xg.currentTime
+          v.index = this.video.index
+          const id = v.id
+          delete v.id
+          history.update(id, v)
+        }
       }, 10000)
     },
-    prevEvent () {
+    async prevEvent () {
       if (this.video.index === 0) {
         this.$message.info('已是第一集.')
         return false
       }
-      history.find({ site: this.video.site, ids: this.video.ids }).then(res => {
-        const v = res
+      const db = await history.find({ site: this.video.site, ids: this.video.ids })
+      if (db) {
+        const v = db
         const id = v.id
         v.index--
         delete v.id
@@ -225,15 +224,16 @@ export default {
           this.xg.src = this.m3u8Arr[v.index]
           this.video.index--
         })
-      })
+      }
     },
-    nextEvent () {
+    async nextEvent () {
       if (this.video.index >= this.m3u8Arr.length - 1) {
         this.$message.info('已是最后一集.')
         return false
       }
-      history.find({ site: this.video.site, ids: this.video.ids }).then(res => {
-        const v = res
+      const db = await history.find({ site: this.video.site, ids: this.video.ids })
+      if (db) {
+        const v = db
         v.index++
         const id = v.id
         delete v.id
@@ -241,7 +241,7 @@ export default {
           this.xg.src = this.m3u8Arr[v.index]
           this.video.index++
         })
-      })
+      }
     },
     playbackRateEvent (e) {
       let rate = this.xg.playbackRate

yarn.lock

@@ -10035,10 +10035,10 @@ xgplayer-hls.js@^2.2.5:
     event-emitter "^0.3.5"
     eventemitter3 "^4.0.7"
 
-xgplayer@^2.12.2:
-  version "2.12.2"
-  resolved "https://registry.npm.taobao.org/xgplayer/download/xgplayer-2.12.2.tgz#72111cfbb21f97cbe454b0f5d17e85f720892b2a"
-  integrity sha1-chEc+7Ifl8vkVLD10X6F9yCJKyo=
+xgplayer@^2.13.0:
+  version "2.13.0"
+  resolved "https://registry.npmjs.org/xgplayer/-/xgplayer-2.13.0.tgz#24df20fd527a87cccc5cee3db70937408eab86ed"
+  integrity sha512-QMjwnpO6o8bd2ZywHtANaOqvey476UAmPS+hXC0im9wiESMKqxPsCmeqhIxFFVao/pUtIyopHADcor9ipai5Rg==
   dependencies:
     chalk "^2.3.2"
     commander "^2.15.1"