From a738ba2413bbefdfd839edaccbd9c8c1637d6de3 Mon Sep 17 00:00:00 2001 From: troyeguo <13820674+troyeguo@users.noreply.github.com> Date: Fri, 3 Apr 2020 19:17:58 +0800 Subject: [PATCH] =?UTF-8?q?:tada::=20=E6=9B=B4=E6=96=B0=E7=BD=91=E9=A1=B5?= =?UTF-8?q?=E7=89=88=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 359531863477a80b8c110dc51f71bfe68422cedb --- README.md | 4 ++-- package.json | 5 +++-- src/components/importLocal/importLocal.js | 4 ++-- src/containers/manager/manager.js | 13 +++---------- yarn.lock | 5 +++++ 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 01f256c9..a75f5f18 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ 👏 欢迎使用 **可道阅读器** ! -✍️ **可道阅读器** 可道阅读器基于 electron 和 React 开发,支持桌面版和网页版 +✍️ **可道阅读器** 可道阅读器基于 electron 和 React 开发,支持桌面版和网页版 ## 特色 👇 @@ -43,7 +43,7 @@ 桌面端:前往这里下载最新的安装包 [点我前往](https://github.com/troyeguo/koodo-reader/releases) -网页版:代码托管在 Coding Page [点我前往](https://reader.102410.xyz) +网页版:代码托管在 Gitee Page [点我前往](https://troyeguo.gitee.io/koodo-web/) ## 运行源码 diff --git a/package.json b/package.json index d5bb25d4..5a56bfa2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "koodo-reader", "main": "main.js", - "version": "0.1.5", + "version": "0.1.6", "description": "A cross-platform open source Epub reader ", "author": { "name": "App by Troye", @@ -22,7 +22,7 @@ "dev": "concurrently \"cross-env BROWSER=none npm start\" \"wait-on http://localhost:3000/ && electron .\"", "pack": "electron-builder --dir", "dist": "electron-builder", - "release": "cross-env GH_TOKEN=process.env.GH_TOKEN electron-builder ", + "release": "cross-env GH_TOKEN=GH_TOKEN electron-builder ", "prerelease": "npm run build", "prepack": "npm run build", "predist": "npm run build" @@ -124,6 +124,7 @@ "redux": "^4.0.5", "redux-thunk": "^2.3.0", "sass-loader": "^8.0.0", + "spark-md5": "^3.0.1", "wait-on": "^3.3.0" } } diff --git a/src/components/importLocal/importLocal.js b/src/components/importLocal/importLocal.js index bc3c2a15..44a9d998 100644 --- a/src/components/importLocal/importLocal.js +++ b/src/components/importLocal/importLocal.js @@ -9,7 +9,7 @@ import { handleMessage, handleFetchBooks } from "../../redux/manager.redux"; -// import SparkMD5 from "spark-md5"; +import SparkMD5 from "spark-md5"; // @connect(state => state.manager) class ImportLocal extends Component { constructor(props) { @@ -47,7 +47,7 @@ class ImportLocal extends Component { chunkSize = 2097152, // 以每片2MB大小来逐次读取 chunks = Math.ceil(file.size / chunkSize), currentChunk = 0, - spark = new window.SparkMD5(), //创建SparkMD5的实例 + spark = new SparkMD5(), //创建SparkMD5的实例 fileReader = new FileReader(); fileReader.onload = e => { diff --git a/src/containers/manager/manager.js b/src/containers/manager/manager.js index c069243b..28f87b57 100644 --- a/src/containers/manager/manager.js +++ b/src/containers/manager/manager.js @@ -78,16 +78,9 @@ class Manager extends Component { }; render() { // console.log(this.state.isFirst, "first"); - let { - mode, - notes, - digests, - bookmarks, - covers, - totalBooks, - recentBooks - } = this.props; - // console.log(this.props.isBackup, "toatl"); + let { mode, notes, digests, bookmarks, covers } = this.props; + let { totalBooks, recentBooks } = this.state; + // console.log(totalBooks, "toatl"); let shelfTitle = Object.keys(ShelfUtil.getShelf()); // console.log(shelfTitle, index, "shelfTitle"); let currentShelfTitle = shelfTitle[this.props.shelfIndex + 1]; diff --git a/yarn.lock b/yarn.lock index 8011daa3..36419579 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10595,6 +10595,11 @@ source-map@^0.5.0, source-map@^0.5.6: resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= +spark-md5@^3.0.1: + version "3.0.1" + resolved "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.1.tgz#83a0e255734f2ab4e5c466e5a2cfc9ba2aa2124d" + integrity sha512-0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig== + spawn-command@^0.0.2-1: version "0.0.2-1" resolved "https://registry.npm.taobao.org/spawn-command/download/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"