Merge remote-tracking branch 'origin/dev' into dev

.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 -t b3log/siyuan:latest -t b3log/siyuan:v2.0.24 .
+          docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.0.25 .

CHANGELOG.md

@@ -1,3 +1,36 @@
+## v2.0.25 / 2022-06-29
+
+### 改进功能
+
+* [状态栏显示选中内容的字数](https://github.com/siyuan-note/siyuan/issues/4932)
+* [新增获取块 kramdown 源代码的 API](https://github.com/siyuan-note/siyuan/issues/5289)
+* [改进 Ctrl+Tab 支持选择切换](https://github.com/siyuan-note/siyuan/issues/5290)
+* [桌面端支持隐藏底部状态栏](https://github.com/siyuan-note/siyuan/issues/5292)
+* [同步按钮和反馈按钮互换位置](https://github.com/siyuan-note/siyuan/issues/5293)
+* [改进桌面端底部状态栏通知](https://github.com/siyuan-note/siyuan/issues/5294)
+* [同步忽略文件配置使用 gitignore 规则](https://github.com/siyuan-note/siyuan/issues/5295)
+* [图表和脑图宽度自适应](https://github.com/siyuan-note/siyuan/issues/5296)
+* [移动端文件树的文档菜单添加属性项、文档树菜单顺序调整](https://github.com/siyuan-note/siyuan/issues/5298)
+* [数据仓库快照支持 `syncignore` 配置](https://github.com/siyuan-note/siyuan/issues/5302)
+* [`中西文间插入空格` 改为 `优化排版`](https://github.com/siyuan-note/siyuan/issues/5312)
+
+### 文档相关
+
+* [用户指南 `数据安全` 文档中加入 `威胁模型` 章节](https://github.com/siyuan-note/siyuan/issues/5250)
+
+### 修复缺陷
+
+* [使用块滚动条跳转到最后一个块时无法加载上面的块](https://github.com/siyuan-note/siyuan/issues/5291)
+* [新建文档填入文档名后大纲显示 `Untitled`](https://github.com/siyuan-note/siyuan/issues/5297)
+* [链接的打开菜单和点击事件保持一致](https://github.com/siyuan-note/siyuan/issues/5300)
+* [复制资源文件后导出父级文档再导入问题](https://github.com/siyuan-note/siyuan/issues/5301)
+* [打开文档不会更新文档树聚焦、大纲和反链面板](https://github.com/siyuan-note/siyuan/issues/5303)
+* [代码块上方为折叠块时 ↑ 键预期错误](https://github.com/siyuan-note/siyuan/issues/5304)
+* [点击大纲顶部标题未跳转到文档开始](https://github.com/siyuan-note/siyuan/issues/5307)
+* [`优化排版` 影响行级标记符](https://github.com/siyuan-note/siyuan/issues/5308)
+* [导入 `.sy.zip` 后查询嵌入块失效](https://github.com/siyuan-note/siyuan/issues/5316)
+* [缓存参数设置不正确](https://github.com/siyuan-note/siyuan/issues/5318)
+
 ## v2.0.24 / 2022-06-26
 
 ### 改进功能

app/appx/AppxManifest.xml

@@ -9,7 +9,7 @@
     <Identity Name="89C2A984.SiYuan"
               ProcessorArchitecture="x64"
               Publisher='CN=087C656E-C1D9-42D8-8807-CED45A74FC0F'
-              Version="2.0.24.0"/>
+              Version="2.0.25.0"/>
     <Properties>
         <DisplayName>SiYuan</DisplayName>
         <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "SiYuan",
-  "version": "2.0.24",
+  "version": "2.0.25",
   "description": "A local-first personal knowledge management system, supports fine-grained block-level reference, and Markdown WYSIWYG.",
   "homepage": "https://b3log.org/siyuan",
   "main": "./electron/main.js",

kernel/cache/ial.go

@@ -24,8 +24,8 @@ import (
 )
 
 var docIALCache, _ = ristretto.NewCache(&ristretto.Config{
-	NumCounters: 100000,           // 10W
+	NumCounters: 200000,
-	MaxCost:     1024 * 1024 * 10, // 10MB
+	MaxCost:     1000 * 1000 * 32,
 	BufferItems: 64,
 })
 
@@ -55,8 +55,8 @@ func ClearDocsIAL() {
 }
 
 var blockIALCache, _ = ristretto.NewCache(&ristretto.Config{
-	NumCounters: 100000,           // 10W
+	NumCounters: 800000,
-	MaxCost:     1024 * 1024 * 10, // 10MB
+	MaxCost:     1000 * 1000 * 64,
 	BufferItems: 64,
 })
 

kernel/filesys/tree.go

@@ -71,13 +71,15 @@ func LoadTree(boxID, p string, luteEngine *lute.Lute) (ret *parse.Tree, err erro
 		}
 		parentPath += ".sy"
 		parentPath = filepath.Join(util.DataDir, boxID, parentPath)
-		data, err := filelock.LockFileRead(parentPath)
+		parentData, readErr := filelock.LockFileRead(parentPath)
-		if nil != err {
+		if nil != readErr {
+			util.LogWarnf("read tree data [%s] failed: %s", parentPath, err)
 			hPathBuilder.WriteString("Untitled/")
 			continue
 		}
-		parentTree, err := protyle.ParseJSONWithoutFix(luteEngine, data)
+		parentTree, parseErr := protyle.ParseJSONWithoutFix(luteEngine, parentData)
-		if nil != err {
+		if nil != parseErr {
+			util.LogWarnf("parse tree [%s] failed: %s", parentPath, err)
 			hPathBuilder.WriteString("Untitled/")
 			continue
 		}

kernel/sql/cache.go

@@ -27,8 +27,8 @@ import (
 )
 
 var memCache, _ = ristretto.NewCache(&ristretto.Config{
-	NumCounters: 100000,           // 10W
+	NumCounters: 800000,
-	MaxCost:     1024 * 1024 * 10, // 10MB
+	MaxCost:     1000 * 1000 * 100,
 	BufferItems: 64,
 })
 var disabled = true
@@ -110,9 +110,7 @@ func GetRefsCacheByDefID(defID string) (ret []*Ref) {
 	return
 }
 
-var (
+var defIDRefsCache = gcache.New(30*time.Minute, 5*time.Minute) // [defBlockID]map[refBlockID]*Ref
-	defIDRefsCache = gcache.New(30*time.Minute, 5*time.Minute) // [defBlockID]map[refBlockID]*Ref
-)
 
 func CacheRef(tree *parse.Tree, refIDNode *ast.Node) {
 	ref := buildRef(tree, refIDNode)

kernel/util/working.go

@@ -40,7 +40,7 @@ import (
 var Mode = "prod"
 
 const (
-	Ver       = "2.0.24"
+	Ver       = "2.0.25"
 	IsInsider = false
 )