fix bug

koodo-reader · Jul 23, 2023 · 49d4205 · 49d4205
1 parent e1d26eb
commit 49d4205
Show file tree

Hide file tree

Showing 66 changed files with 472 additions and 768 deletions.
diff --git a/.github/ISSUE_TEMPLATE/2feature_request.yml b/.github/ISSUE_TEMPLATE/2feature_request.yml
@@ -6,7 +6,7 @@ body:
     id: testing1
     attributes:
       label: I've read Koodo Reader's roadmap, there is no similar feature.
-      description: https://www.notion.so/troyeguo/d1c19a132932465bae1d89dd963c92ea?v=ca8aa69cf25849c18c92b92ba868663b
+      description: https://troyeguo.notion.site/d1c19a132932465bae1d89dd963c92ea?v=ca8aa69cf25849c18c92b92ba868663b
       options:
         - label: "Yes"
           required: true

diff --git a/.github/ISSUE_TEMPLATE/5feature_request_cn.yml b/.github/ISSUE_TEMPLATE/5feature_request_cn.yml
@@ -6,7 +6,7 @@ body:
     id: testing1
     attributes:
       label: 我已经阅读了 Koodo Reader 的开发计划，没有找到类似的需求
-      description: https://www.notion.so/troyeguo/215baeda57804fd29dbb0e91d1e6a021?v=360c00183d944b598668f34c255edfd7
+      description: https://troyeguo.notion.site/215baeda57804fd29dbb0e91d1e6a021?v=360c00183d944b598668f34c255edfd7
       options:
         - label: "Yes"
           required: true

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 ## Code Contributing Guide
 
