Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-16 20:18:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve importing .sy.zip https://github.com/siyuan-note/siyuan/issues/17047

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2026-02-16 10:22:33 +08:00
parent 59cecc25c2
commit 11d4d98d35
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/model/import.go
View file

@ -584,8 +584,10 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
if d == nil {
return nil
}
if strings.Contains(path, "assets") && d.IsDir() {
assetsDirs = append(assetsDirs, path)
if d.Name() == "assets" && d.IsDir() {
if syFiles, _ := filepath.Glob(filepath.Join(path, "*/*.sy")); 1 > len(syFiles) {
assetsDirs = append(assetsDirs, path)
}
}
return nil
})
@ -628,8 +630,10 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
if d == nil {
return nil
}
if strings.Contains(path, "emojis") && d.IsDir() {
emojiDirs = append(emojiDirs, path)
if d.Name() == "emojis" && d.IsDir() {
if syFiles, _ := filepath.Glob(filepath.Join(path, "*/*.sy")); 1 > len(syFiles) {
emojiDirs = append(emojiDirs, path)
}
}
return nil
})
@ -995,7 +999,7 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
}
if strings.HasSuffix(absolutePath, ".md") || strings.HasSuffix(absolutePath, ".markdown") {
if !strings.Contains(absolutePath, "assets") {
if !strings.Contains(filepath.ToSlash(absolutePath), "/assets/") {
// 链接 .md 文件的情况下只有路径中包含 assets 才算作资源文件，其他情况算作文档链接，后续在 convertMdHyperlinks2WikiLinks 中处理
// Supports converting relative path hyperlinks into document block references after importing Markdown https://github.com/siyuan-note/siyuan/issues/13817
return ast.WalkContinue