0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 OCR no longer blocks document loading https://github.com/siyuan-note/siyuan/issues/9230

Browse source
This commit is contained in:
Daniel 2023-12-09 22:11:38 +08:00
parent 1dc5a371f6
commit aaf15c77e0
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/model/conf.go
View file

@ -586,15 +586,13 @@ func NewLute() (ret *lute.Lute) {
return
}
var confSaveLock = sync.Mutex{}
func (conf *AppConf) Save() {
if util.ReadOnly {
return
}
confSaveLock.Lock()
defer confSaveLock.Unlock()
Conf.m.Lock()
defer Conf.m.Unlock()
newData, _ := gulu.JSON.MarshalIndentJSON(Conf, "", " ")
confPath := filepath.Join(util.ConfDir, "conf.json")

9
kernel/model/ocr.go
View file

@ -12,6 +12,7 @@ import (
"github.com/siyuan-note/filelock"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/cache"
"github.com/siyuan-note/siyuan/kernel/sql"
"github.com/siyuan-note/siyuan/kernel/task"
"github.com/siyuan-note/siyuan/kernel/util"
)
@ -53,6 +54,14 @@ func autoOCRAssets() {
}
cleanNotExistAssetsTexts()
// 刷新 OCR 结果到数据库
util.NodeOCRQueueLock.Lock()
defer util.NodeOCRQueueLock.Unlock()
for _, id := range util.NodeOCRQueue {
sql.IndexNodeQueue(id)
}
util.NodeOCRQueue = nil
}
func cleanNotExistAssetsTexts() {

6
kernel/sql/database.go
View file

@ -800,13 +800,13 @@ func buildBlockFromNode(n *ast.Node, tree *parse.Tree) (block *Block, attributes
markdown = treenode.ExportNodeStdMd(n, luteEngine)
if !treenode.IsNodeOCRed(n) {
IndexNodeQueue(n.ID)
util.PushNodeOCRQueue(n.ID)
}
content = treenode.NodeStaticContent(n, nil, true, indexAssetPath)
fc := treenode.FirstLeafBlock(n)
if !treenode.IsNodeOCRed(fc) {
IndexNodeQueue(fc.ID)
util.PushNodeOCRQueue(fc.ID)
}
fcontent = treenode.NodeStaticContent(fc, nil, true, false)
@ -820,7 +820,7 @@ func buildBlockFromNode(n *ast.Node, tree *parse.Tree) (block *Block, attributes
markdown = treenode.ExportNodeStdMd(n, luteEngine)
if !treenode.IsNodeOCRed(n) {
IndexNodeQueue(n.ID)
util.PushNodeOCRQueue(n.ID)
}
content = treenode.NodeStaticContent(n, nil, true, indexAssetPath)

11
kernel/util/tesseract.go
View file

@ -273,3 +273,14 @@ func getTesseractLangs() (ret []string) {
}
return
}
var (
NodeOCRQueue []string
NodeOCRQueueLock = sync.Mutex{}
)
func PushNodeOCRQueue(id string) {
NodeOCRQueueLock.Lock()
defer NodeOCRQueueLock.Unlock()
NodeOCRQueue = append(NodeOCRQueue, id)
}