Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 08:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 导出 PDF 和 Word 时支持覆盖已有文件 https://github.com/siyuan-note/siyuan/issues/5309

Browse source
This commit is contained in:
Liang Ding 2022-07-19 22:52:00 +08:00
parent 9a64c860ce
commit c0d5d3ba59
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 9 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kernel/model/export.go
View file

@ -180,17 +180,13 @@ func ExportDocx(id, savePath string) (err error) {
return errors.New(msg)
}
if 1 < strings.Count(savePath, filepath.Base(savePath)) {
savePath = filepath.Dir(savePath)
}
if err = gulu.File.Copy(tmpDocxPath, savePath); nil != err {
if err = gulu.File.Copy(tmpDocxPath, filepath.Join(savePath, name+".docx")); nil != err {
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 err = gulu.File.Copy(tmpAssets, filepath.Join(filepath.Dir(savePath), "assets")); nil != err {
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))
}
@ -203,9 +199,6 @@ func ExportMarkdownHTML(id, savePath string, docx bool) (name, dom string) {
tree = exportTree(tree, true)
name = path.Base(tree.HPath)
if 1 < strings.Count(savePath, filepath.Base(savePath)) {
savePath = filepath.Dir(savePath)
}
if err := os.MkdirAll(savePath, 0755); nil != err {
logging.LogErrorf("mkdir [%s] failed: %s", savePath, err)
@ -290,10 +283,6 @@ func ExportHTML(id, savePath string, pdf bool) (name, dom string) {
tree = exportTree(tree, true)
name = path.Base(tree.Path)
if 1 < strings.Count(savePath, filepath.Base(savePath)) {
savePath = filepath.Dir(savePath)
}
if err := os.MkdirAll(savePath, 0755); nil != err {
logging.LogErrorf("mkdir [%s] failed: %s", savePath, err)
return