Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-01 14:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 All plain text formats are supported when comparing data snapshots https://github.com/siyuan-note/siyuan/issues/12975

Browse source
This commit is contained in:
Daniel 2024-11-01 09:38:34 +08:00
parent 641550e1ed
commit 6db7b847e9
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
5 changed files with 19 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

21
kernel/model/repository.go
View file

@ -24,6 +24,7 @@ import (
"errors"
"fmt"
"math"
"mime"
"net/http"
"os"
"path"
@ -79,7 +80,7 @@ func GetRepoFile(fileID string) (ret []byte, p string, err error) {
return
}
func OpenRepoSnapshotDoc(fileID string) (title, content string, isProtyleDoc bool, updated int64, err error) {
func OpenRepoSnapshotDoc(fileID string) (title, content string, displayInText bool, updated int64, err error) {
if 1 > len(Conf.Repo.Key) {
err = errors.New(Conf.Language(26))
return
@ -105,16 +106,15 @@ func OpenRepoSnapshotDoc(fileID string) (title, content string, isProtyleDoc boo
if strings.HasSuffix(file.Path, ".sy") {
luteEngine := NewLute()
var snapshotTree *parse.Tree
isProtyleDoc, snapshotTree, err = parseTreeInSnapshot(data, luteEngine)
displayInText, snapshotTree, err = parseTreeInSnapshot(data, luteEngine)
if err != nil {
logging.LogErrorf("parse tree from snapshot file [%s] failed", fileID)
return
}
title = snapshotTree.Root.IALAttr("title")
if !isProtyleDoc {
if !displayInText {
renderTree := &parse.Tree{Root: &ast.Node{Type: ast.NodeDocument}}
var unlinks []*ast.Node
ast.Walk(snapshotTree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering {
@ -142,7 +142,7 @@ func OpenRepoSnapshotDoc(fileID string) (title, content string, isProtyleDoc boo
}
luteEngine.RenderOptions.ProtyleContenteditable = false
if isProtyleDoc {
if displayInText {
util.PushMsg(Conf.Language(36), 5000)
formatRenderer := render.NewFormatRenderer(snapshotTree, luteEngine.RenderOptions)
content = gulu.Str.FromBytes(formatRenderer.Render())
@ -150,9 +150,12 @@ func OpenRepoSnapshotDoc(fileID string) (title, content string, isProtyleDoc boo
content = luteEngine.Tree2BlockDOM(snapshotTree, luteEngine.RenderOptions)
}
} else {
isProtyleDoc = true
displayInText = true
title = path.Base(file.Path)
if strings.HasSuffix(file.Path, ".json") {
if mimeType := mime.TypeByExtension(filepath.Ext(file.Path)); strings.HasPrefix(mimeType, "text/") {
// 如果是文本文件，直接返回文本内容
// All plain text formats are supported when comparing data snapshots https://github.com/siyuan-note/siyuan/issues/12975
content = gulu.Str.FromBytes(data)
} else {
if strings.Contains(file.Path, "assets/") { // 剔除笔记本级或者文档级资源文件路径前缀
@ -328,8 +331,8 @@ func parseTitleInSnapshot(fileID string, repo *dejavu.Repo, luteEngine *lute.Lut
return
}
func parseTreeInSnapshot(data []byte, luteEngine *lute.Lute) (isProtyleDoc bool, tree *parse.Tree, err error) {
isProtyleDoc = 1024*1024*1 <= len(data)
func parseTreeInSnapshot(data []byte, luteEngine *lute.Lute) (isLargeDoc bool, tree *parse.Tree, err error) {
isLargeDoc = 1024*1024*1 <= len(data)
tree, err = filesys.ParseJSONWithoutFix(data, luteEngine.ParseOptions)
if err != nil {
return