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

🎨 Support export and import settings https://github.com/siyuan-note/siyuan/issues/10617

Browse source
This commit is contained in:
Daniel 2024-09-26 16:16:45 +08:00
parent a74266bf6b
commit 694303e5e8
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
kernel/api/system.go
View file

@ -346,15 +346,15 @@ func importConf(c *gin.Context) {
return return
} }
tmpDir := filepath.Join(util.TempDir, "import") importDir := filepath.Join(util.TempDir, "import")
if err = os.MkdirAll(tmpDir, 0755); err != nil { if err = os.MkdirAll(importDir, 0755); err != nil {
logging.LogErrorf("import conf failed: %s", err) logging.LogErrorf("import conf failed: %s", err)
ret.Code = -1 ret.Code = -1
ret.Msg = err.Error() ret.Msg = err.Error()
return return
} }
tmp := filepath.Join(tmpDir, f.Filename) tmp := filepath.Join(importDir, f.Filename)
if err = os.WriteFile(tmp, data, 0644); err != nil { if err = os.WriteFile(tmp, data, 0644); err != nil {
logging.LogErrorf("import conf failed: %s", err) logging.LogErrorf("import conf failed: %s", err)
ret.Code = -1 ret.Code = -1
@ -362,6 +362,7 @@ func importConf(c *gin.Context) {
return return
} }
tmpDir := filepath.Join(importDir, "conf")
if err = gulu.Zip.Unzip(tmp, tmpDir); err != nil { if err = gulu.Zip.Unzip(tmp, tmpDir); err != nil {
logging.LogErrorf("import conf failed: %s", err) logging.LogErrorf("import conf failed: %s", err)
ret.Code = -1 ret.Code = -1
@ -369,7 +370,22 @@ func importConf(c *gin.Context) {
return return
} }
tmp = filepath.Join(tmpDir, f.Filename[:len(f.Filename)-4]) entries, err := os.ReadDir(tmpDir)
if err != nil {
logging.LogErrorf("import conf failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
return
}
if 1 != len(entries) {
logging.LogErrorf("invalid conf package")
ret.Code = -1
ret.Msg = "invalid conf package"
return
}
tmp = filepath.Join(tmpDir, entries[0].Name())
data, err = os.ReadFile(tmp) data, err = os.ReadFile(tmp)
if err != nil { if err != nil {
logging.LogErrorf("import conf failed: %s", err) logging.LogErrorf("import conf failed: %s", err)