From 745582b4e9b76cbf65704eb30ac63b7eb727874e Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 23 Mar 2023 19:12:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?:art:=20=E5=91=BD=E5=90=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=B5=8C=E5=85=A5=E5=9D=97=E7=B1=BB=E5=9E=8B=E6=8C=81?= =?UTF-8?q?=E4=B9=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/storage.go | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/model/storage.go b/kernel/model/storage.go index 9371c9f8e..f9c16ad0c 100644 --- a/kernel/model/storage.go +++ b/kernel/model/storage.go @@ -182,6 +182,7 @@ type CriterionTypes struct { ListItem bool `json:"listItem"` CodeBlock bool `json:"codeBlock"` HtmlBlock bool `json:"htmlBlock"` + EmbedBlock bool `json:"embedBlock"` } var criteriaLock = sync.Mutex{} From 68192aaff62739a8a3f8d07a0edbc4679b08e207 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 23 Mar 2023 19:29:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?:art:=20=E6=94=AF=E6=8C=81=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=86=85=E5=88=A0=E9=99=A4=E6=A8=A1=E6=9D=BF=20https:?= =?UTF-8?q?//github.com/siyuan-note/siyuan/issues/7746?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/router.go | 1 + kernel/api/search.go | 18 ++++++++++++++++++ kernel/model/template.go | 11 ++++++++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/kernel/api/router.go b/kernel/api/router.go index fe82071cc..1c64a7601 100644 --- a/kernel/api/router.go +++ b/kernel/api/router.go @@ -135,6 +135,7 @@ func ServeAPI(ginServer *gin.Engine) { ginServer.Handle("POST", "/api/search/searchTag", model.CheckAuth, searchTag) ginServer.Handle("POST", "/api/search/searchTemplate", model.CheckAuth, searchTemplate) + ginServer.Handle("POST", "/api/search/removeTemplate", model.CheckAuth, removeTemplate) ginServer.Handle("POST", "/api/search/searchWidget", model.CheckAuth, searchWidget) ginServer.Handle("POST", "/api/search/searchRefBlock", model.CheckAuth, searchRefBlock) ginServer.Handle("POST", "/api/search/searchEmbedBlock", model.CheckAuth, searchEmbedBlock) diff --git a/kernel/api/search.go b/kernel/api/search.go index 6fdaeedc6..31a5877c7 100644 --- a/kernel/api/search.go +++ b/kernel/api/search.go @@ -108,6 +108,24 @@ func searchWidget(c *gin.Context) { } } +func removeTemplate(c *gin.Context) { + ret := gulu.Ret.NewResult() + defer c.JSON(http.StatusOK, ret) + + arg, ok := util.JsonArg(c, ret) + if !ok { + return + } + + path := arg["path"].(string) + err := model.RemoveTemplate(path) + if nil != err { + ret.Code = -1 + ret.Msg = err.Error() + return + } +} + func searchTemplate(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) diff --git a/kernel/model/template.go b/kernel/model/template.go index 73d546d55..fb3d348b1 100644 --- a/kernel/model/template.go +++ b/kernel/model/template.go @@ -34,6 +34,7 @@ import ( "github.com/88250/lute/render" sprig "github.com/Masterminds/sprig/v3" "github.com/araddon/dateparse" + "github.com/siyuan-note/filelock" "github.com/siyuan-note/logging" "github.com/siyuan-note/siyuan/kernel/search" "github.com/siyuan-note/siyuan/kernel/sql" @@ -57,6 +58,14 @@ func RenderGoTemplate(templateContent string) (ret string, err error) { return } +func RemoveTemplate(p string) (err error) { + err = filelock.Remove(p) + if nil != err { + logging.LogErrorf("remove template failed: %s", err) + } + return +} + func SearchTemplate(keyword string) (ret []*Block) { ret = []*Block{} @@ -145,7 +154,7 @@ func DocSaveAsTemplate(id string, overwrite bool) (code int, err error) { } } - err = os.WriteFile(savePath, md, 0644) + err = filelock.WriteFile(savePath, md) return } From 4bb39d90fee689896a8e96bd2ffa8725f996d6c1 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 23 Mar 2023 19:32:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E5=86=99?= =?UTF-8?q?=E5=85=A5=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/util/working.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/util/working.go b/kernel/util/working.go index e7c0656dc..691b7a806 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -35,6 +35,7 @@ import ( "github.com/88250/gulu" figure "github.com/common-nighthawk/go-figure" "github.com/gofrs/flock" + "github.com/siyuan-note/filelock" "github.com/siyuan-note/httpclient" "github.com/siyuan-note/logging" ) @@ -295,7 +296,7 @@ func WriteWorkspacePaths(workspacePaths []string) (err error) { return } - if err = os.WriteFile(workspaceConf, data, 0644); nil != err { + if err = filelock.WriteFile(workspaceConf, data); nil != err { msg := fmt.Sprintf("write workspace conf [%s] failed: %s", workspaceConf, err) logging.LogErrorf(msg) err = errors.New(msg) From 34483709ab79fce11a416b77196667254a825fa9 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 23 Mar 2023 19:42:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?:art:=20=E7=BD=91=E7=BB=9C=E8=BF=9E?= =?UTF-8?q?=E9=80=9A=E7=8A=B6=E6=80=81=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/util/net.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/util/net.go b/kernel/util/net.go index 6a6ca030a..377e01442 100644 --- a/kernel/util/net.go +++ b/kernel/util/net.go @@ -42,7 +42,7 @@ func IsOnline() (ret bool) { ret = nil == err && nil != resp && nil != resp.Response if !ret { - logging.LogWarnf("network is offline") + logging.LogWarnf("network is offline: %v", err) } return } From 8e1228f8b6796934ddefc62eb73f003e7094c4ec Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 23 Mar 2023 19:55:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?:art:=20=E8=AF=86=E5=88=AB=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=B9=B3=E5=8F=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/util/os_mobile.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/util/os_mobile.go b/kernel/util/os_mobile.go index 41a1d5b3f..439b8f69a 100644 --- a/kernel/util/os_mobile.go +++ b/kernel/util/os_mobile.go @@ -20,10 +20,10 @@ package util func GetOSPlatform() (plat, ver string) { if ContainerIOS == Container { - return "iOS", MobileOSVer + return "iOS " + MobileOSVer } if ContainerAndroid == Container { - return "Android", MobileOSVer + return "Android " + MobileOSVer } - return "Unknown", MobileOSVer + return "Unknown " + MobileOSVer }