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

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

Browse source
This commit is contained in:
Vanessa 2023-06-03 17:55:59 +08:00
commit f99d9e19bc
5 changed files with 63 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/history/diff.ts
View file

@ -75,7 +75,7 @@ const renderCompare = (app: App, element: HTMLElement) => {
textElement.previousElementSibling.classList.remove("fn__none");
textElement.classList.add("fn__none");
leftElement.lastElementChild.classList.add("fn__none");
} else if (response.data.isLargeDoc) {
} else if (response.data.isProtyleDoc) {
textElement.value = response.data.content;
textElement.classList.remove("fn__none");
leftElement.lastElementChild.classList.add("fn__none");
@ -103,7 +103,7 @@ const renderCompare = (app: App, element: HTMLElement) => {
textElement.previousElementSibling.classList.remove("fn__none");
textElement.classList.add("fn__none");
rightElement.lastElementChild.classList.add("fn__none");
} else if (response.data.isLargeDoc) {
} else if (response.data.isProtyleDoc) {
textElement.value = response.data.content;
textElement.classList.remove("fn__none");
rightElement.lastElementChild.classList.add("fn__none");

10
kernel/api/repo.go
View file

@ -36,7 +36,7 @@ func openRepoSnapshotDoc(c *gin.Context) {
}
id := arg["id"].(string)
id, rootID, content, isLargeDoc, updated, err := model.OpenRepoSnapshotDoc(id)
content, isProtyleDoc, updated, err := model.OpenRepoSnapshotDoc(id)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
@ -44,11 +44,9 @@ func openRepoSnapshotDoc(c *gin.Context) {
}
ret.Data = map[string]interface{}{
"id": id,
"rootID": rootID,
"content": content,
"isLargeDoc": isLargeDoc,
"updated": updated,
"content": content,
"isProtyleDoc": isProtyleDoc,
"updated": updated,
}
}

34
kernel/model/repository.go
View file

@ -71,7 +71,7 @@ type TypeCount struct {
Count int `json:"count"`
}
func OpenRepoSnapshotDoc(fileID string) (id, rootID, content string, isLargeDoc bool, updated int64, err error) {
func OpenRepoSnapshotDoc(fileID string) (content string, isProtyleDoc bool, updated int64, err error) {
if 1 > len(Conf.Repo.Key) {
err = errors.New(Conf.Language(26))
return
@ -97,15 +97,13 @@ func OpenRepoSnapshotDoc(fileID string) (id, rootID, content string, isLargeDoc
if strings.HasSuffix(file.Path, ".sy") {
luteEngine := NewLute()
var snapshotTree *parse.Tree
isLargeDoc, snapshotTree, err = parseTreeInSnapshot(data, luteEngine)
isProtyleDoc, snapshotTree, err = parseTreeInSnapshot(data, luteEngine)
if nil != err {
logging.LogErrorf("parse tree from snapshot file [%s] failed", fileID)
return
}
id = snapshotTree.Root.ID
rootID = snapshotTree.Root.ID
if !isLargeDoc {
if !isProtyleDoc {
renderTree := &parse.Tree{Root: &ast.Node{Type: ast.NodeDocument}}
var unlinks []*ast.Node
@ -135,7 +133,7 @@ func OpenRepoSnapshotDoc(fileID string) (id, rootID, content string, isLargeDoc
}
luteEngine.RenderOptions.ProtyleContenteditable = false
if isLargeDoc {
if isProtyleDoc {
util.PushMsg(Conf.Language(36), 5000)
formatRenderer := render.NewFormatRenderer(snapshotTree, luteEngine.RenderOptions)
content = gulu.Str.FromBytes(formatRenderer.Render())
@ -143,11 +141,27 @@ func OpenRepoSnapshotDoc(fileID string) (id, rootID, content string, isLargeDoc
content = luteEngine.Tree2BlockDOM(snapshotTree, luteEngine.RenderOptions)
}
} else {
isLargeDoc = true
isProtyleDoc = true
if strings.HasSuffix(file.Path, ".json") {
content = gulu.Str.FromBytes(data)
} else {
content = file.Path
if strings.Contains(file.Path, "assets/") { // 剔除笔记本级或者文档级资源文件路径前缀
file.Path = file.Path[strings.Index(file.Path, "assets/"):]
if util.IsDisplayableAsset(file.Path) {
dir, f := filepath.Split(file.Path)
tempRepoDiffDir := filepath.Join(util.TempDir, "repo", "diff", dir)
if mkErr := os.MkdirAll(tempRepoDiffDir, 0755); nil != mkErr {
logging.LogErrorf("mkdir [%s] failed: %v", tempRepoDiffDir, mkErr)
} else {
if wrErr := os.WriteFile(filepath.Join(tempRepoDiffDir, f), data, 0644); nil != wrErr {
logging.LogErrorf("write file [%s] failed: %v", filepath.Join(tempRepoDiffDir, file.Path), wrErr)
}
}
content = path.Join("repo", "diff", file.Path)
}
} else {
content = file.Path
}
}
}
return
@ -304,8 +318,8 @@ func parseTitleInSnapshot(fileID string, repo *dejavu.Repo, luteEngine *lute.Lut
return
}
func parseTreeInSnapshot(data []byte, luteEngine *lute.Lute) (isLargeDoc bool, tree *parse.Tree, err error) {
isLargeDoc = 1024*1024*1 <= len(data)
func parseTreeInSnapshot(data []byte, luteEngine *lute.Lute) (isProtyleDoc bool, tree *parse.Tree, err error) {
isProtyleDoc = 1024*1024*1 <= len(data)
tree, err = filesys.ParseJSONWithoutFix(data, luteEngine.ParseOptions)
if nil != err {
return

10
kernel/server/serve.go
View file

@ -75,6 +75,7 @@ func Serve(fastMode bool) {
servePlugins(ginServer)
serveEmojis(ginServer)
serveTemplates(ginServer)
serveRepoDiff(ginServer)
api.ServeAPI(ginServer)
var host string
@ -349,6 +350,15 @@ func serveAssets(ginServer *gin.Engine) {
})
}
func serveRepoDiff(ginServer *gin.Engine) {
ginServer.GET("/repo/diff/*path", model.CheckAuth, func(context *gin.Context) {
requestPath := context.Param("path")
p := filepath.Join(util.TempDir, "repo", "diff", requestPath)
http.ServeFile(context.Writer, context.Request, p)
return
})
}
func serveDebug(ginServer *gin.Engine) {
ginServer.GET("/debug/pprof/", gin.WrapF(pprof.Index))
ginServer.GET("/debug/pprof/allocs", gin.WrapF(pprof.Index))

23
kernel/util/path.go
View file

@ -193,3 +193,26 @@ func FilterSelfChildDocs(paths []string) (ret []string) {
func IsAssetLinkDest(dest []byte) bool {
return bytes.HasPrefix(dest, []byte("assets/"))
}
var (
SiYuanAssetsImage = []string{".apng", ".ico", ".cur", ".jpg", ".jpe", ".jpeg", ".jfif", ".pjp", ".pjpeg", ".png", ".gif", ".webp", ".bmp", ".svg", ".avif"}
SiYuanAssetsAudio = []string{".mp3", ".wav", ".ogg", ".m4a"}
SiYuanAssetsVideo = []string{".mov", ".weba", ".mkv", ".mp4", ".webm"}
)
func IsDisplayableAsset(p string) bool {
ext := strings.ToLower(filepath.Ext(p))
if "" == ext {
return false
}
if gulu.Str.Contains(ext, SiYuanAssetsImage) {
return true
}
if gulu.Str.Contains(ext, SiYuanAssetsAudio) {
return true
}
if gulu.Str.Contains(ext, SiYuanAssetsVideo) {
return true
}
return false
}