Merge commit 'a63e1fda2e203917ae7f72cb359155f4094c4f3e' into develop

* commit 'a63e1fda2e203917ae7f72cb359155f4094c4f3e': (217 commits) ⚡ Improve block loading performance on Windows/Linux/macOS amd64 arch siyuan-note#9084 💄 ⚡ Improve block loading performance on Windows/Linux/macOS amd64 arch siyuan-note#9084 🐛 Block hyperlinks do not point to regenerated block IDs when importing .sy.zip siyuan-note#9083 🎨 Reduce the memory usage of PDF asset file content parsing on the mobile siyuan-note#9079 🎨 HTTPS certificate is no longer verified when `Convert network images to local images` siyuan-note#9080 🐛 fix siyuan-note#9076 🐛 fix siyuan-note#9076 🐛 🎨 siyuan-note#9068 🎨 Improve the response status code of kernel API `/api/file/getFile` siyuan-note#9075 Improve the response status code of kernel API `/api/file/getFile` (siyuan-note#9075) ✨ siyuan-note#9032 ✨ siyuan-note#9032 🐛 The update button is not displayed after the marketplace package version is updated Fix siyuan-note#9074 ✨ siyuan-note#9032 🎨 Improve asset file content search preview escaping siyuan-note#9073 🎨 Improve asset file content search preview escaping siyuan-note#9073 🎨 Improve EPUB asset file content parsing siyuan-note#9072 ♻️ siyuan-note#9032 ... # Conflicts: # README.md
EightDoor · Sep 1, 2023 · b11fa03 · b11fa03
2 parents 7d4d166 + a63e1fd
commit b11fa03
Show file tree

Hide file tree

Showing 201 changed files with 7,759 additions and 10,817 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm`
 
 Set the Electron mirror environment variable and install Electron:
 
-* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.4.0 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.7.0 -D`
 * Windows:
     * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
-    * `pnpm install electron@25.4.0 -D`
+    * `pnpm install electron@25.7.0 -D`
 
 NPM mirror:
 
@@ -28,7 +28,7 @@ NPM mirror:
 
 On the desktop, go to the app folder to run:
 
-* `pnpm install electron@25.4.0 -D`
+* `pnpm install electron@25.7.0 -D`
 * `pnpm run dev`
 * `pnpm run start`
 
@@ -55,7 +55,7 @@ Note: In the development environment, the kernel process will not be automatical
 ### Android
 
 * `cd kernel`
-* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' ./mobile/`
+* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' -androidapi 24 ./mobile/`
 * https://github.com/siyuan-note/siyuan-android
 
 For the mobile-end, please refer to the corresponding project repository.
diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md
@@ -16,11 +16,11 @@
 
 * macOS/Linux: 
  ```
- ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.4.0 -D
+ ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.7.0 -D
  ```
 * Windows:
     * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
-    * `pnpm install electron@25.4.0 -D`
+    * `pnpm install electron@25.7.0 -D`
 
 NPM 镜像：
 
@@ -30,7 +30,7 @@ NPM 镜像：
 
 桌面端进入 app 文件夹运行：
 
-* `pnpm install electron@25.4.0 -D`
+* `pnpm install electron@25.7.0 -D`
 * `pnpm run dev`
 * `pnpm run start`
 
@@ -50,12 +50,14 @@ NPM 镜像：
 
 ### iOS
 
-* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o ./ios/iosk.xcframework -target=ios ./kernel/mobile/`
+* `cd kernel`
+* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o ./ios/iosk.xcframework -target=ios ./mobile/`
 * https://github.com/siyuan-note/siyuan-ios
 
 ### Android
 
-* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' ./kernel/mobile/`
+* `cd kernel`
+* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' -androidapi 24 ./mobile/`
 * https://github.com/siyuan-note/siyuan-android
 
 移动端请参考对应项目仓库。
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -33,4 +33,4 @@ jobs:
 
       - name: Build the Docker image
         run: |
