Skip to content

Commit

Permalink
fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@troyeguo
troyeguo committed May 21, 2023
1 parent 70eacf6 commit a8058e1
Show file tree
Hide file tree
Showing 7 changed files with 697 additions and 80 deletions.
5 changes: 2 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,12 @@
"epub-cfi-resolver": "^1.0.2",
"font-list": "^1.4.5",
"fs-extra": "^9.1.0",
"jschardet": "^3.0.0",
"mhtml2html": "^3.0.0",
"react-hot-toast": "^2.1.1",
"request": "^2.88.2",
"webdav": "^3.6.2",
"webdav-fs": "^3.0.0",
"ws": "^8.13.0",
"xlsx": "^0.18.5",
"zip-a-folder": "^0.0.12"
},
"devDependencies": {
Expand Down Expand Up @@ -96,7 +94,8 @@
"eject": "react-scripts eject",
"ele": "electron .",
"dev": "concurrently \"cross-env BROWSER=none npm start\" \"wait-on http://localhost:3000/ && nodemon --watch main.js --exec electron .\"",
"release": "electron-builder"
"release": "electron-builder",
"prerelease": "react-scripts build"
},
"homepage": "./",
"build": {
Expand Down
8 changes: 8 additions & 0 deletions public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@
type="text/javascript"
src="%PUBLIC_URL%/lib/fflate/fflate.min.js"
></script>
<script
type="text/javascript"
src="%PUBLIC_URL%/lib/xlsx/xlsx.mini.min.js"
></script>
<script
type="text/javascript"
src="%PUBLIC_URL%/lib/jschardet/jschardet.min.js"
></script>
<script
type="text/javascript"
src="%PUBLIC_URL%/lib/js-untar/untar.js"
Expand Down
665 changes: 665 additions & 0 deletions public/lib/jschardet/jschardet.min.js
View file

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/lib/xlsx/xlsx.mini.min.js
View file

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions src/containers/htmlViewer/component.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import RecordLocation from "../../utils/readUtils/recordLocation";
import { mimetype } from "../../constants/mimetype";
import Background from "../../components/background";
import toast from "react-hot-toast";
import * as jschardet from "jschardet";
import StyleUtil from "../../utils/readUtils/styleUtil";
import "./index.css";
import { HtmlMouseEvent } from "../../utils/serviceUtils/mouseEvent";
Expand Down Expand Up @@ -348,7 +347,7 @@ class Viewer extends React.Component<ViewerProps, ViewerState> {
let charset = "";
books.forEach((item) => {
if (item.key === this.props.currentBook.key) {
charset = jschardet.detect(bufferStr).encoding || "utf-8";
charset = window.jschardet.detect(bufferStr).encoding || "utf-8";
item.charset = charset;
this.props.handleReadingBook(item);
}
Expand Down Expand Up @@ -403,9 +402,9 @@ class Viewer extends React.Component<ViewerProps, ViewerState> {
bufferStr += String.fromCharCode(array[i]);
}
let charset = "";
if (!this.props.currentBook.charset) {
charset = await this.handleCharset(bufferStr);
}
// if (!this.props.currentBook.charset) {
charset = await this.handleCharset(bufferStr);
// }
let rendition = new window.Kookit.TxtRender(
result,
this.state.readerMode,
Expand Down
18 changes: 9 additions & 9 deletions src/utils/syncUtils/exportUtil.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import BookModel from "../../model/Book";
import NoteModel from "../../model/Note";
import BookUtil from "../fileUtils/bookUtil";
import { zipFilesToBlob } from "./common";
import * as XLSX from "xlsx";
declare var window: any;
let year = new Date().getFullYear(),
month = new Date().getMonth() + 1,
day = new Date().getDate();
Expand All @@ -28,8 +28,8 @@ export const exportBooks = async (books: BookModel[]) => {
};

export const exportNotes = (notes: NoteModel[], books: BookModel[]) => {
var wb = XLSX.utils.book_new();
var ws = XLSX.utils.json_to_sheet(
var wb = window.XLSX.utils.book_new();
var ws = window.XLSX.utils.json_to_sheet(
notes.map((item) => {
return {
...item,
Expand All @@ -49,8 +49,8 @@ export const exportNotes = (notes: NoteModel[], books: BookModel[]) => {
};
})
);
XLSX.utils.book_append_sheet(wb, ws, "Sheet1");
XLSX.writeFile(
window.XLSX.utils.book_append_sheet(wb, ws, "Sheet1");
window.XLSX.writeFile(
wb,
"KoodoReader-Note-" +
`${year}-${month <= 9 ? "0" + month : month}-${
Expand All @@ -63,8 +63,8 @@ export const exportHighlights = (
highlights: NoteModel[],
books: BookModel[]
) => {
var wb = XLSX.utils.book_new();
var ws = XLSX.utils.json_to_sheet(
var wb = window.XLSX.utils.book_new();
var ws = window.XLSX.utils.json_to_sheet(
highlights.map((item) => {
let highlight = {
...item,
Expand All @@ -86,8 +86,8 @@ export const exportHighlights = (
return rest;
})
);
XLSX.utils.book_append_sheet(wb, ws, "Sheet1");
XLSX.writeFile(
window.XLSX.utils.book_append_sheet(wb, ws, "Sheet1");
window.XLSX.writeFile(
wb,
"KoodoReader-Highlight-" +
`${year}-${month <= 9 ? "0" + month : month}-${
Expand Down
63 changes: 0 additions & 63 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2561,11 +2561,6 @@ adjust-sourcemap-loader@3.0.0:
loader-utils "^2.0.0"
regex-parser "^2.2.11"

adler-32@~1.3.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/adler-32/-/adler-32-1.3.1.tgz#1dbf0b36dda0012189a32b3679061932df1821e2"
integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==

adm-zip@^0.5.2:
version "0.5.10"
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.10.tgz#4a51d5ab544b1f5ce51e1b9043139b639afff45b"
Expand Down Expand Up @@ -3881,14 +3876,6 @@ caseless@~0.12.0:
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==

cfb@~1.2.1:
version "1.2.2"
resolved "https://registry.yarnpkg.com/cfb/-/cfb-1.2.2.tgz#94e687628c700e5155436dac05f74e08df23bc44"
integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==
dependencies:
adler-32 "~1.3.0"
crc-32 "~1.2.0"

chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
Expand Down Expand Up @@ -4115,11 +4102,6 @@ code-point-at@^1.0.0:
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==

codepage@~1.15.0:
version "1.15.0"
resolved "https://registry.yarnpkg.com/codepage/-/codepage-1.15.0.tgz#2e00519024b39424ec66eeb3ec07227e692618ab"
integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==

collect-v8-coverage@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
Expand Down Expand Up @@ -4476,11 +4458,6 @@ cosmiconfig@^7.0.0:
path-type "^4.0.0"
yaml "^1.10.0"

crc-32@~1.2.0, crc-32@~1.2.1:
version "1.2.2"
resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==

crc32-stream@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz#cae6eeed003b0e44d739d279de5ae63b171b4e85"
Expand Down Expand Up @@ -6474,11 +6451,6 @@ forwarded@0.2.0:
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==

frac@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==

fragment-cache@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
Expand Down Expand Up @@ -8592,11 +8564,6 @@ jsbn@~0.1.0:
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==

jschardet@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-3.0.0.tgz#898d2332e45ebabbdb6bf2feece9feea9a99e882"
integrity sha512-lJH6tJ77V8Nzd5QWRkFYCLc13a3vADkh3r/Fi8HupZGWk2OVVDfnZP8V/VgQgZ+lzW0kG2UGb5hFgt3V3ndotQ==

jsdom@^15.1.1:
version "15.2.1"
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5"
Expand Down Expand Up @@ -12828,13 +12795,6 @@ sprintf-js@~1.0.2:
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==

ssf@~0.11.2:
version "0.11.2"
resolved "https://registry.yarnpkg.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"
integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
dependencies:
frac "~1.1.2"

sshpk@^1.7.0:
version "1.17.0"
resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
Expand Down Expand Up @@ -14384,21 +14344,11 @@ wide-align@^1.1.0:
dependencies:
string-width "^1.0.2 || 2 || 3 || 4"

wmf@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"
integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==

word-wrap@^1.2.3, word-wrap@~1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==

word@~0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"
integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==

workbox-background-sync@^5.1.4:
version "5.1.4"
resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-5.1.4.tgz#5ae0bbd455f4e9c319e8d827c055bb86c894fd12"
Expand Down Expand Up @@ -14651,19 +14601,6 @@ xdg-basedir@^4.0.0:
resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==

xlsx@^0.18.5:
version "0.18.5"
resolved "https://registry.yarnpkg.com/xlsx/-/xlsx-0.18.5.tgz#16711b9113c848076b8a177022799ad356eba7d0"
integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==
dependencies:
adler-32 "~1.3.0"
cfb "~1.2.1"
codepage "~1.15.0"
crc-32 "~1.2.1"
ssf "~0.11.2"
wmf "~1.0.1"
word "~0.3.0"

xml-name-validator@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
Expand Down

0 comments on commit a8058e1

Please sign in to comment.