From c4aeb9f7b693df618a461b1484f4c8b2c572a8e3 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 23 Dec 2022 17:06:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E5=91=BD=E5=90=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=8D=9F=E5=9D=8F=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E8=BF=94=E5=9B=9E=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/storage.go | 7 +------ kernel/model/storage.go | 5 +++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/kernel/api/storage.go b/kernel/api/storage.go index e20530216..e8ea3e6ca 100644 --- a/kernel/api/storage.go +++ b/kernel/api/storage.go @@ -122,12 +122,7 @@ func getCriteria(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) - data, err := model.GetCriteria() - if nil != err { - ret.Code = -1 - ret.Msg = err.Error() - return - } + data := model.GetCriteria() ret.Data = data } diff --git a/kernel/model/storage.go b/kernel/model/storage.go index 813bb72dc..059a48bf4 100644 --- a/kernel/model/storage.go +++ b/kernel/model/storage.go @@ -233,10 +233,11 @@ func SetCriterion(criterion *Criterion) (err error) { return } -func GetCriteria() (ret []*Criterion, err error) { +func GetCriteria() (ret []*Criterion) { criteriaLock.Lock() defer criteriaLock.Unlock() - return getCriteria() + ret, _ = getCriteria() + return } func setCriteria(criteria []*Criterion) (err error) { From 83badefe7b94b3a7b45b2574c6c10024ab753c5a Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 23 Dec 2022 17:18:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E6=94=AF=E6=8C=81=E9=97=B4?= =?UTF-8?q?=E9=9A=94=E5=A4=8D=E4=B9=A0=20https://github.com/siyuan-note/si?= =?UTF-8?q?yuan/issues/6710?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/repository.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 3188d62fa..1bbfb052f 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -812,7 +812,7 @@ func bootSyncRepo() (err error) { syncingFiles.Store(id, true) continue } - if strings.HasPrefix(name, "/storage/") { + if strings.HasPrefix(fetchedFile.Path, "/storage/") { syncingStorages = true } }