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

🎨 导出 Markdown zip 包内不带文件夹 Fix https://github.com/siyuan-note/siyuan/issues/6869

Browse source
This commit is contained in:
Liang Ding 2022-12-15 10:15:18 +08:00
parent af6a5918e9
commit 3491683f4f
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
kernel/model/export.go
View file

@ -741,10 +741,24 @@ func exportMarkdownZip(boxID, baseFolderName string, docPaths []string) (zipPath
return ""
}
if err = zip.AddDirectory(baseFolderName, exportFolder); nil != err {
logging.LogErrorf("create export markdown zip [%s] failed: %s", exportFolder, err)
// 导出 Markdown zip 包内不带文件夹 https://github.com/siyuan-note/siyuan/issues/6869
entries, err := os.ReadDir(exportFolder)
if nil != err {
logging.LogErrorf("read export markdown folder [%s] failed: %s", exportFolder, err)
return ""
}
for _, entry := range entries {
entryPath := filepath.Join(exportFolder, entry.Name())
if gulu.File.IsDir(entryPath) {
err = zip.AddDirectory(entry.Name(), entryPath)
} else {
err = zip.AddEntry(entry.Name(), entryPath)
}
if nil != err {
logging.LogErrorf("add entry [%s] to zip failed: %s", entry.Name(), err)
return ""
}
}
if err = zip.Close(); nil != err {
logging.LogErrorf("close export markdown zip failed: %s", err)