From de31c4c0bb56b38599e9265deb9e52fee632ff45 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 5 Nov 2020 21:28:08 +0100
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Recommendation=E7=9A=84?=
 =?UTF-8?q?=E6=8B=BC=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  6 +--
 src/components/Aside.vue                      |  2 +-
 ...{Recommandation.vue => Recommendation.vue} | 53 ++++++++++---------
 src/components/register.js                    |  4 +-
 src/lib/dexie/dexie.js                        |  8 +--
 src/lib/dexie/index.js                        |  4 +-
 ...ommandations.json => Recommendations.json} |  0
 src/lib/dexie/initData.js                     |  6 +--
 src/lib/dexie/recommandation.js               | 28 ----------
 src/lib/dexie/recommendation.js               | 28 ++++++++++
 10 files changed, 71 insertions(+), 68 deletions(-)
 rename src/components/{Recommandation.vue => Recommendation.vue} (84%)
 rename src/lib/dexie/iniData/{Recommandations.json => Recommendations.json} (100%)
 delete mode 100644 src/lib/dexie/recommandation.js
 create mode 100644 src/lib/dexie/recommendation.js

diff --git a/src/App.vue b/src/App.vue
index a764ea7..2cf0493 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,7 +10,7 @@
       <History v-show="view === 'History'" />
       <Setting v-show="view === 'Setting'" />
       <EditSites v-if="view === 'EditSites'"/>
-      <Recommandation v-show="view === 'Recommandation'" />
+      <Recommendation v-show="view === 'Recommendation'" />
     </div>
     <transition name="slide">
       <Detail v-if="detail.show"/>
