Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Vanessa219 committed Dec 10, 2023
2 parents 2e63c1f + 235a91b commit 0ee6f49
Show file tree
Hide file tree
Showing 11 changed files with 185 additions and 13 deletions.
3 changes: 2 additions & 1 deletion app/appearance/langs/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,7 @@
"216": "Rebuilding asset content data index, please wait...",
"217": "[%d/%d] Created asset content data index",
"218": "Too many snapshots of the data repo have been detected, which slows down program startup and data sync. Please consider executing [Settings - About - Data repo purge]",
"219": "The cloud storage service is unavailable, please try again later"
"219": "The cloud storage service is unavailable, please try again later",
"220": "Due to a defect in the previous version, the cloud data is corrupted. Please refer to the User Guide-FAQ-Lost Key steps to reset the local data repo and cloud directory"
}
}
3 changes: 2 additions & 1 deletion app/appearance/langs/es_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,7 @@
"216": "Reconstruyendo el índice de datos de contenido de recursos, espere...",
"217": "[%d/%d] Índice de datos de contenido de activos creado",
"218": "Se han detectado demasiadas instantáneas del repositorio de datos, lo que ralentiza el inicio del programa y la sincronización de datos. Considere ejecutar [Configuración - Acerca de - Purga del repositorio de datos]",
"219": "El servicio de almacenamiento en la nube no está disponible, inténtalo de nuevo más tarde"
"219": "El servicio de almacenamiento en la nube no está disponible, inténtalo de nuevo más tarde",
"220": "Debido a un defecto en la versión anterior, los datos de la nube están dañados. Consulte los pasos de la User Guide-FAQ-Lost Key para restablecer el repositorio de datos local y el directorio de la nube"
}
}
3 changes: 2 additions & 1 deletion app/appearance/langs/fr_FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,7 @@
"216": "Reconstruction de l'index des données du contenu des ressources, veuillez patienter...",
"217": "[%d/%d] Création d'un index de données de contenu d'actif",
"218": "Trop d'instantanés du référentiel de données ont été détectés, ce qui ralentit le démarrage du programme et la synchronisation des données. Veuillez envisager d'exécuter [Paramètres - À propos - Purge du référentiel de données]",
"219": "Le service de stockage cloud n'est pas disponible, veuillez réessayer plus tard"
"219": "Le service de stockage cloud n'est pas disponible, veuillez réessayer plus tard",
"220": "En raison d'un défaut dans la version précédente, les données cloud sont corrompues. Veuillez vous référer aux étapes User Guide-FAQ-Lost Key pour réinitialiser le référentiel de données local et le répertoire cloud"
}
}
3 changes: 2 additions & 1 deletion app/appearance/langs/zh_CHT.json
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,7 @@
"216": "正在重建資源文件內容數據索引,請稍等...",
"217": "[%d/%d] 已經創建資源文件內容數據索引",
"218": "偵測到資料倉儲快照過多,降低了程式啟動和資料同步速度,請考慮執行 [設定 - 關於 - 資料倉儲清理]",
"219": "雲端儲存服務不可用,請稍後再試"
"219": "雲端儲存服務不可用,請稍後再試",
"220": "由於先前版本的缺陷導致了雲端資料損壞,請參考 用戶指南-常見問題-遺失密鑰 步驟來重置本地資料倉儲和雲端目錄"
}
}
3 changes: 2 additions & 1 deletion app/appearance/langs/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,7 @@
"216": "正在重建资源文件内容数据索引,请稍等...",
"217": "[%d/%d] 已经创建资源文件内容数据索引",
"218": "检测到数据仓库快照过多,降低了程序启动和数据同步速度,请考虑执行 [设置 - 关于 - 数据仓库清理]",
"219": "云端存储服务不可用,请稍后再试"
"219": "云端存储服务不可用,请稍后再试",
"220": "由于之前版本的缺陷导致了云端数据损坏,请参考 用户指南-常见问题-遗失密钥 步骤来重置本地数据仓库和云端目录"
}
}
54 changes: 54 additions & 0 deletions app/changelogs/v2.11.2/v2.11.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
## Overview

