From f50d669a5f357be01e476a39bcb5fedb154ccba3 Mon Sep 17 00:00:00 2001 From: buvta <12312540+buvta@users.noreply.github.com> Date: Tue, 29 Dec 2020 23:59:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=8B=E8=BD=BD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=B9=B6=E8=B0=83=E6=95=B4=E9=80=9A=E7=9F=A5=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail.vue | 10 +++++----- src/components/Film.vue | 10 +++++----- src/components/History.vue | 10 +++++----- src/components/Recommendation.vue | 10 +++++----- src/components/Star.vue | 12 ++++++------ src/lib/site/tools.js | 9 ++++----- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/components/Detail.vue b/src/components/Detail.vue index 3525a03..1b52905 100644 --- a/src/components/Detail.vue +++ b/src/components/Detail.vue @@ -214,15 +214,15 @@ export default { const key = this.detail.key const id = this.info.id zy.download(key, id).then(res => { - if (res && res.m3u8List) { - const list = res.m3u8List.split('#') + if (res && res.downloadUrls) { + const list = res.downloadUrls let downloadUrl = '' for (const i of list) { const url = encodeURI(i.split('$')[1]) downloadUrl += (url + '\n') } clipboard.writeText(downloadUrl) - this.$message.success('『MP4』格式的链接已复制, 快去下载吧!') + this.$message.success('调用下载接口获取到的链接已复制, 快去下载吧!') } else { zy.detail(key, id).then(res => { const list = [...res.m3u8List] @@ -232,10 +232,10 @@ export default { downloadUrl += (url + '\n') } clipboard.writeText(downloadUrl) - this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!') + this.$message.success('视频源链接已复制, 快去下载吧!') }) } - }) + }).catch((err) => { this.$message.error('无法获取到链接，请通过播放页面点击“调试”按钮获取', err) }) }, shareEvent () { this.share = { diff --git a/src/components/Film.vue b/src/components/Film.vue index a83fbd2..a66026c 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -726,15 +726,15 @@ export default { const key = site.key const id = row.id zy.download(key, id).then(res => { - if (res && res.m3u8List) { - const list = res.m3u8List.split('#') + if (res && res.downloadUrls) { + const list = res.downloadUrls let downloadUrl = '' for (const i of list) { const url = encodeURI(i.split('$')[1]) downloadUrl += (url + '\n') } clipboard.writeText(downloadUrl) - this.$message.success('『MP4』格式的链接已复制, 快去下载吧!') + this.$message.success('调用下载接口获取到的链接已复制, 快去下载吧!') } else { zy.detail(key, id).then(res => { const list = [...res.m3u8List] @@ -744,10 +744,10 @@ export default { downloadUrl += (url + '\n') } clipboard.writeText(downloadUrl) - this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!') + this.$message.success('视频源链接已复制, 快去下载吧!') }) } - }) + }).catch((err) => { this.$message.error('无法获取到链接，请通过播放页面点击“调试”按钮获取', err) }) }, querySearch (queryString, cb) { var searchList = this.searchList.slice(0, -1) diff --git a/src/components/History.vue b/src/components/History.vue index c929476..83652fd 100644 --- a/src/components/History.vue +++ b/src/components/History.vue @@ -246,15 +246,15 @@ export default { const key = e.site const id = e.ids zy.download(key, id).then(res => { - if (res && res.m3u8List) { - const list = res.m3u8List.split('#') + if (res && res.downloadUrls) { + const list = res.downloadUrls let downloadUrl = '' for (const i of list) { const url = encodeURI(i.split('$')[1]) downloadUrl += (url + '\n') } clipboard.writeText(downloadUrl) - this.$message.success('『MP4』格式的链接已复制, 快去下载吧!') + this.$message.success('调用下载接口获取到的链接已复制, 快去下载吧!') } else { zy.detail(key, id).then(res => { const list = [...res.m3u8List] @@ -264,10 +264,10 @@ export default { downloadUrl += (url + '\n') } clipboard.writeText(downloadUrl) - this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!') + this.$message.success('视频源链接已复制, 快去下载吧!') }) } - }) + }).catch((err) => { this.$message.error('无法获取到下载链接，请通过播放页面点击“调试”按钮获取', err) }) }, exportHistory () { this.getAllhistory() diff --git a/src/components/Recommendation.vue b/src/components/Recommendation.vue index 6ce52c0..a4b040f 100644 --- a/src/components/Recommendation.vue +++ b/src/components/Recommendation.vue @@ -283,15 +283,15 @@ export default { const key = e.key const id = e.ids zy.download(key, id).then(res => { - if (res && res.m3u8List) { - const list = res.m3u8List.split('#') + if (res && res.downloadUrls) { + const list = res.downloadUrls let downloadUrl = '' for (const i of list) { const url = encodeURI(i.split('$')[1]) downloadUrl += (url + '\n') } clipboard.writeText(downloadUrl) - this.$message.success('『MP4』格式的链接已复制, 快去下载吧!') + this.$message.success('调用下载接口获取到的链接已复制, 快去下载吧!') } else { zy.detail(key, id).then(res => { const list = [...res.m3u8List] @@ -301,10 +301,10 @@ export default { downloadUrl += (url + '\n') } clipboard.writeText(downloadUrl) - this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!') + this.$message.success('视频源链接已复制, 快去下载吧!') }) } - }) + }).catch((err) => { this.$message.error('无法获取到链接，请通过播放页面点击“调试”按钮获取', err) }) }, getRecommendations () { recommendation.all().then(res => { diff --git a/src/components/Star.vue b/src/components/Star.vue index 5feb45a..a6f9352 100644 --- a/src/components/Star.vue +++ b/src/components/Star.vue @@ -341,17 +341,17 @@ export default { }, downloadEvent (e) { const key = e.key - const id = e.id + const id = e.ids zy.download(key, id).then(res => { - if (res && res.m3u8List) { - const list = res.m3u8List.split('#') + if (res && res.downloadUrls) { + const list = res.downloadUrls let downloadUrl = '' for (const i of list) { const url = encodeURI(i.split('$')[1]) downloadUrl += (url + '\n') } clipboard.writeText(downloadUrl) - this.$message.success('『MP4』格式的链接已复制, 快去下载吧!') + this.$message.success('调用下载接口获取到的链接已复制, 快去下载吧!') } else { zy.detail(key, id).then(res => { const list = [...res.m3u8List] @@ -361,10 +361,10 @@ export default { downloadUrl += (url + '\n') } clipboard.writeText(downloadUrl) - this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!') + this.$message.success('视频源链接已复制, 快去下载吧!') }) } - }) + }).catch((err) => { this.$message.error('无法获取到链接，请通过播放页面点击“调试”按钮获取', err) }) }, getSiteName (row) { if (row.site) { diff --git a/src/lib/site/tools.js b/src/lib/site/tools.js index 74207ac..f28d165 100644 --- a/src/lib/site/tools.js +++ b/src/lib/site/tools.js @@ -284,18 +284,17 @@ const zy = { const json = parser.parse(data, this.xmlConfig) const jsondata = json.rss === undefined ? json : json.rss const videoList = jsondata.list.video - // Parse m3u8List - var m3u8List = [] + var downloadUrls = [] const dd = videoList.dl.dd const type = Object.prototype.toString.call(dd) if (type === '[object Array]') { for (const i of dd) { - m3u8List = i._t.split('#') + downloadUrls = i._t.split('#') } } else { - m3u8List = dd._t.split('#') + downloadUrls = dd._t.split('#') } - videoList.m3u8List = m3u8List + videoList.downloadUrls = downloadUrls resolve(videoList) }).catch(err => { reject(err)