From fa7a799e2b0df7f4ff9cdf9739333e511e0dd5d6 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Tue, 13 Apr 2021 17:34:46 +0200
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BC=93=E5=AD=98=E7=94=B5?=
 =?UTF-8?q?=E5=BD=B1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Recommendation.vue | 88 +++++++++++++------------------
 src/components/Setting.vue        |  1 -
 src/lib/dexie/cachedMovies.js     | 28 ++++++++++
 src/lib/dexie/dexie.js            |  3 +-
 src/lib/dexie/index.js            |  4 +-
 5 files changed, 69 insertions(+), 55 deletions(-)
 create mode 100644 src/lib/dexie/cachedMovies.js

diff --git a/src/components/Recommendation.vue b/src/components/Recommendation.vue
index f4fd4c2..f101c20 100644
--- a/src/components/Recommendation.vue
+++ b/src/components/Recommendation.vue
@@ -150,7 +150,7 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { history, recommendation, setting, sites } from '../lib/dexie'
+import { history, recommendation, setting, sites, cachedMovies } from '../lib/dexie'
 import zy from '../lib/site/tools'
 import Waterfall from 'vue-waterfall-plugin'
 import axios from 'axios'
@@ -178,7 +178,9 @@ export default {
       selectedTypes: [],
       sortKeyword: '',
       sortKeywords: ['按片名', '按上映年份', '按更新时间'],
-      selectedYears: { start: 0, end: new Date().getFullYear() }
+      selectedYears: { start: 0, end: new Date().getFullYear() },
+      // 缓存数据
+      localCachedMovies: []
     }
   },
   components: {
@@ -248,67 +250,43 @@ export default {
         this.recommendations = this.recommendationsDefault
       }
       if (this.selectedRecommendationType === '豆瓣热门电影') {
-        this.getRecommendationsDoubanMovie()
+        const doubanUrl = 'https://movie.douban.com/j/search_subjects?type=movie&tag=%E7%83%AD%E9%97%A8&sort=recommend&page_limit=50&page_start=0'
+        this.getRecommendationsDoubanMovieOrTV(doubanUrl)
       }
       if (this.selectedRecommendationType === '豆瓣热门剧集') {
-        this.getRecommendationsDoubanTV()
+        const doubanUrl = 'https://movie.douban.com/j/search_subjects?type=tv&tag=%E7%83%AD%E9%97%A8&sort=recommend&page_limit=50&page_start=0'
+        this.getRecommendationsDoubanMovieOrTV(doubanUrl)
       }
     },
