From 2c6ad449748e7ea56b01244561a4aacbef825bf2 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Thu, 31 Dec 2020 20:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEvideoFlag=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail.vue         | 2 +-
 src/components/Film.vue           | 7 +++++--
 src/components/History.vue        | 2 +-
 src/components/Recommendation.vue | 7 +++++--
 src/components/Star.vue           | 9 ++++++---
 src/lib/site/tools.js             | 6 +++---
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/components/Detail.vue b/src/components/Detail.vue
index 008518d..1b366dc 100644
--- a/src/components/Detail.vue
+++ b/src/components/Detail.vue
@@ -245,7 +245,7 @@ export default {
       }
     },
     downloadEvent () {
-      zy.download(this.detail.key, this.info.id).then(res => {
+      zy.download(this.detail.key, this.info.id, this.videoFlag).then(res => {
         clipboard.writeText(res.downloadUrls)
         this.$message.success(res.info)
       }).catch((err) => {
diff --git a/src/components/Film.vue b/src/components/Film.vue
index eaac154..184180f 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -747,8 +747,11 @@ export default {
         info: e
       }
     },
-    downloadEvent (site, row) {
-      zy.download(site.key, row.id).then(res => {
+    async downloadEvent (site, row) {
+      const db = await history.find({ site: site.key, ids: row.id })
+      let videoFlag
+      if (db) videoFlag = db.videoFlag
+      zy.download(site.key, row.id, videoFlag).then(res => {
         clipboard.writeText(res.downloadUrls)
         this.$message.success(res.info)
       }).catch((err) => {
diff --git a/src/components/History.vue b/src/components/History.vue
index e97d076..bec59c8 100644
--- a/src/components/History.vue
+++ b/src/components/History.vue
@@ -250,7 +250,7 @@ export default {
       }
     },
     downloadEvent (e) {
-      zy.download(e.site, e.ids).then(res => {
+      zy.download(e.site, e.ids, e.videoFlag).then(res => {
         clipboard.writeText(res.downloadUrls)
         this.$message.success(res.info)
       }).catch((err) => {
diff --git a/src/components/Recommendation.vue b/src/components/Recommendation.vue
index 5707aa2..5c40b9c 100644
--- a/src/components/Recommendation.vue
+++ b/src/components/Recommendation.vue
@@ -279,8 +279,11 @@ export default {
         info: e.detail
       }
     },
-    downloadEvent (e) {
-      zy.download(e.key, e.ids).then(res => {
+    async downloadEvent (e) {
+      const db = await history.find({ site: e.key, ids: e.ids })
+      let videoFlag
+      if (db) videoFlag = db.videoFlag
+      zy.download(e.key, e.ids, videoFlag).then(res => {
         clipboard.writeText(res.downloadUrls)
         this.$message.success(res.info)
       }).catch((err) => {
diff --git a/src/components/Star.vue b/src/components/Star.vue
index 1858042..691be4f 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -138,7 +138,7 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { star, sites, setting } from '../lib/dexie'
+import { history, star, sites, setting } from '../lib/dexie'
 import zy from '../lib/site/tools'
 import { remote } from 'electron'
 import fs from 'fs'
@@ -339,8 +339,11 @@ export default {
         this.updateEvent(e)
       })
     },
-    downloadEvent (e) {
-      zy.download(e.key, e.ids).then(res => {
+    async downloadEvent (e) {
+      const db = await history.find({ site: e.key, ids: e.ids })
+      let videoFlag
+      if (db) videoFlag = db.videoFlag
+      zy.download(e.key, e.ids, videoFlag).then(res => {
         clipboard.writeText(res.downloadUrls)
         this.$message.success(res.info)
       }).catch((err) => {
diff --git a/src/lib/site/tools.js b/src/lib/site/tools.js
index 52d63d2..6026ddb 100644
--- a/src/lib/site/tools.js
+++ b/src/lib/site/tools.js
@@ -291,7 +291,7 @@ const zy = {
    * @param {*} id 资源唯一标识符 id
    * @returns
    */
-  download (key, id) {
+  download (key, id, videoFlag) {
     return new Promise((resolve, reject) => {
       let info = ''
       let downloadUrls = ''
@@ -325,8 +325,8 @@ const zy = {
           })
         } else {
           zy.detail(key, id).then(res => {
-            const list = [...res[0].list]
-            for (const i of list) {
+            const dl = res.fullList.find(e => e.flag === videoFlag) || res[0]
+            for (const i of dl.list) {
               const url = encodeURI(i.split('$')[1])
               downloadUrls += (url + '\n')
             }