From 3491683f4f4dd57560f260639d8947d5f6be66ac Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 15 Dec 2022 10:15:18 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E5=AF=BC=E5=87=BA=20Markdown=20zip=20?=
 =?UTF-8?q?=E5=8C=85=E5=86=85=E4=B8=8D=E5=B8=A6=E6=96=87=E4=BB=B6=E5=A4=B9?=
 =?UTF-8?q?=20Fix=20https://github.com/siyuan-note/siyuan/issues/6869?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/export.go | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/kernel/model/export.go b/kernel/model/export.go
index a3136cbd1..8a6d3a5b3 100644
--- a/kernel/model/export.go
+++ b/kernel/model/export.go
@@ -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)