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

♻️ Refactor Go to err != nil, err == nil (#12385)

Browse source
This commit is contained in:
Oleksandr Redko 2024-09-04 04:40:50 +03:00 • committed by GitHub
parent 473a159ef2
commit b100721fee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
147 changed files with 1661 additions and 1659 deletions
Download patch file Download diff file Expand all files Collapse all files

22
kernel/model/plugin.go
View file

@ -113,7 +113,7 @@ func loadCode(petal *Petal) {
}
data, err := filelock.ReadFile(jsPath)
if nil != err {
if err != nil {
logging.LogErrorf("read plugin [%s] js failed: %s", petal.Name, err)
return
}
@ -122,7 +122,7 @@ func loadCode(petal *Petal) {
cssPath := filepath.Join(pluginDir, "index.css")
if filelock.IsExist(cssPath) {
data, err = filelock.ReadFile(cssPath)
if nil != err {
if err != nil {
logging.LogErrorf("read plugin [%s] css failed: %s", petal.Name, err)
} else {
petal.CSS = string(data)
@ -167,11 +167,11 @@ func loadCode(petal *Petal) {
}
data, err = filelock.ReadFile(filepath.Join(i18nDir, preferredLang))
if nil != err {
if err != nil {
logging.LogErrorf("read plugin [%s] i18n failed: %s", petal.Name, err)
} else {
petal.I18n = map[string]interface{}{}
if err = gulu.JSON.UnmarshalJSON(data, &petal.I18n); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, &petal.I18n); err != nil {
logging.LogErrorf("unmarshal plugin [%s] i18n failed: %s", petal.Name, err)
}
}
@ -188,11 +188,11 @@ func savePetals(petals []*Petal) {
petalDir := filepath.Join(util.DataDir, "storage", "petal")
confPath := filepath.Join(petalDir, "petals.json")
data, err := gulu.JSON.MarshalIndentJSON(petals, "", "\t")
if nil != err {
if err != nil {
logging.LogErrorf("marshal petals failed: %s", err)
return
}
if err = filelock.WriteFile(confPath, data); nil != err {
if err = filelock.WriteFile(confPath, data); err != nil {
logging.LogErrorf("write petals [%s] failed: %s", confPath, err)
return
}
@ -204,7 +204,7 @@ func getPetals() (ret []*Petal) {
ret = []*Petal{}
petalDir := filepath.Join(util.DataDir, "storage", "petal")
if err := os.MkdirAll(petalDir, 0755); nil != err {
if err := os.MkdirAll(petalDir, 0755); err != nil {
logging.LogErrorf("create petal dir [%s] failed: %s", petalDir, err)
return
}
@ -212,11 +212,11 @@ func getPetals() (ret []*Petal) {
confPath := filepath.Join(petalDir, "petals.json")
if !filelock.IsExist(confPath) {
data, err := gulu.JSON.MarshalIndentJSON(ret, "", "\t")
if nil != err {
if err != nil {
logging.LogErrorf("marshal petals failed: %s", err)
return
}
if err = filelock.WriteFile(confPath, data); nil != err {
if err = filelock.WriteFile(confPath, data); err != nil {
logging.LogErrorf("write petals [%s] failed: %s", confPath, err)
return
}
@ -224,12 +224,12 @@ func getPetals() (ret []*Petal) {
}
data, err := filelock.ReadFile(confPath)
if nil != err {
if err != nil {
logging.LogErrorf("read petal file [%s] failed: %s", confPath, err)
return
}
if err = gulu.JSON.UnmarshalJSON(data, &ret); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, &ret); err != nil {
logging.LogErrorf("unmarshal petals failed: %s", err)
return
}