-    getRecommendationsDoubanMovie () {
-      if (this.recommendationsDoubanMovie && this.recommendationsDoubanMovie.length > 0) {
-        this.recommendations = this.recommendationsDoubanMovie
-        return
-      }
+    getRecommendationsDoubanMovieOrTV (doubanUrl) {
       this.recommendations = []
-      const doubleUrl = 'https://movie.douban.com/j/search_subjects?type=movie&tag=%E7%83%AD%E9%97%A8&sort=recommend&page_limit=50&page_start=0'
-      axios.get(doubleUrl).then(res => {
+      axios.get(doubanUrl).then(res => {
         if (res.data) {
           res.data.subjects.forEach(element => {
-            zy.searchFirstDetail(this.sites[0].key, element.title).then(detailRes => {
-              if (detailRes) {
-                const doc = {
-                  key: this.sites[0].key,
-                  ids: detailRes.id,
-                  site: this.sites[0],
-                  name: detailRes.name,
-                  detail: detailRes,
-                  rate: element.rate
-                }
-                this.recommendationsDoubanMovie.push(doc)
-                this.recommendations.push(doc)
-              }
-            })
+            const localCachedMovie = this.localCachedMovies.find(e => e.key === this.sites[0].key && e.name === element.title)
+            if (localCachedMovie) {
+              this.recommendations.push(localCachedMovie)
+            } else {
+              this.searchAndCacheMovie(element)
+            }
           })
         }
       })
     },
-    getRecommendationsDoubanTV () {
-      if (this.recommendationsDoubanMovie && this.recommendationsDoubanMovie.length > 0) {
-        this.recommendations = this.recommendationsDoubanTV
-        return
-      }
-      this.recommendations = []
-      const doubleUrl = 'https://movie.douban.com/j/search_subjects?type=tv&tag=%E7%83%AD%E9%97%A8&sort=recommend&page_limit=50&page_start=0'
-      axios.get(doubleUrl).then(res => {
-        if (res.data) {
-          res.data.subjects.forEach(element => {
-            console.log('searching ' + element.title)
-            zy.searchFirstDetail(this.sites[0].key, element.title).then(detailRes => {
-              console.log(detailRes)
-              if (detailRes) {
-                const doc = {
-                  key: this.sites[0].key,
-                  ids: detailRes.id,
-                  site: this.sites[0],
-                  name: detailRes.name,
-                  detail: detailRes,
-                  rate: element.rate
-                }
-                this.recommendationsDoubanTV.push(doc)
-                this.recommendations.push(doc)
-              }
-            })
-          })
+    searchAndCacheMovie (element) {
+      zy.searchFirstDetail(this.sites[0].key, element.title).then(detailRes => {
+        if (detailRes) {
+          const doc = {
+            key: this.sites[0].key,
+            ids: detailRes.id,
+            site: this.sites[0],
+            name: detailRes.name,
+            detail: detailRes,
+            rate: element.rate
+          }
+          this.recommendations.push(doc)
+          this.localCachedMovies.push(doc)
+          cachedMovies.add(doc)
         }
       })
     },
@@ -457,11 +435,17 @@ export default {
           this.sites = res.filter(item => item.isActive)
         }
       })
+    },
+    getCachedMovies () {
+      cachedMovies.all().then(res => {
+        this.localCachedMovies = res
+      })
     }
   },
   created () {
     this.getAllSites()
     this.getRecommendations()
+    this.getCachedMovies()
   },
   mounted () {
     addEventListener('resize', () => {
diff --git a/src/components/Setting.vue b/src/components/Setting.vue
index befca8b..b332d37 100644
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -370,7 +370,6 @@ export default {
     updateSettingEvent () {
       this.show.editPlayerPath = false
       this.setting = this.d
-      console.log(this.setting.restoreWindowPositionAndSize)
       setting.update(this.d)
     },
     toggleExcludeR18Films () {
diff --git a/src/lib/dexie/cachedMovies.js b/src/lib/dexie/cachedMovies.js
new file mode 100644
index 0000000..a8183d0
--- /dev/null
+++ b/src/lib/dexie/cachedMovies.js
@@ -0,0 +1,28 @@
+import db from './dexie'
+const { cachedMovies } = db
+export default {
+  async add (doc) {
+    return await cachedMovies.add(doc)
+  },
+  async bulkAdd (doc) {
+    return await cachedMovies.bulkAdd(doc)
+  },
+  async find (doc) {
+    return await cachedMovies.where(doc).first()
+  },
+  async update (id, docs) {
+    return await cachedMovies.update(id, docs)
+  },
+  async all () {
+    return await cachedMovies.toArray()
+  },
+  async remove (id) {
+    return await cachedMovies.delete(id)
+  },
+  async get (id) {
+    return await cachedMovies.get(id)
+  },
+  async clear () {
+    return await cachedMovies.clear()
+  }
+}
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index 13e1d18..1f120a2 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -75,7 +75,8 @@ db.version(10).stores({
 
 db.version(11).stores({
   setting: 'id, theme, shortcut, view, volume, externalPlayer, searchGroup, excludeRootClasses, excludeR18Films, forwardTimeInSec, starViewMode, recommandationViewMode,' +
-    'searchViewMode, password, proxy, allowPassWhenIptvCheck, autocleanWhenIptvCheck, rootClassFilter, r18ClassFilter, classFilter, restoreWindowPositionAndSize, windowPositionAndSize, pauseWhenMinimize'
+    'searchViewMode, password, proxy, allowPassWhenIptvCheck, autocleanWhenIptvCheck, rootClassFilter, r18ClassFilter, classFilter, restoreWindowPositionAndSize, windowPositionAndSize, pauseWhenMinimize',
+  cachedMovies: '++id, [key+ids], site, name, detail, index, rate, hasUpdate'
 }).upgrade(trans => {
   trans.setting.toCollection().modify(setting => {
     setting.restoreWindowPositionAndSize = false
diff --git a/src/lib/dexie/index.js b/src/lib/dexie/index.js
index 2430e1e..fb83b45 100644
--- a/src/lib/dexie/index.js
+++ b/src/lib/dexie/index.js
@@ -8,6 +8,7 @@ import search from './search'
 import iptv from './iptv'
 import channelList from './channelList'
 import recommendation from './recommendation'
+import cachedMovies from './cachedMovies'
 
 export {
   history,
@@ -19,5 +20,6 @@ export {
   iptv,
   channelList,
   search,
-  recommendation
+  recommendation,
+  cachedMovies
 }