-You can find features to work on through our [Roadmap](https://www.notion.so/troyeguo/d1c19a132932465bae1d89dd963c92ea?v=ca8aa69cf25849c18c92b92ba868663b), or find bugs to fix through our [Issues](https://github.com/troyeguo/koodo-reader/issues). If you want to add new features or fix new bugs, please report them in [Issue](https://github.com/troyeguo/koodo-reader/issues) first.
+You can find features to work on through our [Roadmap](https://troyeguo.notion.site/d1c19a132932465bae1d89dd963c92ea?v=ca8aa69cf25849c18c92b92ba868663b), or find bugs to fix through our [Issues](https://github.com/troyeguo/koodo-reader/issues). If you want to add new features or fix new bugs, please report them in [Issue](https://github.com/troyeguo/koodo-reader/issues) first.
 
 - Make sure you're already familiar with our project structure, code style, naming style.
 - Does not upgrade or degrade dependency version, this could potentially break the project

diff --git a/CONTRIBUTING_CN.md b/CONTRIBUTING_CN.md
@@ -1,6 +1,6 @@
 ## 代码贡献指南
 
-您可以借助 Koodo Reader 的[开发计划](https://www.notion.so/troyeguo/215baeda57804fd29dbb0e91d1e6a021?v=360c00183d944b598668f34c255edfd7)了解 Koodo Reader 的开发需求，通过 [Issues](https://github.com/troyeguo/koodo-reader/issues) 了解 Koodo Reader 的 bug，然后通过 Pull Requests 的方式提交您的代码。如果您有新需求或发现新 bug 请先到[Issues](https://github.com/troyeguo/koodo-reader/issues)反馈，经开发者确认之后，再进行后续的开发工作。
+您可以借助 Koodo Reader 的[开发计划](https://troyeguo.notion.site/215baeda57804fd29dbb0e91d1e6a021?v=360c00183d944b598668f34c255edfd7)了解 Koodo Reader 的开发需求，通过 [Issues](https://github.com/troyeguo/koodo-reader/issues) 了解 Koodo Reader 的 bug，然后通过 Pull Requests 的方式提交您的代码。如果您有新需求或发现新 bug 请先到[Issues](https://github.com/troyeguo/koodo-reader/issues)反馈，经开发者确认之后，再进行后续的开发工作。
 
 - 参与项目的前提是您已经熟悉本项目的结构，代码风格，命名规范
 - 请勿升级或降级依赖版本

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@
   - Plain text (**.txt**)
   - FictionBook (**.fb2**)
   - Comic book archive (**.cbr**, **.cbz**, **.cbt**, **.cb7**)
-  - Rich text (**.md**, **.docx**, **.rtf**)
+  - Rich text (**.md**, **.docx**)
   - Hyper Text (**.html**, **.xml**, **.xhtml**, **.mhtml**, **.htm**, **.htm**)
 - Platform support: **Windows**, **macOS**, **Linux** and **Web**
 - Save your data to **Dropbox** or **Webdav**

diff --git a/README_cn.md b/README_cn.md
@@ -37,7 +37,7 @@
   - Kindle (**.azw3**, **.mobi**, **.azw**)
   - 纯文本 (**.txt**)
   - 漫画 (**.cbr**, **.cbz**, **.cbt**, **.cb7**)
-  - 富文本 (**.md**, **.docx**, **.rtf**)
+  - 富文本 (**.md**, **.docx**)
   - FB2 (**.fb2**)
   - 超文本 (**.html**, **.xml**, **.xhtml**, **.mhtml**, **.htm**, **.htm**)
 - 支持 **Windows**，**macOS**，**Linux** 和 **网页版**

diff --git a/README_pt.md b/README_pt.md
@@ -37,7 +37,7 @@
   - Texto puro (**.txt**)
   - FictionBook (**.fb2**)
   - Arquivo de quadrinhos (**.cbr**, **.cbz**, **.cbt**, **.cb7**)
-  - Texto rico (**.md**, **.docx**, **.rtf**)
+  - Texto rico (**.md**, **.docx**)
   - Hiper texto (**.html**, **.xml**, **.xhtml**, **.mhtml**, **.htm**, **.htm**)
 - Plataformas suportadas : **Windows**, **macOS**, **Linux** e **Web**
 - Guarde seus dados no **Dropbox** ou **Webdav**

diff --git a/main.js b/main.js
@@ -139,8 +139,15 @@ const createMainWin = () => {
       return "pong";
     } else {
       const fsExtra = require("fs-extra");
-      fsExtra.emptyDirSync(path.join(dirPath, "tts"));
-      return "pong";
+      try {
+        await fsExtra.remove(path.join(dirPath, "tts"));
+        await fsExtra.mkdir(path.join(dirPath, "tts"));
+        console.log("success!");
+        return "pong";
+      } catch (err) {
+        console.error(err);
+        return "pong";
+      }
     }
   });
   ipcMain.handle("change-path", async (event) => {

diff --git a/package.json b/package.json
@@ -18,7 +18,6 @@
     "react-error-overlay": "6.0.9"
   },
   "dependencies": {
-    "@iarna/rtf-to-html": "^1.1.0",
     "@vitalets/google-translate-api": "^8.0.0",
     "adm-zip": "^0.5.2",
     "axios": "^0.19.2",
@@ -31,7 +30,6 @@
     "font-list": "^1.4.5",
     "fs-extra": "^9.1.0",
     "howler": "^2.2.3",
-    "mhtml2html": "^3.0.0",
     "react-hot-toast": "^2.1.1",
     "request": "^2.88.2",
     "webdav": "^3.6.2",
@@ -42,7 +40,6 @@
   "devDependencies": {
     "@types/chardet": "^0.8.1",
     "@types/express": "^4.17.15",
-    "@types/file-saver": "^2.0.1",
     "@types/i18next": "^13.0.0",
     "@types/marked": "^2.0.2",
     "@types/md5": "^2.2.0",
@@ -61,11 +58,9 @@
     "cross-env": "^6.0.3",
     "electron": "14.1.1",
     "electron-builder": "^23.6.0",
-    "file-saver": "^2.0.2",
     "hard-source-webpack-plugin": "^0.13.1",
     "html-react-parser": "^0.13.0",
     "i18next": "^20.2.4",
-    "localforage": "^1.7.3",
     "md5": "^2.3.0",
     "node-sass": "^4.13.0",
     "nodemon": "^2.0.6",

diff --git a/public/assets/styles/blue.css b/public/assets/styles/blue.css
@@ -23,12 +23,7 @@
 }
 
 .header-search-box,
-input::-webkit-input-placeholder,
-input::-moz-placeholder,
-input::-ms-input-placeholder,
-textarea::-webkit-input-placeholder,
-textarea::-moz-placeholder,
-textarea::-ms-input-placeholder,
+.header-search-box::placeholder,
 .header-search-text,
 .card-list-item-show-more {
   color: rgba(1, 121, 202, 0.8) !important;

diff --git a/public/assets/styles/dark.css b/public/assets/styles/dark.css
@@ -52,12 +52,7 @@ body,
 }
 
 .header-search-box,
-input::-webkit-input-placeholder,
-input::-moz-placeholder,
-input::-ms-input-placeholder,
-textarea::-webkit-input-placeholder,
-textarea::-moz-placeholder,
-textarea::-ms-input-placeholder,
+.header-search-box::placeholder,
 .header-search-text {
   color: rgba(235, 235, 235, 0.8);
 }

diff --git a/public/assets/styles/default.css b/public/assets/styles/default.css
@@ -59,12 +59,7 @@ body,
   border: 2px solid rgba(75, 75, 75, 1);
 }
 .header-search-box,
-input::-webkit-input-placeholder,
-input::-moz-placeholder,
-input::-ms-input-placeholder,
-textarea::-webkit-input-placeholder,
-textarea::-moz-placeholder,
-textarea::-ms-input-placeholder,
+.header-search-box::placeholder,
 .header-search-text,
 .card-list-item-show-more,
 .token-dialog-link-text,

diff --git a/public/assets/styles/green.css b/public/assets/styles/green.css
@@ -23,12 +23,7 @@
 }
 
 .header-search-box,
-input::-webkit-input-placeholder,
-input::-moz-placeholder,
-input::-ms-input-placeholder,
-textarea::-webkit-input-placeholder,
-textarea::-moz-placeholder,
-textarea::-ms-input-placeholder,
+.header-search-box::placeholder,
 .header-search-text,
 .card-list-item-show-more {
   color: rgba(0, 143, 145, 0.8) !important;

diff --git a/public/assets/styles/purple.css b/public/assets/styles/purple.css
@@ -23,12 +23,7 @@
 }
 
 .header-search-box,
-input::-webkit-input-placeholder,
-input::-moz-placeholder,
-input::-ms-input-placeholder,
-textarea::-webkit-input-placeholder,
-textarea::-moz-placeholder,
-textarea::-ms-input-placeholder,
+.header-search-box::placeholder,
 .header-search-text,
 .card-list-item-show-more {
   color: rgba(104, 103, 209, 0.8) !important;

diff --git a/public/assets/styles/red.css b/public/assets/styles/red.css
@@ -23,12 +23,7 @@
 }
 
 .header-search-box,
-input::-webkit-input-placeholder,
-input::-moz-placeholder,
-input::-ms-input-placeholder,
-textarea::-webkit-input-placeholder,
-textarea::-moz-placeholder,
-textarea::-ms-input-placeholder,
+.header-search-box::placeholder,
 .header-search-text,
 .card-list-item-show-more {
   color: rgba(241, 100, 100, 0.8) !important;

diff --git a/public/index.html b/public/index.html
@@ -56,10 +56,22 @@
       type="text/javascript"
       src="%PUBLIC_URL%/lib/xlsx/xlsx.mini.min.js"
     ></script>
+    <script
+      type="text/javascript"
+      src="%PUBLIC_URL%/lib/localforage/localforage.min.js"
+    ></script>
     <script
       type="text/javascript"
       src="%PUBLIC_URL%/lib/jschardet/jschardet.min.js"
     ></script>
+    <script
+      type="text/javascript"
+      src="%PUBLIC_URL%/lib/filesaver/FileSaver.min.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="%PUBLIC_URL%/lib/mhtml2html/mhtml2html.js"
+    ></script>
     <script
       type="text/javascript"
       src="%PUBLIC_URL%/lib/js-untar/untar.js"

diff --git a/public/lib/filesaver/FileSaver.min.js b/public/lib/filesaver/FileSaver.min.js
diff --git a/public/lib/kookit/kookit.min.js b/public/lib/kookit/kookit.min.js
diff --git a/public/lib/localforage/localforage.min.js b/public/lib/localforage/localforage.min.js
diff --git a/public/lib/mhtml2html/mhtml2html.js b/public/lib/mhtml2html/mhtml2html.js