From 958ddf147cd1ceb0555d0f9a9a2728d6f65a8c08 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 20 Jul 2022 10:43:02 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=AF=BC=E5=87=BA=20PDF=20=E5=92=8C=20?= =?UTF-8?q?Word=20=E6=97=B6=E6=94=AF=E6=8C=81=E8=A6=86=E7=9B=96=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E6=96=87=E4=BB=B6=20https://github.com/siyuan-note/si?= =?UTF-8?q?yuan/issues/5309?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/export.go | 3 ++- kernel/model/export.go | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/api/export.go b/kernel/api/export.go index 04f679d4d..c8d037841 100644 --- a/kernel/api/export.go +++ b/kernel/api/export.go @@ -135,7 +135,8 @@ func exportDocx(c *gin.Context) { id := arg["id"].(string) savePath := arg["savePath"].(string) - err := model.ExportDocx(id, savePath) + removeAssets := arg["removeAssets"].(bool) + err := model.ExportDocx(id, savePath, removeAssets) if nil != err { ret.Code = 1 ret.Msg = err.Error() diff --git a/kernel/model/export.go b/kernel/model/export.go index a70a2d572..32890d654 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -155,7 +155,7 @@ func Preview(id string) string { return luteEngine.ProtylePreview(tree, luteEngine.RenderOptions) } -func ExportDocx(id, savePath string) (err error) { +func ExportDocx(id, savePath string, removeAssets bool) (err error) { if !util.IsValidPandocBin(Conf.Export.PandocBin) { return errors.New(Conf.Language(115)) } @@ -184,8 +184,8 @@ func ExportDocx(id, savePath string) (err error) { logging.LogErrorf("export docx failed: %s", err) return errors.New(fmt.Sprintf(Conf.Language(14), err)) } - tmpAssets := filepath.Join(tmpDir, "assets") - if gulu.File.IsDir(tmpAssets) { + + if tmpAssets := filepath.Join(tmpDir, "assets"); !removeAssets && gulu.File.IsDir(tmpAssets) { if err = gulu.File.Copy(tmpAssets, filepath.Join(savePath, "assets")); nil != err { logging.LogErrorf("export docx failed: %s", err) return errors.New(fmt.Sprintf(Conf.Language(14), err))