Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-25 17:56:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 If a file with the same name exists during export PDF/Docx, it will be automatically renamed https://github.com/siyuan-note/siyuan/issues/11357

Browse source
This commit is contained in:
Daniel 2024-05-12 17:37:32 +08:00
parent abf92b602c
commit 749ed8a4ac
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 36 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
kernel/model/export.go
View file

@ -180,7 +180,7 @@ func ExportAv2CSV(avID, blockID string) (zipPath string, err error) {
}
writer.Flush()
zipPath = getUniqueFilename(exportFolder + ".db.zip")
zipPath = exportFolder + ".db.zip"
zip, err := gulu.Zip.Create(zipPath)
if nil != err {
logging.LogErrorf("create export .db.zip [%s] failed: %s", exportFolder, err)
@ -209,24 +209,6 @@ func ExportAv2CSV(avID, blockID string) (zipPath string, err error) {
return
}
func getUniqueFilename(filePath string) string {
if !gulu.File.IsExist(filePath) {
return filePath
}
ext := filepath.Ext(filePath)
base := strings.TrimSuffix(filepath.Base(filePath), ext)
dir := filepath.Dir(filePath)
i := 1
for {
newPath := filepath.Join(dir, base+" ("+strconv.Itoa(i)+ext) + ")"
if !gulu.File.IsExist(newPath) {
return newPath
}
i++
}
}
func Export2Liandi(id string) (err error) {
tree, err := LoadTreeByBlockID(id)
if nil != err {