-          docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v2.9.9 .
+          docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v2.10.2 .
diff --git a/API.md b/API.md
@@ -992,7 +992,24 @@ View API token in <kbd>Settings - About</kbd>, request header: `Authorization: T
     * `path`: the file path under the workspace path
 * Return value
 
-  File content
+    * Response status code `200`: File content
+    * Response status code `202`: Exception information
+
+      ```json
+      {
+        "code": 404,
+        "msg": "",
+        "data": null
+      }
+      ```
+
+        * `code`: non-zero for exceptions
+
+            * `-1`: Parameter parsing error
+            * `404`: Not Found (file doesn't exist)
+            * `405`: Method Not Allowed (it's a directory)
+            * `500`: Server Error (stat file failed / read file failed)
+        * `msg`: a piece of text describing the error
 
 ### Put file
 
@@ -1064,27 +1081,29 @@ View API token in <kbd>Settings - About</kbd>, request header: `Authorization: T
 
   ```json
   {
-    "path": "/data/20210808180117-6v0mkxr/20200923234011-ieuun1p.sy"
+    "path": "/data/20210808180117-6v0mkxr/20200923234011-ieuun1p"
   }
   ```
-    * `path`: the file path under the workspace path
+    * `path`: the dir path under the workspace path
 * Return value
 
   ```json
   {
     "code": 0,
     "msg": "",
     "data": [
-        {
-            "isDir": true,
-            "isSymlink": false,
-            "name": "20210808180320-abz7w6k"
-        },
-        {
-            "isDir": false,
-            "isSymlink": false,
-            "name": "20210808180320-abz7w6k.sy"
-        }
+      {
+        "isDir": true,
+        "isSymlink": false,
+        "name": "20210808180303-6yi0dv5",
+        "updated": 1691467624
+      },
+      {
+        "isDir": false,
+        "isSymlink": false,
+        "name": "20210808180303-6yi0dv5.sy",
+        "updated": 1663298365
+      }
     ]
   }
   ```

diff --git a/API_zh_CN.md b/API_zh_CN.md
@@ -984,7 +984,24 @@
     * `path`：工作空间路径下的文件路径
 * 返回值
 
-  文件内容
+    * 响应状态码 `200`: 文件内容
+    * 响应状态码 `202`: 异常信息
+
+      ```json
+      {
+        "code": 404,
+        "msg": "",
+        "data": null
+      }
+      ```
+
+        * `code`: 非零的异常值
+
+            * `-1`: 参数解析错误
+            * `404`: 未找到 (文件不存在)
+            * `405`: 方法不被允许 (这是一个目录)
+            * `500`: 服务器错误 (文件查询失败 / 文件读取失败)
+        * `msg`: 一段描述错误的文本
 
 ### 写入文件
 
@@ -1056,27 +1073,29 @@
 
   ```json
   {
-    "path": "/data/20210808180117-6v0mkxr/20200923234011-ieuun1p.sy"
+    "path": "/data/20210808180117-6v0mkxr/20200923234011-ieuun1p"
   }
   ```
-    * `path`：工作空间路径下的文件路径
+    * `path`：工作空间路径下的文件夹路径
 * 返回值
 
   ```json
   {
     "code": 0,
     "msg": "",
     "data": [
-        {
-            "isDir": true,
-            "isSymlink": false,
-            "name": "20210808180320-abz7w6k"
-        },
-        {
-            "isDir": false,
-            "isSymlink": false,
-            "name": "20210808180320-abz7w6k.sy"
-        }
+      {
+        "isDir": true,
+        "isSymlink": false,
+        "name": "20210808180303-6yi0dv5",
+        "updated": 1691467624
+      },
+      {
+        "isDir": false,
+        "isSymlink": false,
+        "name": "20210808180303-6yi0dv5.sy",
+        "updated": 1663298365
+      }
     ]
   }
   ```

