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

🎨 浏览器端和移动端导出 Data 去掉 data- 前缀 Fix https://github.com/siyuan-note/siyuan/issues/6808

Browse source 
导出 Data 不带 data 父文件夹 Fix https://github.com/siyuan-note/siyuan/issues/6805
This commit is contained in:
Liang Ding 2022-12-07 16:38:49 +08:00
parent 560ff8c9d4
commit ae11242a19
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kernel/model/export.go
View file

@ -120,17 +120,18 @@ func ExportSY(id string) (name, zipPath string) {
return
}
func ExportDataInFolder(exportFolder string) (err error) {
func ExportDataInFolder(exportFolder string) (name string, err error) {
util.PushEndlessProgress(Conf.Language(65))
defer util.ClearPushProgress(100)
WaitForWritingFiles()
exportFolder = filepath.Join(exportFolder, util.CurrentTimeSecondsStr())
err = exportData(exportFolder)
zipPath, err := exportData(exportFolder)
if nil != err {
return
}
name = filepath.Base(zipPath)
return
}
@ -140,10 +141,8 @@ func ExportData() (zipPath string) {
WaitForWritingFiles()
baseFolderName := "data-" + util.CurrentTimeSecondsStr()
exportFolder := filepath.Join(util.TempDir, "export", baseFolderName)
zipPath = exportFolder + ".zip"
err := exportData(exportFolder)
exportFolder := filepath.Join(util.TempDir, "export", util.CurrentTimeSecondsStr())
zipPath, err := exportData(exportFolder)
if nil != err {
return
}
@ -151,7 +150,7 @@ func ExportData() (zipPath string) {
return
}
func exportData(exportFolder string) (err error) {
func exportData(exportFolder string) (zipPath string, err error) {
baseFolderName := "data-" + util.CurrentTimeSecondsStr()
if err = os.MkdirAll(exportFolder, 0755); nil != err {
logging.LogErrorf("create export temp folder failed: %s", err)
@ -165,7 +164,7 @@ func exportData(exportFolder string) (err error) {
return
}
zipPath := exportFolder + ".zip"
zipPath = exportFolder + ".zip"
zip, err := gulu.Zip.Create(zipPath)
if nil != err {
logging.LogErrorf("create export data zip [%s] failed: %s", exportFolder, err)