修复历史记录里的下载功能

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -18,6 +18,7 @@
   "main": "background.js",
   "dependencies": {
     "axios": "^0.19.2",
+    "child_process": "^1.0.2",
     "core-js": "^3.6.5",
     "cors": "^2.8.5",
     "dexie": "^3.0.1",

src/components/Detail.vue

@@ -132,19 +132,20 @@ export default {
     },
     starEvent () {
       star.find({ key: this.detail.key, ids: this.info.id }).then(res => {
+        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
+        }
         if (res) {
-          this.$message.info('已存在')
+          star.update(res.id, docs).then(res => {
+            this.$message.success('已存在，更新成功')
+          })
         } else {
-          const docs = {
-            key: this.detail.site.key,
-            site: this.detail.site,
-            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('收藏成功')
           })
@@ -155,7 +156,7 @@ export default {
     },
     downloadEvent () {
       zy.download(this.detail.key, this.info.id).then(res => {
-        if (res) {
+        if (res && res.dl && res.dl.dd) {
           const text = res.dl.dd._t
           if (text) {
             const list = text.split('#')

src/components/Film.vue

@@ -49,6 +49,7 @@
                 <div class="name" @click="detailEvent(site, props.data)">{{props.data.name}}</div>
                 <div class="info">
                   <span>{{props.data.year}}</span>
+                  <span>{{props.data.note}}</span>
                   <span>{{props.data.type}}</span>
                 </div>
               </div>
@@ -64,6 +65,7 @@
                   <span class="name">{{i.name}}</span>
                   <span class="type">{{i.type}}</span>
                   <span class="time">{{i.year}}</span>
+                  <span class="time">{{i.note}}</span>
                   <span class="last">{{i.last}}</span>
                   <span class="operate">
                     <span class="btn" @click.stop="playEvent(site, i)">播放</span>
@@ -226,10 +228,11 @@ export default {
       return new Promise((resolve, reject) => {
         const key = this.site.key
         zy.class(key).then(res => {
-          this.classList = res.class
+          var allClass = [{ name: '最新', tid: 0 }].concat(res.class)
+          this.classList = allClass
           this.show.class = true
           this.pagecount = res.pagecount
-          this.type = { name: '最新', tid: 0 }
+          this.type = this.classList[0]
           resolve(true)
         }).catch(err => {
           reject(err)
@@ -265,7 +268,8 @@ export default {
             $state.complete()
           }
           if (type === '[object Array]') {
-            this.list.push(...res)
+            // zy.list 返回的是按时间从旧到新排列, 我门需要翻转为从新到旧
+            this.list.push(...res.reverse())
           }
           if (type === '[object Object]') {
             this.list.push(res)
@@ -301,7 +305,6 @@ export default {
         } else {
           const docs = {
             key: site.key,
-            site: site,
             ids: e.id,
             name: e.name,
             type: e.type,
@@ -326,7 +329,7 @@ export default {
     },
     downloadEvent (site, e) {
       zy.download(site.key, e.id).then(res => {
-        if (res.length > 0) {
+        if (res && res.length > 0 && res.dl && res.dl.dd) {
           const text = res.dl.dd._t
           if (text) {
             const list = text.split('#')

src/components/History.vue

@@ -9,11 +9,12 @@
           <ul>
             <li v-show="this.history.length === 0">无数据</li>
             <li v-for="(i, j) in history" :key="j" @click="historyItemEvent(i)">
-              <span class="name" @click.stop="playEvent(i)">{{i.name}}</span>
+              <span class="name" @click.stop="detailEvent(i)">{{i.name}}</span>
               <span class="site">{{getSiteName(i.site)}}</span>
               <span class="note">第{{i.index+1}}集</span>
               <span class="operate">
                 <span class="btn" @click.stop="playEvent(i)">播放</span>
+                <span class="btn" @click.stop="shareEvent(i)">分享</span>
                 <span class="btn" @click.stop="downloadEvent(i)">下载</span>
                 <span class="btn" @click.stop="removeHistoryItem(i)">删除</span>
               </span>
@@ -99,9 +100,16 @@ export default {
       })
       this.view = 'Play'
     },
+    shareEvent (e) {
+      this.share = {
+        show: true,
+        key: e.site,
+        info: e
+      }
+    },
     downloadEvent (e) {
       zy.download(e.site, e.ids).then(res => {
-        if (res) {
+        if (res && res.dl && res.dl.dd) {
           const text = res.dl.dd._t
           if (text) {
             const list = text.split('#')
@@ -116,14 +124,28 @@ export default {
             this.$message.warning('没有查询到下载链接.')
           }
         } else {
-          const list = [...this.m3u8List]
-          let downloadUrl = ''
-          for (const i of list) {
-            const url = encodeURI(i.split('$')[1])
-            downloadUrl += (url + '\n')
-          }
-          clipboard.writeText(downloadUrl)
-          this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!')
+          var m3u8List = {}
+          zy.detail(e.site, e.ids).then(res => {
+            const dd = res.dl.dd
+            const type = Object.prototype.toString.call(dd)
+            if (type === '[object Array]') {
+              for (const i of dd) {
+                if (i._flag.indexOf('m3u8') >= 0) {
+                  m3u8List = i._t.split('#')
+                }
+              }
+            } else {
+              m3u8List = dd._t.split('#')
+            }
+            const list = [...m3u8List]
+            let downloadUrl = ''
+            for (const i of list) {
+              const url = encodeURI(i.split('$')[1])
+              downloadUrl += (url + '\n')
+            }
+            clipboard.writeText(downloadUrl)
+            this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!')
+          })
         }
       })
     },

src/components/Play.vue

@@ -3,6 +3,12 @@
     <div class="box">
       <div class="title">
         <span v-if="this.right.list.length > 1">『第 {{(video.info.index + 1)}} 集』</span>{{name}}
+        <span v-if="video.key" class="right" @click="playWithExternalPalyerEvent" title="使用第三方播放器">
+          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+            <polygon points="20 8 20 20 4 20 4 8"></polygon>
+            <polyline stroke-linejoin="round" points="8 4 12 7.917 16 4"></polyline>
+          </svg>
+        </span>
         <span v-if="video.key" class="right" @click="issueEvent" title="复制调试信息">
           <svg t="1596338860607" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3127" width="24" height="24">
             <path d="M503.803829 63.578014c-247.050676 0-447.328072 200.277396-447.328072 447.327048 0 247.054769 200.277396 447.333188 447.328072 447.333188 247.054769 0 447.332165-200.278419 447.332165-447.333188C951.13497 263.85541 750.858598 63.578014 503.803829 63.578014L503.803829 63.578014zM503.803829 894.313336c-211.749682 0-383.408273-171.659615-383.408273-383.408273 0-211.749682 171.659615-383.40725 383.408273-383.40725 211.753775 0 383.412366 171.658591 383.412366 383.40725C887.216195 722.653721 715.557604 894.313336 503.803829 894.313336L503.803829 894.313336zM447.745069 255.897158l127.914298 0L575.659367 383.576095 447.745069 383.576095 447.745069 255.897158 447.745069 255.897158zM447.745069 425.470251l127.914298 0 0 342.058516L447.745069 767.528767 447.745069 425.470251 447.745069 425.470251zM447.745069 425.470251" p-id="3128"></path>
@@ -465,9 +471,8 @@ export default {
         if (res) {
           this.$message.info('已存在')
         } else {
-          const docs = {
+          const doc = {
             key: this.video.key,
-            site: this.video.site,
             ids: info.id,
             name: info.name,
             type: info.type,
@@ -475,7 +480,7 @@ export default {
             last: info.last,
             note: info.note
           }
-          star.add(docs).then(res => {
+          star.add(doc).then(starRes => {
             this.$message.success('收藏成功')
             this.isStar = true
           })
@@ -535,8 +540,21 @@ export default {
       clipboard.writeText(JSON.stringify(info, null, 4))
       this.$message.success('视频信息复制成功')
     },
+    playWithExternalPalyerEvent () {
+      this.fetchM3u8List().then(m3u8Arr => {
+        var m3u8Link = m3u8Arr[this.video.info.index]
+        const fs = require('fs')
+        var externalPlayer = this.setting.externalPlayer
+        if (fs.existsSync(externalPlayer)) {
+          var exec = require('child_process').execFile
+          exec(externalPlayer, [m3u8Link])
+        } else {
+          this.$message.error('请设置第三方播放器路径')
+        }
+      })
+    },
     checkStar () {
-      star.find({ site: this.video.key, ids: this.video.info.id }).then(res => {
+      star.find({ key: this.video.key, ids: this.video.info.id }).then(res => {
         if (res) {
           this.isStar = true
         } else {

src/components/Setting.vue

@@ -53,6 +53,9 @@
             <div class="zy-select">
               <div class="vs-placeholder vs-noAfter" @click="importFavorites">导入</div>
             </div>
+            <div class="zy-select">
+              <div class="vs-placeholder vs-noAfter" @click="clearFavorites">清空收藏</div>
+            </div>
           </div>
       </div>
       <div class='search'>
@@ -61,6 +64,14 @@
            <input type="checkbox" v-model="setting.searchAllSites" @change="updateSearchOption($event)"> 搜索所有资源
          </div>
       </div>
+      <div class='site'>
+         <div class="title">第三方播放器</div>
+         <div class="site-box">
+            <div class="zy-select">
+              <div class="vs-placeholder vs-noAfter" @click="selectExternalPlayer">选择</div>
+            </div>
+          </div>
+      </div>
       <div class="site">
         <div class="title">源管理</div>
         <div class="site-box">
@@ -155,7 +166,8 @@ export default {
         theme: '',
         shortcut: true,
         searchAllSites: true,
-        view: 'picture'
+        view: 'picture',
+        externalPlayer: ''
       }
     }
   },
@@ -182,7 +194,8 @@ export default {
           theme: res.theme,
           shortcut: res.shortcut,
           view: res.view,
-          searchAllSites: res.searchAllSites
+          searchAllSites: res.searchAllSites,
+          externalPlayer: res.externalPlayer
         }
         this.setting = this.d
       })
@@ -225,9 +238,9 @@ export default {
       })
     },
     exportFavorites () {
+      this.getFavorites()
       const arr = [...this.favoritesList]
-      const str = JSON.stringify(arr)
-      clipboard.writeText(str)
+      const str = JSON.stringify(arr, null, 4)
       const options = {
         filters: [
           { name: 'JSON file', extensions: ['json'] },
@@ -261,6 +274,7 @@ export default {
             star.bulkAdd(json).then(e => {
               this.getFavorites()
             })
+            this.upgradeFavorites()
           })
           this.$message.success('导入收藏成功')
         }
@@ -268,25 +282,102 @@ export default {
         this.$message.error(err)
       })
     },
-    expSites () {
-      const arr = [...this.sitesList]
-      const str = JSON.stringify(arr)
-      clipboard.writeText(str)
-      this.$message.success('已复制到剪贴板')
+    clearFavorites () {
+      star.clear().then(e => {
+        this.getFavorites()
+        this.$message.success('清空所有收藏成功')
+      })
     },
-    impSites () {
-      const str = clipboard.readText()
-      const json = JSON.parse(str)
-      sites.clear().then(res => {
-        this.$message.info('已清空原数据')
-        sites.add(json).then(e => {
-          this.$message.success('已添加成功')
-          this.getSites()
-          this.d.site = json[0].key
+    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()
+      })
+    },
+    selectExternalPlayer () {
+      const options = {
+        filters: [
+          { name: 'Executable file', extensions: ['exe'] },
+          { name: 'All types', extensions: ['*'] }
+        ],
+        properties: ['openFile']
+      }
+      remote.dialog.showOpenDialog(options).then(result => {
+        if (!result.canceled) {
+          var playerPath = result.filePaths[0].replace(/\\/g, '/')
+          this.$message.success(result.filePaths[0])
+          this.$message.success('设定第三方播放器路径为：' + result.filePaths[0])
+          this.d.externalPlayer = playerPath
           setting.update(this.d).then(res => {
             this.setting = this.d
           })
-        })
+        }
+      }).catch(err => {
+        this.$message.error(err)
+      })
+    },
+    expSites () {
+      this.getSites()
+      const arr = [...this.sitesList]
+      const str = JSON.stringify(arr, null, 4)
+      const options = {
+        filters: [
+          { name: 'JSON file', extensions: ['json'] },
+          { name: 'Normal text file', extensions: ['txt'] },
+          { name: 'All types', extensions: ['*'] }
+        ]
+      }
+      remote.dialog.showSaveDialog(options).then(result => {
+        if (!result.canceled) {
+          fs.writeFileSync(result.filePath, str)
+          this.$message.success('已保存成功')
+        }
+      }).catch(err => {
+        this.$message.error(err)
+      })
+    },
+    impSites () {
+      const options = {
+        filters: [
+          { name: 'JSON file', extensions: ['json'] },
+          { name: 'Normal text file', extensions: ['txt'] },
+          { name: 'All types', extensions: ['*'] }
+        ],
+        properties: ['openFile']
+      }
+      remote.dialog.showOpenDialog(options).then(result => {
+        if (!result.canceled) {
+          sites.clear()
+          result.filePaths.forEach(file => {
+            var str = fs.readFileSync(file)
+            const json = JSON.parse(str)
+            sites.add(json).then(e => {
+              this.getSites()
+              this.d.site = json[0].key
+              setting.update(this.d).then(res => {
+                this.setting = this.d
+              })
+            })
+            this.$message.success('导入成功')
+          }).catch(err => {
+            this.$message.error(err)
+          })
+        }
       })
     },
     changeTheme (e) {
@@ -305,7 +396,7 @@ export default {
     },
     expShortcut () {
       const arr = [...this.shortcutList]
-      const str = JSON.stringify(arr)
+      const str = JSON.stringify(arr, null, 4)
       clipboard.writeText(str)
       this.$message.success('已复制到剪贴板')
     },

src/components/Share.vue

@@ -70,16 +70,22 @@ export default {
       zy.detail(this.share.key, id).then(res => {
         if (res) {
           this.pic = res.pic
-          const text = res.dl.dd
-          for (const i of text) {
-            if (i._flag.indexOf('m3u8') >= 0) {
-              const arr = i._t.split('#')
-              const url = arr[0].split('$')[1]
-              this.link = 'http://zyplayer.fun/player/player.html?url=' + url + '&title=' + this.share.info.name
+          var m3u8List = {}
+          const dd = res.dl.dd
+          const type = Object.prototype.toString.call(dd)
+          if (type === '[object Array]') {
+            for (const i of dd) {
+              if (i._flag.indexOf('m3u8') >= 0) {
+                m3u8List = i._t.split('#')
+              }
             }
+          } else {
+            m3u8List = dd._t.split('#')
           }
-          this.loading = false
+          const url = m3u8List[1]
+          this.link = 'http://zyplayer.fun/player/player.html?url=' + url + '&title=' + this.share.info.name
         }
+        this.loading = false
       })
     },
     picLoadEvent () {

src/components/Star.vue

@@ -11,14 +11,14 @@
               <span class="name">{{i.name}}</span>
               <span class="type">{{i.type}}</span>
               <span class="time">{{i.year}}</span>
-              <span class="site">{{i.site.name}}</span>
+              <span class="site">{{getSiteName(i.key)}}</span>
               <span class="note">{{i.note}}</span>
               <span class="operate">
                 <span class="btn" @click.stop="playEvent(i)">播放</span>
-                <span class="btn" @click.stop="deleteEvent(i)">删除</span>
                 <span class="btn" @click.stop="shareEvent(i)">分享</span>
                 <span class="btn" @click.stop="updateEvent(i)">同步</span>
                 <span class="btn" @click.stop="downloadEvent(i)">下载</span>
+                <span class="btn" @click.stop="deleteEvent(i)">删除</span>
               </span>
             </li>
           </ul>
@@ -29,14 +29,15 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { star, history } from '../lib/dexie'
+import { star, history, sites } from '../lib/dexie'
 import zy from '../lib/site/tools'
 const { clipboard } = require('electron')
 export default {
   name: 'star',
   data () {
     return {
-      list: []
+      list: [],
+      sites: []
     }
   },
   computed: {
@@ -76,6 +77,7 @@ export default {
   watch: {
     view () {
       this.getStarList()
+      this.getAllsites()
     }
   },
   methods: {
@@ -83,23 +85,27 @@ export default {
     detailEvent (e) {
       this.detail = {
         show: true,
-        key: e.site.key,
+        key: e.key,
         info: {
           id: e.ids,
           name: e.name
         }
       }
-      this.clearHasUpdateFlag(e)
+      if (e.hasUpdate) {
+        this.clearHasUpdateFlag(e)
+      }
     },
     playEvent (e) {
-      history.find({ site: e.site.key, ids: e.ids }).then(res => {
+      history.find({ site: e.key, ids: e.ids }).then(res => {
         if (res) {
-          this.video = { key: res.site, info: { id: res.ids, name: res.name, index: res.index, site: e.site } }
+          this.video = { key: e.key, info: { id: res.ids, name: res.name, index: res.index } }
         } else {
-          this.video = { key: e.site.key, info: { id: e.ids, name: e.name, index: 0, site: e.site } }
+          this.video = { key: e.key, info: { id: e.ids, name: e.name, index: 0 } }
         }
       })
-      this.clearHasUpdateFlag(e)
+      if (e.hasUpdate) {
+        this.clearHasUpdateFlag(e)
+      }
       this.view = 'Play'
     },
     deleteEvent (e) {
@@ -115,7 +121,7 @@ export default {
     shareEvent (e) {
       this.share = {
         show: true,
-        key: e.site.key,
+        key: e.key,
         info: e
       }
     },
@@ -127,28 +133,31 @@ export default {
       })
     },
     updateEvent (e) {
-      zy.detail(e.site.key, e.ids).then(res => {
+      zy.detail(e.key, e.ids).then(res => {
+        var doc = {
+          key: e.key,
+          id: e.id,
+          ids: res.id,
+          last: res.last,
+          name: res.name,
+          type: res.type,
+          year: res.year,
+          note: res.note
+        }
         if (e.last === res.last) {
-          var msg = `同步"${e.name}"成功, 未查询到更新。`
-          this.$message.info(msg)
+          doc.hasUpdate = false
+          star.update(e.id, doc).then(res => {
+            var msg = `同步"${e.name}"成功, 未查询到更新。`
+            this.$message.info(msg)
+          })
         } else {
-          const doc = {
-            id: e.id,
-            ids: res.id,
-            last: res.last,
-            name: res.name,
-            site: e.site,
-            type: res.type,
-            year: res.year,
-            note: res.note,
-            hasUpdate: true
-          }
+          doc.hasUpdate = true
           star.update(e.id, doc).then(res => {
             var msg = `同步"${e.name}"成功, 检查到更新。`
             this.$message.success(msg)
           })
-          this.getStarList()
         }
+        this.getStarList()
       }).catch(err => {
         var msg = `同步"${e.name}"失败, 请重试。`
         this.$message.warning(msg, err)
@@ -160,8 +169,8 @@ export default {
       })
     },
     downloadEvent (e) {
-      zy.download(e.site.key, e.ids).then(res => {
-        if (res) {
+      zy.download(e.key, e.ids).then(res => {
+        if (res && res.dl && res.dl.dd) {
           const text = res.dl.dd._t
           if (text) {
             const list = text.split('#')
@@ -176,21 +185,46 @@ export default {
             this.$message.warning('没有查询到下载链接.')
           }
         } else {
-          const list = [...this.m3u8List]
-          let downloadUrl = ''
-          for (const i of list) {
-            const url = encodeURI(i.split('$')[1])
-            downloadUrl += (url + '\n')
-          }
-          clipboard.writeText(downloadUrl)
-          this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!')
+          var m3u8List = {}
+          zy.detail(e.key, e.ids).then(res => {
+            const dd = res.dl.dd
+            const type = Object.prototype.toString.call(dd)
+            if (type === '[object Array]') {
+              for (const i of dd) {
+                if (i._flag.indexOf('m3u8') >= 0) {
+                  m3u8List = i._t.split('#')
+                }
+              }
+            } else {
+              m3u8List = dd._t.split('#')
+            }
+            const list = [...m3u8List]
+            let downloadUrl = ''
+            for (const i of list) {
+              const url = encodeURI(i.split('$')[1])
+              downloadUrl += (url + '\n')
+            }
+            clipboard.writeText(downloadUrl)
+            this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!')
+          })
         }
       })
     },
+    getSiteName (key) {
+      var site = this.sites.find(e => e.key === key)
+      if (site) {
+        return site.name
+      }
+    },
     getStarList () {
       star.all().then(res => {
         this.list = res.reverse()
       })
+    },
+    getAllsites () {
+      sites.all().then(res => {
+        this.sites = res
+      })
     }
   },
   created () {

src/lib/dexie/sites.js

@@ -9,5 +9,8 @@ export default {
   },
   async add (doc) {
     return await sites.bulkAdd(doc)
+  },
+  async find (doc) {
+    return await sites.get(doc)
   }
 }

src/mini/Mini.vue

@@ -125,54 +125,6 @@ export default {
             }
           })
         })
-      //   zy.detail(res.site, res.ids).then(e => {
-      //     this.name = e.name
-      //     this.detail = e
-      //     const dd = e.dl.dd
-      //     const type = Object.prototype.toString.call(dd)
-      //     let m3u8Txt = []
-      //     if (type === '[object Array]') {
-      //       for (const i of dd) {
-      //         if (i._t.indexOf('m3u8') >= 0) {
-      //           m3u8Txt = i._t.split('#')
-      //         }
-      //       }
-      //     } else {
-      //       m3u8Txt = dd._t.split('#')
-      //     }
-      //     const m3u8Arr = []
-      //     for (const i of m3u8Txt) {
-      //       const j = i.split('$')
-      //       if (j.length > 1) {
-      //         for (let m = 0; m < j.length; m++) {
-      //           if (j[m].indexOf('m3u8') >= 0) {
-      //             m3u8Arr.push(j[m])
-      //           }
-      //         }
-      //       } else {
-      //         m3u8Arr.push(j[0])
-      //       }
-      //     }
-      //     this.m3u8Arr = m3u8Arr
-      //     this.xg.src = m3u8Arr[res.index]
-      //     if (res.time !== 0 || res.time !== '') {
-      //       this.xg.play()
-      //       this.xg.once('playing', () => {
-      //         this.xg.currentTime = res.time
-      //       })
-      //     } else {
-      //       this.xg.play()
-      //     }
-      //     this.videoPlaying()
-      //     this.xg.once('ended', () => {
-      //       if (m3u8Arr.length > 1 && (m3u8Arr.length - 1 > res.index)) {
-      //         this.video.time = 0
-      //         this.video.index++
-      //         this.xg.src = m3u8Arr[this.video.index]
-      //         this.xg.play()
-      //       }
-      //     })
-      //   })
       })
     },
     fetchM3u8List (info) {