From 426bb05e1c7dcba7c52e45b0b847e42d0307269b Mon Sep 17 00:00:00 2001
From: hunlongyu <hunlongyu@gmail.com>
Date: Fri, 17 Jan 2020 16:42:40 +0800
Subject: [PATCH] =?UTF-8?q?v0.7.4=20=E6=9C=80=E7=BB=88=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=20dexie=20=E6=9D=A5=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                 |  3 +-
 src/page/setting.vue         | 32 +++++++++++-----
 src/plugins/dexie/index.ts   | 35 ++++++++++++++++++
 src/plugins/dexie/setting.ts | 42 +++++++++++++++++++++
 src/plugins/dexie/video.ts   | 60 ++++++++++++++++++++++++++++++
 src/plugins/nedb/index.ts    | 19 ----------
 src/plugins/nedb/setting.ts  | 28 --------------
 tsconfig.json                |  3 +-
 yarn.lock                    | 72 +++---------------------------------
 9 files changed, 167 insertions(+), 127 deletions(-)
 create mode 100644 src/plugins/dexie/index.ts
 create mode 100644 src/plugins/dexie/setting.ts
 create mode 100644 src/plugins/dexie/video.ts
 delete mode 100644 src/plugins/nedb/index.ts
 delete mode 100644 src/plugins/nedb/setting.ts

