Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -18,6 +18,7 @@
   "main": "background.js",
   "dependencies": {
     "axios": "^0.19.2",
+    "cheerio": "^1.0.0-rc.3",
     "child_process": "^1.0.2",
     "core-js": "^3.6.5",
     "cors": "^2.8.5",

src/components/Detail.vue

@@ -25,6 +25,7 @@
             <div class="year" v-show="info.year">上映: {{info.year}}</div>
             <div class="last" v-show="info.last">更新: {{info.last}}</div>
             <div class="note" v-show="info.note">备注: {{info.note}}</div>
+            <div class="rate" v-show="info.rate">豆瓣评分: {{info.rate}}</div>
           </div>
         </div>
         <div class="operate">
@@ -32,6 +33,7 @@
           <span @click="starEvent">收藏</span>
           <span @click="downloadEvent">下载</span>
           <span @click="shareEvent">分享</span>
+          <span @click="doubanLinkEvent">豆瓣</span>
         </div>
         <div class="desc" v-show="info.des">{{info.des}}</div>
         <div class="m3u8">
@@ -189,12 +191,72 @@ export default {
         info: this.detail.info
       }
     },
+    doubanLinkEvent () {
+      const open = require('open')
+      const axios = require('axios')
+      const cheerio = require('cheerio')
+      const name = this.detail.info.name.trim()
+      // 豆瓣搜索链接
+      var doubanSearchLink = 'https://www.douban.com/search?q=' + name
+      var link = doubanSearchLink
+      axios.get(doubanSearchLink).then(res => {
+        const $ = cheerio.load(res.data)
+        // 比较第一和第二豆瓣搜索结果, 如果名字相符， 就打开该链接，否则打开搜索页面
+        var nameInDouban = $($('div.result')[0]).find('div>div>h3>a').first()
+        if (name.replace(/\s/g, '') === nameInDouban.text().replace(/\s/g, '')) {
+          link = nameInDouban.attr('href')
+        } else {
+          nameInDouban = $($('div.result')[1]).find('div>div>h3>a').first()
+          if (name.replace(/\s/g, '') === nameInDouban.text().replace(/\s/g, '')) {
+            link = nameInDouban.attr('href')
+          }
+        }
+        open(link)
+      })
+    },
+    getDoubanRate () {
+      const axios = require('axios')
+      const cheerio = require('cheerio')
+      const name = this.detail.info.name.trim()
+      // 豆瓣搜索链接
+      var doubanSearchLink = 'https://www.douban.com/search?q=' + name
+      axios.get(doubanSearchLink).then(res => {
+        const $ = cheerio.load(res.data)
+        // 比较第一和第二给豆瓣搜索结果, 看名字是否相符
+        var link = ''
+        var nameInDouban = $($('div.result')[0]).find('div>div>h3>a').first()
+        if (name.replace(/\s/g, '') === nameInDouban.text().replace(/\s/g, '')) {
+          link = nameInDouban.attr('href')
+        } else {
+          nameInDouban = $($('div.result')[1]).find('div>div>h3>a').first()
+          if (name.replace(/\s/g, '') === nameInDouban.text().replace(/\s/g, '')) {
+            link = nameInDouban.attr('href')
+          }
+        }
+        // 如果找到链接，就打开该链接获取评分
+        if (link) {
+          axios.get(link).then(response => {
+            const parsedHtml = cheerio.load(response.data)
+            var rating = parsedHtml('body').find('#interest_sectl').first().find('strong').first()
+            if (rating.text()) {
+              this.info.rate = rating.text()
+            } else {
+              this.info.rate = '暂无评分'
+            }
+          })
+        } else {
+          this.info.rate = '暂无评分'
+        }
+      })
+    },
     getDetailInfo () {
       const id = this.detail.info.ids || this.detail.info.id
       zy.detail(this.detail.key, id).then(res => {
         if (res) {
           this.info = res
+          this.$set(this.info, 'rate', '')
           this.m3u8Parse(res)
+          this.getDoubanRate()
           this.loading = false
         }
       })
@@ -208,9 +270,10 @@ export default {
 <style lang="scss" scoped>
 .detail{
   position: absolute;
-  left: 60px;
+  left: 80px;
+  right: 20px;
   bottom: 0;
-  width: 100%;
+  width: calc(100% - 100px);
   height: calc(100% - 40px);
   z-index: 888;
   .detail-content{
@@ -265,6 +328,11 @@ export default {
           font-size: 14px;
           line-height: 26px;
         }
+        .rate{
+          font-size: 16px;
+          line-height: 26px;
+          font-weight: bolder;
+        }
       }
     }
     .operate{

src/components/Play.vue

@@ -546,6 +546,10 @@ export default {
         var externalPlayer = this.setting.externalPlayer
         if (!fs.existsSync(externalPlayer)) {
           this.$message.error('请设置第三方播放器路径')
+          // 在线播放该视频
+          var link = 'https://www.m3u8play.com/?play=' + m3u8Arr[this.video.info.index]
+          const open = require('open')
+          open(link)
         } else {
           var exec = require('child_process').execFile
           var dplFile = this.generateDplFile(this.video.info.name, m3u8Arr, this.video.info.index)

src/components/Setting.vue

@@ -65,24 +65,19 @@
          </div>
       </div>
       <div class='site'>
-         <div class="title">第三方播放器</div>
+         <div class="title">第三方播放</div>
          <div class="site-box">
             <div class="zy-select">
-              <div class="vs-placeholder vs-noAfter" @click="selectExternalPlayer">选择</div>
+              <div class="vs-placeholder vs-noAfter" @click="selectLocalPlayer">选择本地播放器</div>
+            </div>
+            <div class="zy-select">
+              <div class="vs-placeholder vs-noAfter" @click="resetLocalPlayer">重置</div>
             </div>
           </div>
       </div>
       <div class="site">
         <div class="title">源管理</div>
         <div class="site-box">
-          <div class="zy-select" @mouseleave="show.site = false">
-            <div class="vs-placeholder" @click="show.site = true">默认源</div>
-            <div class="vs-options" v-show="show.site">
-              <ul class="zy-scroll" style="height: 300px">
-                <li :class="d.site === i.key ? 'active' : ''" v-for="(i, j) in sitesList" :key="j" @click="siteClick(i.key)">{{ i.name }}</li>
-              </ul>
-            </div>
-          </div>
           <div class="zy-select">
             <div class="vs-placeholder vs-noAfter" @click="exportSites">导出</div>
           </div>
@@ -92,6 +87,14 @@
           <div class="zy-select">
             <div class="vs-placeholder vs-noAfter" @click="resetSites">重置源</div>
           </div>
+          <div class="zy-select" @mouseleave="show.site = false">
+            <div class="vs-placeholder" @click="show.site = true">默认源</div>
+            <div class="vs-options" v-show="show.site">
+              <ul class="zy-scroll" style="height: 300px">
+                <li :class="d.site === i.key ? 'active' : ''" v-for="(i, j) in sitesList" :key="j" @click="siteClick(i.key)">{{ i.name }}</li>
+              </ul>
+            </div>
+          </div>
           <div class="zy-select">
             <div class="vs-placeholder vs-noAfter" @click="openDoc('sites')">说明文档</div>
           </div>
@@ -313,7 +316,7 @@ export default {
         this.getFavorites()
       })
     },
-    selectExternalPlayer () {
+    selectLocalPlayer () {
       const options = {
         filters: [
           { name: 'Executable file', extensions: ['exe'] },
@@ -324,7 +327,6 @@ export default {
       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 => {
@@ -335,6 +337,13 @@ export default {
         this.$message.error(err)
       })
     },
+    resetLocalPlayer () {
+      this.d.externalPlayer = ''
+      setting.update(this.d).then(res => {
+        this.setting = this.d
+        this.$message.success('重置第三方播放器成功')
+      })
+    },
     exportSites () {
       this.getSites()
       const arr = [...this.sitesList]