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

♻️ 日志组件单独抽取项目 https://github.com/siyuan-note/siyuan/issues/5439

Browse source
This commit is contained in:
Liang Ding 2022-07-17 12:22:32 +08:00
parent c8ea858976
commit 505b973c2d
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
70 changed files with 671 additions and 942 deletions
Download patch file Download diff file Expand all files Collapse all files

25
kernel/api/import.go
View file

@ -24,6 +24,7 @@ import (
"github.com/88250/gulu"
"github.com/gin-gonic/gin"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/model"
"github.com/siyuan-note/siyuan/kernel/util"
)
@ -34,7 +35,7 @@ func importSY(c *gin.Context) {
form, err := c.MultipartForm()
if nil != err {
util.LogErrorf("parse import .sy.zip failed: %s", err)
logging.LogErrorf("parse import .sy.zip failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
return
@ -42,7 +43,7 @@ func importSY(c *gin.Context) {
files := form.File["file"]
if 1 > len(files) {
util.LogErrorf("parse import .sy.zip failed: %s", err)
logging.LogErrorf("parse import .sy.zip failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
return
@ -50,7 +51,7 @@ func importSY(c *gin.Context) {
file := files[0]
reader, err := file.Open()
if nil != err {
util.LogErrorf("read import .sy.zip failed: %s", err)
logging.LogErrorf("read import .sy.zip failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
return
@ -58,7 +59,7 @@ func importSY(c *gin.Context) {
importDir := filepath.Join(util.TempDir, "import")
if err = os.MkdirAll(importDir, 0755); nil != err {
util.LogErrorf("make import dir [%s] failed: %s", importDir, err)
logging.LogErrorf("make import dir [%s] failed: %s", importDir, err)
ret.Code = -1
ret.Msg = err.Error()
return
@ -67,13 +68,13 @@ func importSY(c *gin.Context) {
defer os.RemoveAll(writePath)
writer, err := os.OpenFile(writePath, os.O_RDWR|os.O_CREATE, 0644)
if nil != err {
util.LogErrorf("open import .sy.zip [%s] failed: %s", writePath, err)
logging.LogErrorf("open import .sy.zip [%s] failed: %s", writePath, err)
ret.Code = -1
ret.Msg = err.Error()
return
}
if _, err = io.Copy(writer, reader); nil != err {
util.LogErrorf("write import .sy.zip failed: %s", err)
logging.LogErrorf("write import .sy.zip failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
return
@ -98,14 +99,14 @@ func importData(c *gin.Context) {
form, err := c.MultipartForm()
if nil != err {
util.LogErrorf("import data failed: %s", err)
logging.LogErrorf("import data failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
return
}
if 1 > len(form.File["file"]) {
util.LogErrorf("import data failed: %s", err)
logging.LogErrorf("import data failed: %s", err)
ret.Code = -1
ret.Msg = "file not found"
return
@ -122,7 +123,7 @@ func importData(c *gin.Context) {
defer os.RemoveAll(dataZipPath)
dataZipFile, err := os.Create(dataZipPath)
if nil != err {
util.LogErrorf("create temp file failed: %s", err)
logging.LogErrorf("create temp file failed: %s", err)
ret.Code = -1
ret.Msg = "create temp file failed"
return
@ -130,20 +131,20 @@ func importData(c *gin.Context) {
file := form.File["file"][0]
fileReader, err := file.Open()
if nil != err {
util.LogErrorf("open upload file failed: %s", err)
logging.LogErrorf("open upload file failed: %s", err)
ret.Code = -1
ret.Msg = "open file failed"
return
}
_, err = io.Copy(dataZipFile, fileReader)
if nil != err {
util.LogErrorf("read upload file failed: %s", err)
logging.LogErrorf("read upload file failed: %s", err)
ret.Code = -1
ret.Msg = "read file failed"
return
}
if err = dataZipFile.Close(); nil != err {
util.LogErrorf("close file failed: %s", err)
logging.LogErrorf("close file failed: %s", err)
ret.Code = -1
ret.Msg = "close file failed"
return