In this version, we have solved the problem of some operations hanging when inserting large assets, OCR, and data sync, and improved the stability of the kernel program.

Additionally, we fixed an issue that caused data corruption in the cloud after resetting the local data repo but not resetting the cloud directory before synchronizing the data.

* If you are using the official cloud data sync, the cloud data will be automatically verified during the first sync after startup. If the cloud data is found to be corrupted, you will be prompted. At this time, please reset the local data repo and cloud directory
* If you are using S3/WebDAV data sync, automatic cloud data verification cannot be performed. To be on the safe side, it is recommended to manually reset the local data repo and cloud directory

Advertisement: The `PRO Features` early bird price will end in early January 2024. If you want to purchase, please hurry up. For details, please [visit](https://b3log.org/siyuan/en/pricing.html).

Note: The annual `Subscription` includes `PRO Features`. If you are an annual subscriber, you do not need to buy PRO Features separately.

## Changelogs

Below are the detailed changes in this version.

### Enhancement

* [OCR no longer blocks document loading](https://github.com/siyuan-note/siyuan/issues/9230)
* [Improve doc tree dragging to top and bottom scroll interaction](https://github.com/siyuan-note/siyuan/issues/9516)
* [Improve file read/write locking](https://github.com/siyuan-note/siyuan/issues/9748)
* [Improve editor dragging blocks to top and bottom scroll interaction](https://github.com/siyuan-note/siyuan/issues/9813)
* [Increase the file size transferred by WeChat Assistant to 20MB](https://github.com/siyuan-note/siyuan/issues/9816)
* [Add unpin icon](https://github.com/siyuan-note/siyuan/issues/9819)
* [Improve search preview to highlight text `<foo>`](https://github.com/siyuan-note/siyuan/issues/9821)
* [Support converting network assets to local](https://github.com/siyuan-note/siyuan/issues/9826)
* [Improve file annotation in rotated PDF](https://github.com/siyuan-note/siyuan/issues/9831)
* [Drag-and-move blocks should not be allowed in read-only mode](https://github.com/siyuan-note/siyuan/issues/9835)
* [Add `Exit the application` to the main menu for Desktop and Pad](https://github.com/siyuan-note/siyuan/issues/9840)
* [Improve kernel stability by eliminating some data races](https://github.com/siyuan-note/siyuan/issues/9842)

### Abolishment

* [No longer automatically download network assets when the cloud inbox is moved to docs](https://github.com/siyuan-note/siyuan/issues/9827)
* [No longer force using discrete GPU on desktop](https://github.com/siyuan-note/siyuan/issues/9845)

### Bugfix

* [Soft line break key on mobile is invalid](https://github.com/siyuan-note/siyuan/issues/9822)
* [Backlink arrow displays incorrectly on mobile](https://github.com/siyuan-note/siyuan/issues/9833)
* [Emoji panel cannot jump in the editor](https://github.com/siyuan-note/siyuan/issues/9837)
* [Modifying inline elements after pasting causes misalignment](https://github.com/siyuan-note/siyuan/issues/9839)
* [Ctrl+D abnormal behavior](https://github.com/siyuan-note/siyuan/issues/9841)
* [Cloud inbox images and text are rendered abnormally on iOS](https://github.com/siyuan-note/siyuan/issues/9844)
* [An issue that caused cloud data corruption](https://github.com/siyuan-note/siyuan/issues/9846)

### Development

* [Database table view supports paged loading](https://github.com/siyuan-note/siyuan/issues/9424)
* [Use HTML attribute `data-wrap` to set the cell wrapping style of attribute view](https://github.com/siyuan-note/siyuan/pull/9814)
* [Add a template function about date](https://github.com/siyuan-note/siyuan/pull/9815)
* [Improve database table view filter](https://github.com/siyuan-note/siyuan/issues/9820)
* [Add internal kernel API `/api/setting/refreshVirtualBlockRef`](https://github.com/siyuan-note/siyuan/issues/9829)
54 changes: 54 additions & 0 deletions app/changelogs/v2.11.2/v2.11.2_zh_CHT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
## 概述

此版本我們解決了插入大資源檔案、OCR、資料同步時部分操作掛起的問題,提升了核心程式的穩定性。

另外,我們解決了一個導致雲端資料損壞的問題,該問題會出現在重置本地資料倉儲但不重置雲端目錄後就進行資料同步。

* 如果你正在使用官方雲端資料同步,啟動後第一次同步時會自動進行雲端資料校驗,如果發現雲端資料損壞會提示,此時請重置本地資料倉儲和雲端目錄
* 如果你正在使用 S3/WebDAV 資料同步,無法自動進行雲端資料校驗,為了保險起見,建議手動重置一次本地資料倉儲和雲端目錄

廣告: `功能特性` 早鳥價將於 2024 年 1 月初結束,如需購買請抓緊時間,細節請[訪問](https://b3log.org/siyuan/pricing.html)

註:`年付訂閱` 包含 `功能特性`,如果你是訂閱會員,則無需單獨購買功能特性。

## 變更記錄

以下是此版本中的詳細變更。

### 改進功能

* [OCR 不再阻塞文件載入](https://github.com/siyuan-note/siyuan/issues/9230)
* [改進文件樹拖曳滾動互動](https://github.com/siyuan-note/siyuan/issues/9516)
* [改進檔案讀取和寫入鎖](https://github.com/siyuan-note/siyuan/issues/9748)
* [改進編輯器拖曳塊滾動互動](https://github.com/siyuan-note/siyuan/issues/9813)
* [提升微信小助手檔案傳輸大小為 20MB](https://github.com/siyuan-note/siyuan/issues/9816)
* [新增取消釘住圖示](https://github.com/siyuan-note/siyuan/issues/9819)
* [改進搜尋預覽高亮文字 `<foo>`](https://github.com/siyuan-note/siyuan/issues/9821)
* [支援轉換網路資源檔案到本地](https://github.com/siyuan-note/siyuan/issues/9826)
* [改進旋轉的 PDF 檔案註解](https://github.com/siyuan-note/siyuan/issues/9831)
* [唯讀模式下不應該允許拖曳區塊](https://github.com/siyuan-note/siyuan/issues/9835)
* [在桌面端端和平板端的主選單中加入 `退出應用程式`](https://github.com/siyuan-note/siyuan/issues/9840)
* [消除資料競態以提升內核穩定性](https://github.com/siyuan-note/siyuan/issues/9842)

### 移除功能

* [雲端收集箱移動到文件時不再自動轉換網路資源檔案到本機](https://github.com/siyuan-note/siyuan/issues/9827)
* [桌面端不再強制使用獨立顯示卡](https://github.com/siyuan-note/siyuan/issues/9845)

### 修復缺陷

* [行動端軟換行失效](https://github.com/siyuan-note/siyuan/issues/9822)
* [行動端反鏈箭頭顯示不正確](https://github.com/siyuan-note/siyuan/issues/9833)
* [編輯器表情面板無法跳轉](https://github.com/siyuan-note/siyuan/issues/9837)
* [貼上後修改行級元素導致錯位](https://github.com/siyuan-note/siyuan/issues/9839)
* [Ctrl+D 行為異常](https://github.com/siyuan-note/siyuan/issues/9841)
* [iOS 端雲端收集箱圖片與文字排版異常](https://github.com/siyuan-note/siyuan/issues/9844)
* [雲端資料損壞](https://github.com/siyuan-note/siyuan/issues/9846)

### 開發者

* [資料庫表格視圖支援分頁載入](https://github.com/siyuan-note/siyuan/issues/9424)
* [使用 HTML 屬性 `data-wrap` 來設定資料庫表格視圖單元格折行](https://github.com/siyuan-note/siyuan/pull/9814)
* [新增一個日期範本函數](https://github.com/siyuan-note/siyuan/pull/9815)
* [改進資料庫表格視圖過濾器](https://github.com/siyuan-note/siyuan/issues/9820)
* [新增內部內核 API `/api/setting/refreshVirtualBlockRef`](https://github.com/siyuan-note/siyuan/issues/9829)
54 changes: 54 additions & 0 deletions app/changelogs/v2.11.2/v2.11.2_zh_CN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
## 概述

该版本我们解决了插入大资源文件、OCR、数据同步时部分操作挂起的问题,提升了内核程序的稳定性。

另外,我们解决了一个导致云端数据损坏的问题,该问题会出现在重置本地数据仓库但不重置云端目录后就进行数据同步。

* 如果你正在使用官方云端数据同步,启动后第一次同步时会自动进行云端数据校验,如果发现云端数据损坏会提示,此时请重置本地数据仓库和云端目录
* 如果你正在使用 S3/WebDAV 数据同步,无法自动进行云端数据校验,为了保险起见,建议手动重置一次本地数据仓库和云端目录

广告: `功能特性` 早鸟价将于 2024 年 1 月初结束,如需购买请抓紧时间,细节请[访问](https://b3log.org/siyuan/pricing.html)

注:`年付订阅` 包含 `功能特性`,如果你是订阅会员,则无需单独购买功能特性。

## 变更记录

以下是此版本中的详细变更。

### 改进功能

* [OCR 不再阻塞文档加载](https://github.com/siyuan-note/siyuan/issues/9230)
* [改进文档树拖拽滚动交互](https://github.com/siyuan-note/siyuan/issues/9516)
* [改进文件读写锁](https://github.com/siyuan-note/siyuan/issues/9748)
* [改进编辑器拖拽块滚动交互](https://github.com/siyuan-note/siyuan/issues/9813)
* [提升微信小助手文件传输大小为 20MB](https://github.com/siyuan-note/siyuan/issues/9816)
* [添加取消钉住图标](https://github.com/siyuan-note/siyuan/issues/9819)
* [改进搜索预览高亮文本 `<foo>`](https://github.com/siyuan-note/siyuan/issues/9821)
* [支持转换网络资源文件到本地](https://github.com/siyuan-note/siyuan/issues/9826)
* [改进旋转的 PDF 文件注解](https://github.com/siyuan-note/siyuan/issues/9831)
* [只读模式下不应该允许拖拽块](https://github.com/siyuan-note/siyuan/issues/9835)
* [在桌面端端和平板端的主菜单中添加 `退出应用`](https://github.com/siyuan-note/siyuan/issues/9840)
* [消除数据竞态以提升内核稳定性](https://github.com/siyuan-note/siyuan/issues/9842)

### 移除功能

* [云端收集箱移动到文档时不再自动转换网络资源文件到本地](https://github.com/siyuan-note/siyuan/issues/9827)
* [桌面端不再强制使用独立显卡](https://github.com/siyuan-note/siyuan/issues/9845)

### 修复缺陷

* [移动端软换行失效](https://github.com/siyuan-note/siyuan/issues/9822)
* [移动端反链箭头显示不正确](https://github.com/siyuan-note/siyuan/issues/9833)
* [编辑器表情面板无法跳转](https://github.com/siyuan-note/siyuan/issues/9837)
* [粘贴后修改行级元素导致错位](https://github.com/siyuan-note/siyuan/issues/9839)
* [Ctrl+D 行为异常](https://github.com/siyuan-note/siyuan/issues/9841)
* [iOS 端云端收集箱图片和文本排版异常](https://github.com/siyuan-note/siyuan/issues/9844)
* [云端数据损坏](https://github.com/siyuan-note/siyuan/issues/9846)

### 开发者

* [数据库表格视图支持分页加载](https://github.com/siyuan-note/siyuan/issues/9424)
* [使用 HTML 属性 `data-wrap` 来设置数据库表格视图单元格折行](https://github.com/siyuan-note/siyuan/pull/9814)
* [添加一个日期模板函数](https://github.com/siyuan-note/siyuan/pull/9815)
* [改进数据库表格视图过滤器](https://github.com/siyuan-note/siyuan/issues/9820)
* [添加内部内核 API `/api/setting/refreshVirtualBlockRef`](https://github.com/siyuan-note/siyuan/issues/9829)
4 changes: 2 additions & 2 deletions kernel/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ require (
github.com/rqlite/sql v0.0.0-20221103124402-8f9ff0ceb8f0
github.com/sashabaranov/go-openai v1.17.9
github.com/shirou/gopsutil/v3 v3.23.11
github.com/siyuan-note/dejavu v0.0.0-20231209022337-1ab041167449
github.com/siyuan-note/dejavu v0.0.0-20231210035601-f7a267cc1f13
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75
github.com/siyuan-note/eventbus v0.0.0-20230804030110-cf250f838c80
github.com/siyuan-note/eventbus v0.0.0-20231210025112-82fdedd8e374
github.com/siyuan-note/filelock v0.0.0-20231209021753-ecf23a6be73b
github.com/siyuan-note/httpclient v0.0.0-20231120083123-750db4d28b38
github.com/siyuan-note/logging v0.0.0-20231208035918-61f884c854f0
Expand Down
8 changes: 4 additions & 4 deletions kernel/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -356,12 +356,12 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA=
github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8=
github.com/siyuan-note/dejavu v0.0.0-20231209022337-1ab041167449 h1:gyS0N7IxhBu73K8ROhvMhXAEGKuqV7yKH41usbA2G3c=
github.com/siyuan-note/dejavu v0.0.0-20231209022337-1ab041167449/go.mod h1:3rwKzSj5NnzhJ181Ln3BIQdOyYBskR/z7j88MjqXgLY=
github.com/siyuan-note/dejavu v0.0.0-20231210035601-f7a267cc1f13 h1:N9686VL6t6qV40JLSut8uyJmVCR49z4E3hYuLgkvOgw=
github.com/siyuan-note/dejavu v0.0.0-20231210035601-f7a267cc1f13/go.mod h1:hSo1/yfw5tuhfbDdpsGX38iMmalX6sK4hruoPYSswxs=
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE=
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw=
github.com/siyuan-note/eventbus v0.0.0-20230804030110-cf250f838c80 h1:XghjHKJd+SiL0DkGYFVC+UGUDFtnR4v9gkAbPeh9Eq8=
github.com/siyuan-note/eventbus v0.0.0-20230804030110-cf250f838c80/go.mod h1:Sqo4FYX5lAXu7gWkbEdJF0e6P57tNNVV4WDKYDctokI=
github.com/siyuan-note/eventbus v0.0.0-20231210025112-82fdedd8e374 h1:haPIOZBOAEQaXsUPUpyZeOeMgw6g/9O7RBbS3d39Ta8=
github.com/siyuan-note/eventbus v0.0.0-20231210025112-82fdedd8e374/go.mod h1:Sqo4FYX5lAXu7gWkbEdJF0e6P57tNNVV4WDKYDctokI=
github.com/siyuan-note/filelock v0.0.0-20231209021753-ecf23a6be73b h1:IKSZ7xR5ks7bUpxbfwBPb9lgFuLTrgpNXtzMfTKBlV8=
github.com/siyuan-note/filelock v0.0.0-20231209021753-ecf23a6be73b/go.mod h1:++qrlYXSLss5AtNrHm3MNtDAQSI2gT8m3m15zLPjWJg=
github.com/siyuan-note/httpclient v0.0.0-20231120083123-750db4d28b38 h1:deUrbUOwmsNYRT0x12GHaJ8exxmDMwXFL/1J4dVnLMM=
Expand Down
9 changes: 7 additions & 2 deletions kernel/model/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -1605,8 +1605,10 @@ func subscribeRepoEvents() {
})
eventbus.Subscribe(eventbus.EvtIndexUpsertFile, func(context map[string]interface{}, count int, total int) {
msg := fmt.Sprintf(Conf.Language(160), count, total)
util.SetBootDetails(msg)
util.ContextPushMsg(context, msg)
if 0 == count%32 {
util.SetBootDetails(msg)
util.ContextPushMsg(context, msg)
}
})

eventbus.Subscribe(eventbus.EvtCheckoutBeforeWalkData, func(context map[string]interface{}, path string) {
Expand Down Expand Up @@ -1756,6 +1758,9 @@ func subscribeRepoEvents() {
util.SetBootDetails(msg)
util.ContextPushMsg(context, msg)
})
eventbus.Subscribe(eventbus.EvtCloudCorrupted, func() {
util.PushErrMsg(Conf.language(220), 30000)
})
}

func buildCloudConf() (ret *cloud.Conf, err error) {
Expand Down

0 comments on commit 0ee6f49

Please sign in to comment.