From 033bcb3df7339df3020717264ad05409d122eada Mon Sep 17 00:00:00 2001 From: haiyangcui Date: Thu, 27 Aug 2020 15:52:56 +0200 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail.vue | 4 ++-- src/components/Film.vue | 2 +- src/components/History.vue | 2 +- src/components/Star.vue | 32 +++++++++++++++++++++++--------- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/components/Detail.vue b/src/components/Detail.vue index dd59e6a..c98006b 100644 --- a/src/components/Detail.vue +++ b/src/components/Detail.vue @@ -133,7 +133,7 @@ export default { starEvent () { star.find({ key: this.detail.key, ids: this.info.id }).then(res => { const docs = { - key: this.detail.site.key, + key: this.detail.key, ids: this.info.id, name: this.info.name, type: this.info.type, @@ -156,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('#') diff --git a/src/components/Film.vue b/src/components/Film.vue index 1002de4..7bc6711 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -329,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('#') diff --git a/src/components/History.vue b/src/components/History.vue index 2f784ef..fba6828 100644 --- a/src/components/History.vue +++ b/src/components/History.vue @@ -101,7 +101,7 @@ export default { }, 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('#') diff --git a/src/components/Star.vue b/src/components/Star.vue index ac43fc4..3bc7205 100644 --- a/src/components/Star.vue +++ b/src/components/Star.vue @@ -166,7 +166,7 @@ export default { }, downloadEvent (e) { zy.download(e.key, 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('#') @@ -181,14 +181,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.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』格式的链接已复制, 快去下载吧!') + }) } }) },