Kernel API OCR returns text coordinate information (#11738)

* 优化setImageOCRText接口调用

* 扩展 ocr 接口,添加 ocrJSON 返回字段

* 过滤不可见字符

* 返回的ocr文本添加空格
This commit is contained in:
崮生 2024-06-16 22:55:22 +08:00 committed by GitHub
parent 974f1c1183
commit c0bd645048
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 65 additions and 34 deletions

View file

@ -149,22 +149,16 @@ func ExistsAssetText(asset string) (ret bool) {
return
}
func OcrAsset(asset string, force bool) (ret string) {
if !force {
assetsTextsLock.Lock()
ret = assetsTexts[asset]
assetsTextsLock.Unlock()
return
}
func OcrAsset(asset string) (ret []map[string]interface{}) {
assetsPath := GetDataAssetsAbsPath()
assetAbsPath := strings.TrimPrefix(asset, "assets")
assetAbsPath = filepath.Join(assetsPath, assetAbsPath)
ret = Tesseract(assetAbsPath)
assetsTextsLock.Lock()
assetsTexts[asset] = ret
ocrText := GetOcrJsonText(ret)
assetsTexts[asset] = ocrText
assetsTextsLock.Unlock()
if "" != ret {
if "" != ocrText {
assetsTextsChanged.Store(true)
}
return
@ -184,9 +178,9 @@ func IsTesseractExtractable(p string) bool {
// tesseractOCRLock 用于 Tesseract OCR 加锁串行执行提升稳定性 https://github.com/siyuan-note/siyuan/issues/7265
var tesseractOCRLock = sync.Mutex{}
func Tesseract(imgAbsPath string) string {
func Tesseract(imgAbsPath string) (ret []map[string]interface{}) {
if ContainerStd != Container || !TesseractEnabled {
return ""
return
}
defer logging.Recover()
@ -194,16 +188,16 @@ func Tesseract(imgAbsPath string) string {
defer tesseractOCRLock.Unlock()
if !IsTesseractExtractable(imgAbsPath) {
return ""
return
}
info, err := os.Stat(imgAbsPath)
if nil != err {
return ""
return
}
if TesseractMaxSize < uint64(info.Size()) {
return ""
return
}
defer logging.Recover()
@ -211,24 +205,59 @@ func Tesseract(imgAbsPath string) string {
ctx, cancel := context.WithTimeout(context.Background(), 7*time.Second)
defer cancel()
cmd := exec.CommandContext(ctx, TesseractBin, "-c", "debug_file=/dev/null", imgAbsPath, "stdout", "-l", strings.Join(TesseractLangs, "+"))
cmd := exec.CommandContext(ctx, TesseractBin, "-c", "debug_file=/dev/null", imgAbsPath, "stdout", "-l", strings.Join(TesseractLangs, "+"), "tsv")
gulu.CmdAttr(cmd)
output, err := cmd.CombinedOutput()
if ctx.Err() == context.DeadlineExceeded {
logging.LogWarnf("tesseract [path=%s, size=%d] timeout", imgAbsPath, info.Size())
return ""
return
}
if nil != err {
logging.LogWarnf("tesseract [path=%s, size=%d] failed: %s", imgAbsPath, info.Size(), err)
return ""
return
}
ret := string(output)
tsv := string(output)
// 按行分割 TSV 数据
lines := strings.Split(tsv, "\r\n")
// 解析 TSV 数据 跳过标题行,从第二行开始处理
for _, line := range lines[1:] {
if line == "" {
continue // 跳过空行
}
// 分割每列数据
fields := strings.Split(line, "\t")
// 将字段名和字段值映射到一个 map 中
dataMap := make(map[string]interface{})
for i, header := range strings.Split(lines[0], "\t") {
dataMap[header] = fields[i]
}
ret = append(ret, dataMap)
}
tsv = gulu.Str.RemoveInvisible(tsv)
tsv = RemoveRedundantSpace(tsv)
msg := fmt.Sprintf("OCR [%s] [%s]", html.EscapeString(info.Name()), html.EscapeString(GetOcrJsonText(ret)))
PushStatusBar(msg)
return
}
// 提取并连接所有 text 字段的函数
func GetOcrJsonText(jsonData []map[string]interface{}) (ret string) {
for _, dataMap := range jsonData {
// 检查 text 字段是否存在
if text, ok := dataMap["text"]; ok {
// 确保 text 是字符串类型
if textStr, ok := text.(string); ok {
ret += " " + textStr
}
}
}
ret = gulu.Str.RemoveInvisible(ret)
ret = RemoveRedundantSpace(ret)
msg := fmt.Sprintf("OCR [%s] [%s]", html.EscapeString(info.Name()), html.EscapeString(ret))
PushStatusBar(msg)
return ret
}