@@ -45,8 +45,8 @@ export default {
     editSites () {
       return this.$store.getters.getEditSites
     },
-    recommandation () {
-      return this.$store.getters.recommandation
+    recommendation () {
+      return this.$store.getters.recommendation
     }
   },
   watch: {
diff --git a/src/components/Aside.vue b/src/components/Aside.vue
index e458c79..8cbdd33 100644
--- a/src/components/Aside.vue
+++ b/src/components/Aside.vue
@@ -14,7 +14,7 @@
         </g>
       </svg>
     </span>
-    <span :class="[view === 'Recommandation' ? 'active ': ''] + 'zy-svg'" @click="changeView('Recommandation')">
+    <span :class="[view === 'Recommendation' ? 'active ': ''] + 'zy-svg'" @click="changeView('Recommendation')">
       <svg role="img" xmlns="http://www.w3.org/2000/svg" width="48px" height="48px" viewBox="0 0 24 24" aria-labelledby="thumbUpIconTitle" stroke="#2329D6" stroke-width="1" stroke-linecap="square" stroke-linejoin="miter" fill="none" color="#2329D6">
       <title id="thumbUpIconTitle">影视推荐</title>
       <path d="M8,8.73984815 C8,8.26242561 8.17078432,7.80075162 8.4814868,7.43826541 L13.2723931,1.84887469 C13.7000127,1.34998522 14.4122932,1.20614658 15,1.5 C15.5737957,1.78689785 15.849314,2.45205792 15.6464466,3.06066017 L14,8 L18.6035746,8 C18.7235578,8 18.8432976,8.01079693 18.9613454,8.03226018 C20.0480981,8.22985158 20.7689058,9.27101818 20.5713144,10.3577709 L19.2985871,17.3577709 C19.1256814,18.3087523 18.2974196,19 17.3308473,19 L10,19 C8.8954305,19 8,18.1045695 8,17 L8,8.73984815 Z"/>
diff --git a/src/components/Recommandation.vue b/src/components/Recommendation.vue
similarity index 84%
rename from src/components/Recommandation.vue
rename to src/components/Recommendation.vue
index 26f706c..fa6896f 100644
--- a/src/components/Recommandation.vue
+++ b/src/components/Recommendation.vue
@@ -2,7 +2,7 @@
   <div class="listpage" id="recommandataions">
     <div class="listpage-header" id="recommandataions-header">
         <el-switch v-model="viewMode" active-text="海报" active-value="picture" inactive-text="列表" inactive-value="list" @change="updateViewMode"></el-switch>
-        <el-button type="text">视频数：{{ recommandations.length }}</el-button>
+        <el-button type="text">视频数：{{ recommendations.length }}</el-button>
         <el-select v-model="selectedAreas" multiple collapse-tags placeholder="地区" :popper-append-to-body="false">
           <el-option
             v-for="item in areas"
@@ -25,7 +25,7 @@
       <div class="show-table" id="star-table" v-show="viewMode === 'list'">
         <el-table size="mini" fit height="100%" row-key="id"
         ref="recommandataionsTable"
-        :data="filteredRecommandations"
+        :data="filteredRecommendations"
         @row-click="detailEvent">
           <el-table-column
             prop="name"
@@ -47,12 +47,12 @@
             width="100"
             align="center">
           </el-table-column>
-          <el-table-column v-if="filteredRecommandations.some(e => e.detail.note)"
+          <el-table-column v-if="filteredRecommendations.some(e => e.detail.note)"
             prop="detail.note"
             width="120"
             label="备注">
           </el-table-column>
-          <el-table-column v-if="filteredRecommandations.some(e => e.rate)"
+          <el-table-column v-if="filteredRecommendations.some(e => e.rate)"
             prop="rate"
             width="120"
             label="豆瓣评分">
@@ -71,7 +71,7 @@
         </el-table>
       </div>
       <div class="show-picture" id="star-picture" v-show="viewMode === 'picture'">
-        <Waterfall ref="recommandataionsWaterfall" :list="filteredRecommandations" :gutter="20" :width="240"
+        <Waterfall ref="recommandataionsWaterfall" :list="filteredRecommendations" :gutter="20" :width="240"
           :breakpoints="{
             1200: { //当屏幕宽度小于等于1200
               rowPerView: 4,
@@ -117,15 +117,15 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { history, recommandation, setting } from '../lib/dexie'
+import { history, recommendation, setting } from '../lib/dexie'
 import zy from '../lib/site/tools'
 import Waterfall from 'vue-waterfall-plugin'
 const { clipboard } = require('electron')
 export default {
-  name: 'recommandations',
+  name: 'recommendations',
   data () {
     return {
-      recommandations: [],
+      recommendations: [],
       sites: [],
       viewMode: 'picture',
       loading: false,
@@ -171,16 +171,16 @@ export default {
         this.SET_SHARE(val)
       }
     },
-    filteredRecommandations () {
-      var filteredData = this.recommandations.filter(x => (this.selectedAreas.length === 0) || this.selectedAreas.includes(x.detail.area))
+    filteredRecommendations () {
+      var filteredData = this.recommendations.filter(x => (this.selectedAreas.length === 0) || this.selectedAreas.includes(x.detail.area))
       filteredData = filteredData.filter(x => (this.selectedTypes.length === 0) || this.selectedTypes.includes(x.detail.type))
       return filteredData
     }
   },
   watch: {
     view () {
-      if (this.view === 'Recommandation') {
-        this.getRecommandations()
+      if (this.view === 'Recommendation') {
+        this.getRecommendations()
         this.$refs.recommandataionsWaterfall.refresh()
       }
     }
@@ -198,21 +198,24 @@ export default {
       }
     },
     updateEvent () {
-      const url = 'https://raw.githubusercontent.com/Hunlongyu/ZY-Player/master/src/lib/dexie/iniData/Recommandations.json'
+      const url = 'https://raw.githubusercontent.com/Hunlongyu/ZY-Player/master/src/lib/dexie/iniData/Recommendations.json'
       this.loading = true
       const axios = require('axios')
       axios.get(url).then(res => {
         if (res.status === 200) {
           if (res.data.length > 0) {
-            this.recommandations = res.data.sort(function (a, b) {
+            this.recommendations = res.data.sort(function (a, b) {
               return b.detail.year - a.detail.year
             })
-            recommandation.clear().then(recommandation.bulkAdd(this.recommandations))
+            recommendation.clear().then(recommendation.bulkAdd(this.recommendations))
             this.getFilterData()
             this.$message.success('更新推荐成功')
           }
         }
         this.loading = false
+      }).catch(error => {
+        this.loading = false
+        this.$message.error('更新推荐失败. ' + error)
       })
     },
     async playEvent (e) {
@@ -225,13 +228,13 @@ export default {
       this.view = 'Play'
     },
     deleteEvent (e) {
-      recommandation.remove(e.id).then(res => {
+      recommendation.remove(e.id).then(res => {
         if (res) {
           this.$message.warning('删除失败')
         } else {
           this.$message.success('删除成功')
         }
-        this.getRecommandations()
+        this.getRecommendations()
       })
     },
     shareEvent (e) {
@@ -283,32 +286,32 @@ export default {
         }
       })
     },
-    getRecommandations () {
-      recommandation.all().then(res => {
-        this.recommandations = res.sort(function (a, b) {
+    getRecommendations () {
+      recommendation.all().then(res => {
+        this.recommendations = res.sort(function (a, b) {
           return b.id - a.id
         })
         this.getFilterData()
       })
     },
     getFilterData () {
-      this.types = [...new Set(this.recommandations.map(ele => ele.detail.type))].filter(x => x)
-      this.areas = [...new Set(this.recommandations.map(ele => ele.detail.area))].filter(x => x)
+      this.types = [...new Set(this.recommendations.map(ele => ele.detail.type))].filter(x => x)
+      this.areas = [...new Set(this.recommendations.map(ele => ele.detail.area))].filter(x => x)
     },
     getViewMode () {
       setting.find().then(res => {
-        this.viewMode = res.recommandationViewMode
+        this.viewMode = res.recommendationViewMode
       })
     },
     updateViewMode () {
       setting.find().then(res => {
-        res.recommandationViewMode = this.viewMode
+        res.recommendationViewMode = this.viewMode
         setting.update(res)
       })
     }
   },
   created () {
-    this.getRecommandations()
+    this.getRecommendations()
     this.getViewMode()
   }
 }
diff --git a/src/components/register.js b/src/components/register.js
index 64b4899..f6194ab 100644
--- a/src/components/register.js
+++ b/src/components/register.js
@@ -10,7 +10,7 @@ import Share from './Share'
 import History from './History'
 import EditSites from './EditSites'
 import IPTV from './IPTV'
-import Recommandation from './Recommandation'
+import Recommendation from './Recommendation'
 export default {
   registerComponents () {
     Vue.component('Aside', Aside)
@@ -24,6 +24,6 @@ export default {
     Vue.component('History', History)
     Vue.component('EditSites', EditSites)
     Vue.component('IPTV', IPTV)
-    Vue.component('Recommandation', Recommandation)
+    Vue.component('Recommendation', Recommendation)
   }
 }
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index 9a0b282..37aef29 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -1,15 +1,15 @@
 import Dexie from 'dexie'
-import { setting, sites, localKey, iptv, recommandations } from './initData'
+import { setting, sites, localKey, iptv, recommendations } from './initData'
 
 const db = new Dexie('zy')
 
 db.version(4).stores({
   search: '++id, keywords',
   iptvSearch: '++id, keywords',
-  setting: 'id, theme, site, shortcut, view, externalPlayer, searchAllSites, excludeRootClasses, excludeR18Films, forwardTimeInSec, starViewMode, recommandationViewMode, password',
+  setting: 'id, theme, site, shortcut, view, externalPlayer, searchAllSites, excludeRootClasses, excludeR18Films, forwardTimeInSec, starViewMode, recommendationViewMode, password',
   shortcut: 'name, key, desc',
   star: '++id, [key+ids], site, name, detail, index, rate, hasUpdate',
-  recommandation: '++id, [key+ids], site, name, detail, index, rate, hasUpdate',
+  recommendation: '++id, [key+ids], site, name, detail, index, rate, hasUpdate',
   sites: '++id, key, name, api, download, isActive, group',
   history: '++id, [site+ids], name, type, year, index, time',
   mini: 'id, site, ids, name, index, time',
@@ -21,7 +21,7 @@ db.on('populate', () => {
   db.sites.bulkAdd(sites)
   db.shortcut.bulkAdd(localKey)
   db.iptv.bulkAdd(iptv)
-  db.recommandation.bulkAdd(recommandations)
+  db.recommendation.bulkAdd(recommendations)
 })
 
 db.open()
diff --git a/src/lib/dexie/index.js b/src/lib/dexie/index.js
index 184afbb..dd04d47 100644
--- a/src/lib/dexie/index.js
+++ b/src/lib/dexie/index.js
@@ -7,7 +7,7 @@ import sites from './sites'
 import search from './search'
 import iptvSearch from './iptvSearch'
 import iptv from './iptv'
-import recommandation from './recommandation'
+import recommendation from './recommendation'
 
 export {
   history,
@@ -19,5 +19,5 @@ export {
   iptv,
   search,
   iptvSearch,
-  recommandation
+  recommendation
 }
diff --git a/src/lib/dexie/iniData/Recommandations.json b/src/lib/dexie/iniData/Recommendations.json
similarity index 100%
rename from src/lib/dexie/iniData/Recommandations.json
rename to src/lib/dexie/iniData/Recommendations.json
diff --git a/src/lib/dexie/initData.js b/src/lib/dexie/initData.js
index 0470673..5b33f15 100644
--- a/src/lib/dexie/initData.js
+++ b/src/lib/dexie/initData.js
@@ -10,7 +10,7 @@ const setting = [
     excludeR18Films: true,
     forwardTimeInSec: 5,
     starViewMode: 'picture',
-    recommandationViewMode: 'picture',
+    recommendationViewMode: 'picture',
     password: ''
   }
 ]
@@ -118,12 +118,12 @@ const getSite = (key) => {
 
 const sites = require('./iniData/Sites.json')
 const iptv = require('./iniData/Iptv.json')
-const recommandations = require('./iniData/Recommandations.json')
+const recommendations = require('./iniData/Recommendations.json')
 export {
   setting,
   sites,
   iptv,
-  recommandations,
+  recommendations,
   localKey,
   getSite
 }
diff --git a/src/lib/dexie/recommandation.js b/src/lib/dexie/recommandation.js
deleted file mode 100644
index 24c44f9..0000000
--- a/src/lib/dexie/recommandation.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import db from './dexie'
-const { recommandation } = db
-export default {
-  async add (doc) {
-    return await recommandation.add(doc)
-  },
-  async bulkAdd (doc) {
-    return await recommandation.bulkAdd(doc)
-  },
-  async find (doc) {
-    return await recommandation.where(doc).first()
-  },
-  async update (id, docs) {
-    return await recommandation.update(id, docs)
-  },
-  async all () {
-    return await recommandation.toArray()
-  },
-  async remove (id) {
-    return await recommandation.delete(id)
-  },
-  async get (id) {
-    return await recommandation.get(id)
-  },
-  async clear () {
-    return await recommandation.clear()
-  }
-}
diff --git a/src/lib/dexie/recommendation.js b/src/lib/dexie/recommendation.js
new file mode 100644
index 0000000..3e0b8f6
--- /dev/null
+++ b/src/lib/dexie/recommendation.js
@@ -0,0 +1,28 @@
+import db from './dexie'
+const { recommendation } = db
+export default {
+  async add (doc) {
+    return await recommendation.add(doc)
+  },
+  async bulkAdd (doc) {
+    return await recommendation.bulkAdd(doc)
+  },
+  async find (doc) {
+    return await recommendation.where(doc).first()
+  },
+  async update (id, docs) {
+    return await recommendation.update(id, docs)
+  },
+  async all () {
+    return await recommendation.toArray()
+  },
+  async remove (id) {
+    return await recommendation.delete(id)
+  },
+  async get (id) {
+    return await recommendation.get(id)
+  },
+  async clear () {
+    return await recommendation.clear()
+  }
+}