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 2024-05-17 23:35:54 +08:00
commit 34a487b2d0
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kernel/model/import.go
View file

@ -115,12 +115,13 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
return
}
if 1 != len(unzipRootPaths) {
logging.LogErrorf("invalid .sy.zip")
logging.LogErrorf("invalid .sy.zip [%v]", unzipRootPaths)
return errors.New(Conf.Language(199))
}
unzipRootPath := unzipRootPaths[0]
name := filepath.Base(unzipRootPath)
if strings.HasPrefix(name, "data-20") && len("data-20230321175442") == len(name) {
logging.LogErrorf("invalid .sy.zip [unzipRootPath=%s, baseName=%s]", unzipRootPath, name)
return errors.New(Conf.Language(199))
}

2
kernel/model/search.go
View file

@ -803,7 +803,7 @@ func replaceTextNode(text *ast.Node, method int, keyword string, replacement str
}
} else if 3 == method {
if nil != r && r.MatchString(string(text.Tokens)) {
newContent := bytes.ReplaceAll(text.Tokens, []byte(keyword), []byte(replacement))
newContent := []byte(r.ReplaceAllString(string(text.Tokens), replacement))
tree := parse.Inline("", newContent, luteEngine.ParseOptions)
if nil == tree.Root.FirstChild {
return false

2
kernel/util/misc.go
View file

@ -124,7 +124,7 @@ func Convert2Float(s string) (float64, bool) {
s = strings.ReplaceAll(s, ",", "")
buf := bytes.Buffer{}
for _, r := range s {
if unicode.IsDigit(r) || '.' == r {
if unicode.IsDigit(r) || '.' == r || '-' == r {
buf.WriteRune(r)
}
}