Merge remote-tracking branch 'origin/dev' into dev

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
 }
 

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
 		}
 	}

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) {