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

Improve kernel API /api/notebook/* (#9987)

Browse source 
* 🐛 fix some notebook API

* Update notebook.go
This commit is contained in:
Yingyi / 颖逸 2023-12-26 23:27:10 +08:00 • committed by GitHub
parent adc42291c6
commit abd79c29a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

35
kernel/api/notebook.go
View file

@ -150,13 +150,20 @@ func createNotebook(c *gin.Context) {
return return
} }
box := model.Conf.Box(id)
if nil == box {
ret.Code = -1
ret.Msg = "opened notebook [" + id + "] not found"
return
}
ret.Data = map[string]interface{}{ ret.Data = map[string]interface{}{
"notebook": model.Conf.Box(id), "notebook": box,
} }
evt := util.NewCmdResult("createnotebook", 0, util.PushModeBroadcast) evt := util.NewCmdResult("createnotebook", 0, util.PushModeBroadcast)
evt.Data = map[string]interface{}{ evt.Data = map[string]interface{}{
"box": model.Conf.Box(id), "box": box,
"existed": existed, "existed": existed,
} }
util.PushEvent(evt) util.PushEvent(evt)
@ -194,9 +201,16 @@ func openNotebook(c *gin.Context) {
return return
} }
box := model.Conf.Box(notebook)
if nil == box {
ret.Code = -1
ret.Msg = "opened notebook [" + notebook + "] not found"
return
}
evt := util.NewCmdResult("mount", 0, util.PushModeBroadcast) evt := util.NewCmdResult("mount", 0, util.PushModeBroadcast)
evt.Data = map[string]interface{}{ evt.Data = map[string]interface{}{
"box": model.Conf.Box(notebook), "box": box,
"existed": existed, "existed": existed,
} }
evt.Callback = arg["callback"] evt.Callback = arg["callback"]
@ -233,7 +247,13 @@ func getNotebookConf(c *gin.Context) {
return return
} }
box := model.Conf.Box(notebook) box := model.Conf.GetBox(notebook)
if nil == box {
ret.Code = -1
ret.Msg = "notebook [" + notebook + "] not found"
return
}
ret.Data = map[string]interface{}{ ret.Data = map[string]interface{}{
"box": box.ID, "box": box.ID,
"name": box.Name, "name": box.Name,
@ -255,7 +275,12 @@ func setNotebookConf(c *gin.Context) {
return return
} }
box := model.Conf.Box(notebook) box := model.Conf.GetBox(notebook)
if nil == box {
ret.Code = -1
ret.Msg = "notebook [" + notebook + "] not found"
return
}
param, err := gulu.JSON.MarshalJSON(arg["conf"]) param, err := gulu.JSON.MarshalJSON(arg["conf"])
if nil != err { if nil != err {

9
kernel/model/conf.go
View file

@ -649,6 +649,15 @@ func (conf *AppConf) Box(boxID string) *Box {
return nil return nil
} }
func (conf *AppConf) GetBox(boxID string) *Box {
for _, box := range conf.GetBoxes() {
if box.ID == boxID {
return box
}
}
return nil
}
func (conf *AppConf) BoxNames(boxIDs []string) (ret map[string]string) { func (conf *AppConf) BoxNames(boxIDs []string) (ret map[string]string) {
ret = map[string]string{} ret = map[string]string{}