diff --git a/README.md b/README.md
@@ -283,6 +283,14 @@
 会员特权需要付费后才能使用，请参考[定价](https://b3log.org/siyuan/pricing.html)。
 
 如果你没有会员特权需求但又想支持开发，欢迎进行捐赠：[靠爱发电 - 链滴](https://ld246.com/sponsor)
+The birth of SiYuan is inseparable from many open source projects and contributors, please refer to the project source
+code kernel/go.mod, app/package.json and project homepage.
+
+The growth of SiYuan is inseparable from user feedback and promotion, thank you for everyone's help to SiYuan ❤️
+
+### Contributors
+
+> > > > > > > a63e1fda2e203917ae7f72cb359155f4094c4f3e
 
 ## 🙏 鸣谢
 
@@ -293,6 +301,7 @@
 <a href="https://github.com/siyuan-note/siyuan/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=siyuan-note/siyuan" />
 </a>
+<<<<<<< HEAD
 
 ### 开源项目依赖列表
 
@@ -342,3 +351,6 @@
 * [https://github.com/visjs/vis-network](https://github.com/visjs/vis-network) `Apache-2.0 License`
 * [https://github.com/mozilla/pdf.js](https://github.com/mozilla/pdf.js) `Apache-2.0 License`
 * [https://github.com/blueimp/JavaScript-MD5](https://github.com/blueimp/JavaScript-MD5) `MIT License`
+  =======
+
+> > > > > > > a63e1fda2e203917ae7f72cb359155f4094c4f3e
diff --git a/README_en.md b/README_en.md
@@ -272,59 +272,14 @@
 
 ## 🙏 鸣谢
 
+思源的诞生离不开众多的开源项目和贡献者，请参考项目源代码 kernel/go.mod、app/package.json 和项目首页。
+
+思源的成长离不开用户的反馈和宣传推广，感谢所有人对思源的帮助 ❤️
+
 ### 贡献者列表
 
 欢迎加入我们，一起为思源贡献代码。
 
 <a href="https://github.com/siyuan-note/siyuan/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=siyuan-note/siyuan" />
 </a>
-
-### 开源项目依赖列表
-
-思源的诞生离不开下列开源项目。
-
-* [https://github.com/golang/go](https://github.com/golang/go) `BSD-3-Clause License`
-* [https://github.com/atotto/clipboard](https://github.com/atotto/clipboard) `BSD-3-Clause License`
-* [https://github.com/vanng822/css](https://github.com/vanng822/css) `MIT License`
-* [https://github.com/gofrs/flock](https://github.com/gofrs/flock) `BSD-3-Clause License`
-* [https://github.com/olahol/melody](https://github.com/olahol/melody) `BSD-2-Clause License`
-* [https://github.com/pdfcpu/pdfcpu](https://github.com/pdfcpu/pdfcpu) `Apache-2.0 License`
-* [https://github.com/blastrain/vitess-sqlparser](https://github.com/blastrain/vitess-sqlparser) `Apache-2.0 License`
-* [https://github.com/ConradIrwin/font](https://github.com/ConradIrwin/font) `MIT License`
-* [https://github.com/Masterminds/sprig](https://github.com/Masterminds/sprig) `MIT License`
-* [https://github.com/PuerkitoBio/goquery](https://github.com/PuerkitoBio/goquery) `BSD-3-Clause License`
-* [https://github.com/Xuanwo/go-locale](https://github.com/Xuanwo/go-locale) `Apache-2.0 License`
-* [https://github.com/araddon/dateparse](https://github.com/araddon/dateparse) `MIT License`
-* [https://github.com/common-nighthawk/go-figure](https://github.com/common-nighthawk/go-figure) `MIT License`
-* [https://github.com/denisbrodbeck/machineid](https://github.com/denisbrodbeck/machineid) `MIT License`
-* [https://github.com/dgraph-io/ristretto](https://github.com/dgraph-io/ristretto) `Apache-2.0 License`
-* [https://github.com/dustin/go-humanize](https://github.com/dustin/go-humanize) `MIT License`
-* [https://github.com/emirpasic/gods](https://github.com/emirpasic/gods) `BSD-2-Clause License`
-* [https://github.com/facette/natsort](https://github.com/facette/natsort) `BSD-3-Clause License`
-* [https://github.com/flopp/go-findfont](https://github.com/flopp/go-findfont) `MIT License`
-* [https://github.com/fsnotify/fsnotify](https://github.com/fsnotify/fsnotify) `BSD-3-Clause License`
-* [https://github.com/gabriel-vasile/mimetype](https://github.com/gabriel-vasile/mimetype) `MIT License`
-* [https://github.com/gin-contrib/cors](https://github.com/gin-contrib/cors) `MIT License`
-* [https://github.com/gin-contrib/gzip](https://github.com/gin-contrib/gzip) `MIT License`
-* [https://github.com/gin-contrib/sessions](https://github.com/gin-contrib/sessions) `MIT License`
-* [https://github.com/gin-gonic/gin](https://github.com/gin-gonic/gin) `MIT License`
-* [https://github.com/go-ole/go-ole](https://github.com/go-ole/go-ole) `MIT License`
-* [https://github.com/imroc/req](https://github.com/imroc/req) `MIT License`
-* [https://github.com/jinzhu/copier](https://github.com/jinzhu/copier) `MIT License`
-* [https://github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3) `MIT License`
-* [https://github.com/mitchellh/go-ps](https://github.com/mitchellh/go-ps) `MIT License`
-* [https://github.com/mssola/useragent](https://github.com/mssola/useragent) `MIT License`
-* [https://github.com/panjf2000/ants](https://github.com/panjf2000/ants) `MIT License`
-* [https://github.com/patrickmn/go-cache](https://github.com/patrickmn/go-cache) `MIT License`
-* [https://github.com/radovskyb/watcher](https://github.com/radovskyb/watcher) `BSD-3-Clause License`
-* [https://github.com/sabhiram/go-gitignore](https://github.com/sabhiram/go-gitignore) `MIT License`
-* [https://github.com/steambap/captcha](https://github.com/steambap/captcha) `MIT License`
-* [https://github.com/vmihailenco/msgpack](https://github.com/vmihailenco/msgpack) `BSD-2-Clause License`
-* [https://github.com/xrash/smetrics](https://github.com/xrash/smetrics) `MIT License`
-* [https://github.com/jgm/pandoc](https://github.com/jgm/pandoc) `GPL-2.0 License`
-* [https://github.com/microsoft/TypeScript](https://github.com/microsoft/TypeScript) `Apache-2.0 License`
-* [https://github.com/electron/electron](https://github.com/electron/electron) `MIT License`
-* [https://github.com/visjs/vis-network](https://github.com/visjs/vis-network) `Apache-2.0 License`
-* [https://github.com/mozilla/pdf.js](https://github.com/mozilla/pdf.js) `Apache-2.0 License`
-* [https://github.com/blueimp/JavaScript-MD5](https://github.com/blueimp/JavaScript-MD5) `MIT License`
diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -1,4 +1,8 @@
 {
+  "mainMenu": "Main Menu",
+  "searchRemoveName": "Do you want to delete ${x} and assign its query condition to ${y}?",
+  "searchUpdateName": "Update name ${x} to ${y}?",
+  "searchAssetContent": "Search asset file content",
   "searchOverwrite": "The query name is duplicated, do you want to overwrite it?",
   "onepay": "PRO",
   "format": "Number format",
@@ -121,7 +125,7 @@
   "attrMemoTip": "Set a memo for this block, only plain text is supported",
   "switchDirect": "Switch comparison direction",
   "onlySearchForDoc": "<code class='fn__code'>[[</code> only search documents",
-  "onlySearchForDocTip": "After enabling, [[ or 【【 to search for block references only in doc blocks",
+  "onlySearchForDocTip": "After enabling, [[ or 【【 to search for block references only in doc names",
   "ocrResult": "OCR result text",
   "reOCR": "Re OCR",
   "continueReview1": "Continue Review",
@@ -238,7 +242,7 @@
   "regex": "Regex",
   "keywordsLimit": "Keywords Limit",
   "exportAsImage": "Export as image",
-  "featureBetaStage": "This feature supports immediate charging (subscriber do not need to pay separately), and is available for lifetime after a one-time payment",
+  "featureBetaStage": "This feature supports immediate charging (subscribing members do not need to pay separately), <a href=\"https://b3log.org/siyuan/en/pricing.html\" target=\"_blank\">one-time payment can be used for lifetime</a>",
   "syncOfficialProviderIntro": "Currently selected is the cloud storage service officially provided by SiYuan, which only supports paid subscription users",
   "syncThirdPartyProviderS3Intro": "The current selected is a third-party cloud storage service compatible with the Amazon S3 protocol (eg <a href=\"https://s.qiniu.com/VbQfeu\" target=\"_blank\">Qiniu</a>, <a href=\"https://www.aliyun.com/product/oss?userCode=yqovuas2\" target=\"_blank\">Aliyun OSS</a>, <a href=\"https://www.cloudflare.com/\" target=\"_blank\">Cloudflare R2</a>)",
   "syncThirdPartyProviderWebDAVIntro": "The currently selected is a third-party cloud storage service with the WebDAV protocol. Due to the poor performance and insufficient stability of this protocol, it is recommended to choose the S3 service first",
@@ -569,7 +573,7 @@
   "staff": "Staff",
   "sup": "Superscript",
   "sub": "Subscript",
-  "enter": "Focus",
+  "enter": "Zoom in",
   "enterBack": "Zoom out",
   "duplicate": "Duplicate",
   "turnInto": "Turn into",
@@ -613,8 +617,7 @@
   "superBlock": "Super block",
   "embedBlock": "Embed block",
   "expand": "Expand",
-  "showDock": "Show Dock",
-  "hideDock": "Hide Dock",
+  "toggleDock": "Show/Hide Dock",
   "notebookName": "Please enter a notebook name",
   "moveToLeftTop": "Move to the Left Top",
   "moveToLeftBottom": "Move to the Left Bottom",
@@ -909,7 +912,7 @@
   "theme": "Theme",
   "language": "Language",
   "about": "About",
-  "about1": "Copyright (c) 2020-present • Yunnan Liandi Technology Co., Ltd. • <a target='_blank' href='https://b3log.org/siyuan/en/privacy.html'>Privacy Policy</a> • <a target='_blank' href='https://b3log.org/siyuan/en/eula.html'>User Agreement</a><div class='fn__hr'></div><div class='fn__hr'></div><div class='ft__on-surface'>The core developers of SiYuan are <a href=\"https://github.com/88250\" target=\"_blank\">D</a> and <a href=\"https://github.com/Vanessa219\" target=\"_blank\">V</a>, and the community development contributors can be seen <a href=\"https://github.com/siyuan-note/bazaar/graphs/contributors\" target=\"_blank\">here</a></div>",
+  "about1": "Copyright (c) 2020-present • Yunnan Liandi Technology Co., Ltd. • <a target='_blank' href='https://b3log.org/siyuan/en/privacy.html'>Privacy Policy</a> • <a target='_blank' href='https://b3log.org/siyuan/en/eula.html'>User Agreement</a>",
   "about2": "Use on browser",
   "about3": "Please use the Chrome browser and keep it in the same network as the computer, port <code class='fn__code'>${port}</code>(In addition to the random port, the first started workspace will also automatically listen to <code class='fn__code'>6806</code> as a fixed port, so that it is convenient for the browser to clip extensions or other external programs to call the kernel interface), the addresses that may be connected are as follows: ",
   "about4": "Open browser",
@@ -924,7 +927,7 @@
   "about17": "Do not enable proxy when set to <code class='fn__code'>Direct connection</code>",
   "checkUpdate": "Check update",
   "currentVer": "Current version",
-  "visitAnnouncements": "<a href=\"https://github.com/siyuan-note/siyuan/releases\" target=\"_blank\">Visit all published versions</a>",
+  "downloadLatestVer": "<a href=\"https://b3log.org/siyuan/en/download.html\", target=\"_blank\">Download the latest version</a>",
   "themeLight": "Light",
   "themeDark": "Dark",
   "themeOS": "Follow the system",
@@ -1029,7 +1032,7 @@
     "task.database.index.ref": "Execute database index reference",
     "task.database.index.fix": "Execute database index fix",
     "task.ocr.image": "Execute image OCR to extract text",
-    "task.history.generateDoc": "Execute GenerateDoc History",
+    "task.history.generateDoc": "Execute history database generate doc",
     "task.history.database.index.full": "Execute history database rebuild index",
     "task.history.database.index.commit": "Execute history database index commit",
     "task.database.index.embedBlock": "Execute database index embed block",