diff --git a/package.json b/package.json
index 161aa98..15643cd 100644
--- a/package.json
+++ b/package.json
@@ -14,10 +14,9 @@
   "main": "background.js",
   "dependencies": {
     "core-js": "^3.4.4",
+    "dexie": "^2.0.4",
     "element-ui": "^2.4.5",
     "flyio": "^0.6.14",
-    "nedb-async": "^0.1.3",
-    "nedb-async-await": "^0.1.2",
     "vue": "^2.6.10",
     "vue-class-component": "^7.0.2",
     "vue-property-decorator": "^8.3.0",
diff --git a/src/page/setting.vue b/src/page/setting.vue
index f7bd94d..58c8037 100644
--- a/src/page/setting.vue
+++ b/src/page/setting.vue
@@ -34,7 +34,8 @@
 <script lang="ts">
 import Vue from 'vue'
 import { shell } from 'electron'
-// import setting from '@/plugins/nedb/setting'
+// import db from '@/plugins/dexie/index'
+import setting from '@/plugins/dexie/setting'
 export default Vue.extend({
   methods: {
     linkOpen (e:string) {
@@ -43,25 +44,36 @@ export default Vue.extend({
       }
     },
     test () {
-      // setting.setItem('theme', 'light').then(res => {
-      //   console.log(res)
-      // })
       // let data = {
       //   name: 'lala',
       //   time: '12346',
-      //   type: 'dianshiju'
+      //   type: 'dianshiju',
+      //   detail: 'https://www.baidu.com'
       // }
-      // setting.add({ theme: 'dark' }).then(res => {
+
+      // setting.add({ theme: 'light' }).then(res => {
       //   console.log(res)
       // })
+      setting.count().then(res => {
+        console.log(res)
+      })
+
       // setting.find({ theme: 'light' }).then(res => {
       //   console.log(res)
+      //   if (!res) {
+      //     setting.add({ theme: 'light' }).then(res => {
+      //       console.log(res)
+      //     })
+      //   }
       // })
-      // video.add('detail', data).then((res: any) => {
-      //   console.log(res)
-      // })
-      // setting.getItem('theme').then(res => {
+
+      // setting.find({ theme: 'light' }).then(res => {
       //   console.log(res)
+      //   // if (res) {
+      //   //   setting.update(res.id, { theme: 'dark' }).then(res => {
+      //   //     console.log(res)
+      //   //   })
+      //   // }
       // })
     }
   },
diff --git a/src/plugins/dexie/index.ts b/src/plugins/dexie/index.ts
new file mode 100644
index 0000000..8601eca
--- /dev/null
+++ b/src/plugins/dexie/index.ts
@@ -0,0 +1,35 @@
+import Dexie from 'dexie'
+
+class ZYDB extends Dexie {
+  setting: Dexie.Table<setting, number>
+  video: Dexie.Table<video, number>
+
+  constructor () {
+    super('ZYDB')
+    this.version(1).stores({
+      setting: '++id, theme, site',
+      video: '++id, name, type, time, detail, urls, index'
+    })
+
+    this.setting = this.table('setting')
+    this.video = this.table('video')
+  }
+}
+
+export interface setting {
+  id?: number
+  theme?: string
+  site?: object
+}
+
+export interface video {
+  id?: number
+  name?: string
+  type?: string
+  time?: string
+  detail?: string
+  urls?: Array<string>
+  index?: number
+}
+
+export default new ZYDB()
diff --git a/src/plugins/dexie/setting.ts b/src/plugins/dexie/setting.ts
new file mode 100644
index 0000000..95503bb
--- /dev/null
+++ b/src/plugins/dexie/setting.ts
@@ -0,0 +1,42 @@
+import db from './index'
+
+export default {
+  add (data: any): Promise<any> {
+    return new Promise((resolve, reject) => {
+      db.setting.add(data).then(res => {
+        resolve(res)
+      }).catch(err => {
+        reject(err)
+      })
+    })
+  },
+  find (data?: any): Promise<any> {
+    return new Promise((resolve, reject) => {
+      db.setting.get(data).then(res => {
+        resolve(res)
+      }).catch(err => {
+        reject(err)
+      })
+    })
+  },
+  update (id: number, data: any): Promise<any> {
+    return new Promise((resolve, reject) => {
+      db.setting.update(id, data).then(updated => {
+        if (updated) {
+          resolve(updated)
+        } else {
+          reject(updated)
+        }
+      })
+    })
+  },
+  count (): Promise<any> {
+    return new Promise((resolve, reject) => {
+      db.setting.count().then(res => {
+        resolve(res)
+      }).catch(err => {
+        reject(err)
+      })
+    })
+  }
+}
diff --git a/src/plugins/dexie/video.ts b/src/plugins/dexie/video.ts
new file mode 100644
index 0000000..ccd1ee3
--- /dev/null
+++ b/src/plugins/dexie/video.ts
@@ -0,0 +1,60 @@
+import db from './index'
+
+export default {
+  add (data: any): Promise<any> {
+    return new Promise((resolve, reject) => {
+      db.video.add(data).then(res => {
+        resolve(res)
+      }).catch(err => {
+        reject(err)
+      })
+    })
+  },
+  find (data?: any): Promise<any> {
+    return new Promise((resolve, reject) => {
+      db.video.get(data).then(res => {
+        resolve(res)
+      }).catch(err => {
+        reject(err)
+      })
+    })
+  },
+  update (id: number, data: any): Promise<any> {
+    return new Promise((resolve, reject) => {
+      db.video.update(id, data).then(updated => {
+        if (updated) {
+          resolve(updated)
+        } else {
+          reject(updated)
+        }
+      })
+    })
+  },
+  count (): Promise<any> {
+    return new Promise((resolve, reject) => {
+      db.video.count().then(res => {
+        resolve(res)
+      }).catch(err => {
+        reject(err)
+      })
+    })
+  },
+  remove (id: number) {
+    return new Promise((resolve, reject) => {
+      db.video.delete(id).then(res => {
+        resolve(res)
+      }).catch(err => {
+        reject(err)
+      })
+    })
+  },
+  clear () {
+    return new Promise((resolve, reject) => {
+      db.video.clear().then(res => {
+        resolve(res)
+      }).catch(err => {
+        reject(err)
+      })
+    })
+  }
+}
diff --git a/src/plugins/nedb/index.ts b/src/plugins/nedb/index.ts
deleted file mode 100644
index 1616371..0000000
--- a/src/plugins/nedb/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// import Nedb from 'nedb-async'
-// import { Datastore } from 'nedb-async-await'
-
-// import Nedb from 'nedb'
-
-// const setting = new Nedb({
-//   filename: 'setting',
-//   autoload: true
-// })
-
-// const video = new Nedb({
-//   filename: 'video',
-//   autoload: true
-// })
-
-// export {
-//   setting,
-//   video
-// }
diff --git a/src/plugins/nedb/setting.ts b/src/plugins/nedb/setting.ts
deleted file mode 100644
index 5f284fe..0000000
--- a/src/plugins/nedb/setting.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// import { setting } from './index'
-
-// export default {
-//   add (data: any): Promise<any> {
-//     return new Promise((resolve, reject) => {
-//       setting.insert(data, (err: any, doc: any) => {
-//         reject(err)
-//         resolve(doc)
-//       })
-//     })
-//   },
-//   find (data?: any): Promise<any> {
-//     return new Promise((resolve, reject) => {
-//       setting.find(data, (err: any, doc: any) => {
-//         reject(err)
-//         resolve(doc)
-//       })
-//     })
-//   },
-//   update (id: string, data: any): Promise<any> {
-//     return new Promise((resolve, reject) => {
-//       setting.update({ _id: id }, { $set: data }, {}, (err: any, num: number) => {
-//         reject(err)
-//         resolve(num)
-//       })
-//     })
-//   }
-// }
diff --git a/tsconfig.json b/tsconfig.json
index 315b6bd..b57578e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,8 +12,7 @@
     "sourceMap": true,
     "baseUrl": ".",
     "types": [
-      "webpack-env",
-      "nedb"
+      "webpack-env"
     ],
     "paths": {
       "@/*": [
diff --git a/yarn.lock b/yarn.lock
index 1adb8bc..da9a14e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -927,13 +927,6 @@
   resolved "https://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz?cache=0&sync_timestamp=1572464707542&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fminimatch%2Fdownload%2F%40types%2Fminimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha1-PcoOPzOyAPx9ETnAzZbBJoyt/Z0=
 
-"@types/nedb@^1.8.5":
-  version "1.8.9"
-  resolved "http://r.cnpmjs.org/@types/nedb/download/@types/nedb-1.8.9.tgz#3cb80a94dfe41bea1dc33c4ea39cd4e7f754abc4"
-  integrity sha1-PLgKlN/kG+odwzxOo5zU5/dUq8Q=
-  dependencies:
-    "@types/node" "*"
-
 "@types/node@*":
   version "13.1.6"
   resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-13.1.6.tgz?cache=0&sync_timestamp=1578585994687&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-13.1.6.tgz#076028d0b0400be8105b89a0a55550c86684ffec"
@@ -1758,11 +1751,6 @@ async-validator@~1.8.1:
   dependencies:
     babel-runtime "6.x"
 
-async@0.2.10:
-  version "0.2.10"
-  resolved "http://r.cnpmjs.org/async/download/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
-  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
-
 async@^2.0.0, async@^2.6.2:
   version "2.6.3"
   resolved "https://registry.npm.taobao.org/async/download/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
@@ -1914,13 +1902,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
   integrity sha1-I8DfFPaogHf1+YbA0WfsA8PVU3w=
 
-binary-search-tree@0.2.5:
-  version "0.2.5"
-  resolved "http://r.cnpmjs.org/binary-search-tree/download/binary-search-tree-0.2.5.tgz#7dbb3b210fdca082450dad2334c304af39bdc784"
-  integrity sha1-fbs7IQ/coIJFDa0jNMMErzm9x4Q=
-  dependencies:
-    underscore "~1.4.4"
-
 bindings@^1.5.0:
   version "1.5.0"
   resolved "https://registry.npm.taobao.org/bindings/download/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -3387,6 +3368,11 @@ dev-null@^0.1.1:
   resolved "https://registry.npm.taobao.org/dev-null/download/dev-null-0.1.1.tgz#5a205ce3c2b2ef77b6238d6ba179eb74c6a0e818"
   integrity sha1-WiBc48Ky73e2I41roXnrdMag6Bg=
 
+dexie@^2.0.4:
+  version "2.0.4"
+  resolved "http://r.cnpmjs.org/dexie/download/dexie-2.0.4.tgz#6027a5e05879424e8f9979d8c14e7420f27e3a11"
+  integrity sha1-YCel4Fh5Qk6PmXnYwU50IPJ+OhE=
+
 diff@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npm.taobao.org/diff/download/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
@@ -5976,13 +5962,6 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-lie@3.1.1:
-  version "3.1.1"
-  resolved "http://r.cnpmjs.org/lie/download/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
-  dependencies:
-    immediate "~3.0.5"
-
 lie@~3.3.0:
   version "3.3.0"
   resolved "https://registry.npm.taobao.org/lie/download/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
@@ -6048,13 +6027,6 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
-localforage@^1.3.0:
-  version "1.7.3"
-  resolved "http://r.cnpmjs.org/localforage/download/localforage-1.7.3.tgz#0082b3ca9734679e1bd534995bdd3b24cf10f204"
-  integrity sha1-AIKzypc0Z54b1TSZW907JM8Q8gQ=
-  dependencies:
-    lie "3.1.1"
-
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -6584,33 +6556,6 @@ natural-compare@^1.4.0:
   resolved "https://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-nedb-async-await@^0.1.2:
-  version "0.1.2"
-  resolved "http://r.cnpmjs.org/nedb-async-await/download/nedb-async-await-0.1.2.tgz#cd71a7ce4a4181cf186d974e547eac2a9eb2105a"
-  integrity sha1-zXGnzkpBgc8YbZdOVH6sKp6yEFo=
-  dependencies:
-    "@types/nedb" "^1.8.5"
-    nedb "^1.8.0"
-    thenify "^3.3.0"
-
-nedb-async@^0.1.3:
-  version "0.1.3"
-  resolved "http://r.cnpmjs.org/nedb-async/download/nedb-async-0.1.3.tgz#56c3f3fc3c917bcda70f3c55c0f4fd81abece4be"
-  integrity sha1-VsPz/DyRe82nDzxVwPT9gavs5L4=
-  dependencies:
-    nedb "^1.8.0"
-
-nedb@^1.8.0:
-  version "1.8.0"
-  resolved "http://r.cnpmjs.org/nedb/download/nedb-1.8.0.tgz#0e3502cd82c004d5355a43c9e55577bd7bd91d88"
-  integrity sha1-DjUCzYLABNU1WkPJ5VV3vXvZHYg=
-  dependencies:
-    async "0.2.10"
-    binary-search-tree "0.2.5"
-    localforage "^1.3.0"
-    mkdirp "~0.5.1"
-    underscore "~1.4.4"
-
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -9284,7 +9229,7 @@ thenify-all@^1.0.0:
   dependencies:
     thenify ">= 3.1.0 < 4"
 
-"thenify@>= 3.1.0 < 4", thenify@^3.3.0:
+"thenify@>= 3.1.0 < 4":
   version "3.3.0"
   resolved "https://registry.npm.taobao.org/thenify/download/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
   integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=
@@ -9603,11 +9548,6 @@ uglify-js@^3.1.4:
     commander "~2.20.3"
     source-map "~0.6.1"
 
-underscore@~1.4.4:
-  version "1.4.4"
-  resolved "http://r.cnpmjs.org/underscore/download/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
-  integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ=
-
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npm.taobao.org/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"