Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-19 21:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

♻️ 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

6
kernel/bazaar/icon.go
View file

@ -43,7 +43,7 @@ func Icons() (icons []*Icon) {
}
stageIndex, err := getStageIndex("icons")
if nil != err {
if err != nil {
return
}
bazaarIndex := getBazaarIndex()
@ -127,7 +127,7 @@ func InstalledIcons() (ret []*Icon) {
}
iconDirs, err := os.ReadDir(util.IconsPath)
if nil != err {
if err != nil {
logging.LogWarnf("read icons folder failed: %s", err)
return
}
@ -193,7 +193,7 @@ func isBuiltInIcon(dirName string) bool {
func InstallIcon(repoURL, repoHash, installPath string, systemID string) error {
repoURLHash := repoURL + "@" + repoHash
data, err := downloadPackage(repoURLHash, true, systemID)
if nil != err {
if err != nil {
return err
}
return installPackage(data, installPath, repoURLHash)

42
kernel/bazaar/package.go
View file

@ -249,11 +249,11 @@ func PluginJSON(pluginDirName string) (ret *Plugin, err error) {
return
}
data, err := filelock.ReadFile(p)
if nil != err {
if err != nil {
logging.LogErrorf("read plugin.json [%s] failed: %s", p, err)
return
}
if err = gulu.JSON.UnmarshalJSON(data, &ret); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, &ret); err != nil {
logging.LogErrorf("parse plugin.json [%s] failed: %s", p, err)
return
}
@ -269,11 +269,11 @@ func WidgetJSON(widgetDirName string) (ret *Widget, err error) {
return
}
data, err := filelock.ReadFile(p)
if nil != err {
if err != nil {
logging.LogErrorf("read widget.json [%s] failed: %s", p, err)
return
}
if err = gulu.JSON.UnmarshalJSON(data, &ret); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, &ret); err != nil {
logging.LogErrorf("parse widget.json [%s] failed: %s", p, err)
return
}
@ -289,11 +289,11 @@ func IconJSON(iconDirName string) (ret *Icon, err error) {
return
}
data, err := os.ReadFile(p)
if nil != err {
if err != nil {
logging.LogErrorf("read icon.json [%s] failed: %s", p, err)
return
}
if err = gulu.JSON.UnmarshalJSON(data, &ret); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, &ret); err != nil {
logging.LogErrorf("parse icon.json [%s] failed: %s", p, err)
return
}
@ -309,11 +309,11 @@ func TemplateJSON(templateDirName string) (ret *Template, err error) {
return
}
data, err := filelock.ReadFile(p)
if nil != err {
if err != nil {
logging.LogErrorf("read template.json [%s] failed: %s", p, err)
return
}
if err = gulu.JSON.UnmarshalJSON(data, &ret); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, &ret); err != nil {
logging.LogErrorf("parse template.json [%s] failed: %s", p, err)
return
}
@ -329,13 +329,13 @@ func ThemeJSON(themeDirName string) (ret *Theme, err error) {
return
}
data, err := os.ReadFile(p)
if nil != err {
if err != nil {
logging.LogErrorf("read theme.json [%s] failed: %s", p, err)
return
}
ret = &Theme{}
if err = gulu.JSON.UnmarshalJSON(data, &ret); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, &ret); err != nil {
logging.LogErrorf("parse theme.json [%s] failed: %s", p, err)
return
}
@ -350,7 +350,7 @@ var stageIndexLock = sync.Mutex{}
func getStageIndex(pkgType string) (ret *StageIndex, err error) {
rhyRet, err := util.GetRhyResult(false)
if nil != err {
if err != nil {
return
}
@ -514,14 +514,14 @@ func GetPackageREADME(repoURL, repoHash, packageType string) (ret string) {
readme := getPreferredReadme(repo.Package.Readme)
data, err := downloadPackage(repoURLHash+"/"+readme, false, "")
if nil != err {
if err != nil {
ret = fmt.Sprintf("Load bazaar package's README.md(%s) failed: %s", readme, err.Error())
if readme == repo.Package.Readme.Default || "" == strings.TrimSpace(repo.Package.Readme.Default) {
return
}
readme = repo.Package.Readme.Default
data, err = downloadPackage(repoURLHash+"/"+readme, false, "")
if nil != err {
if err != nil {
ret += fmt.Sprintf("<br>Load bazaar package's README.md(%s) failed: %s", readme, err.Error())
return
}
@ -579,7 +579,7 @@ func downloadPackage(repoURLHash string, pushProgress bool, systemID string) (da
util.PushDownloadProgress(repoURL, progress)
}
}).Get(u)
if nil != err {
if err != nil {
logging.LogErrorf("get bazaar package [%s] failed: %s", u, err)
return nil, errors.New("get bazaar package failed, please check your network")
}
@ -608,7 +608,7 @@ func incPackageDownloads(repoURLHash, systemID string) {
}
func uninstallPackage(installPath string) (err error) {
if err = os.RemoveAll(installPath); nil != err {
if err = os.RemoveAll(installPath); err != nil {
logging.LogErrorf("remove [%s] failed: %s", installPath, err)
return fmt.Errorf("remove community package [%s] failed", filepath.Base(installPath))
}
@ -618,7 +618,7 @@ func uninstallPackage(installPath string) (err error) {
func installPackage(data []byte, installPath, repoURLHash string) (err error) {
err = installPackage0(data, installPath)
if nil != err {
if err != nil {
return
}
@ -628,23 +628,23 @@ func installPackage(data []byte, installPath, repoURLHash string) (err error) {
func installPackage0(data []byte, installPath string) (err error) {
tmpPackage := filepath.Join(util.TempDir, "bazaar", "package")
if err = os.MkdirAll(tmpPackage, 0755); nil != err {
if err = os.MkdirAll(tmpPackage, 0755); err != nil {
return
}
name := gulu.Rand.String(7)
tmp := filepath.Join(tmpPackage, name+".zip")
if err = os.WriteFile(tmp, data, 0644); nil != err {
if err = os.WriteFile(tmp, data, 0644); err != nil {
return
}
unzipPath := filepath.Join(tmpPackage, name)
if err = gulu.Zip.Unzip(tmp, unzipPath); nil != err {
if err = gulu.Zip.Unzip(tmp, unzipPath); err != nil {
logging.LogErrorf("write file [%s] failed: %s", installPath, err)
return
}
dirs, err := os.ReadDir(unzipPath)
if nil != err {
if err != nil {
return
}
@ -653,7 +653,7 @@ func installPackage0(data []byte, installPath string) (err error) {
srcPath = filepath.Join(unzipPath, dirs[0].Name())
}
if err = filelock.Copy(srcPath, installPath); nil != err {
if err = filelock.Copy(srcPath, installPath); err != nil {
return
}
return

8
kernel/bazaar/plugin.go
View file

@ -45,7 +45,7 @@ func Plugins(frontend string) (plugins []*Plugin) {
}
stageIndex, err := getStageIndex("plugins")
if nil != err {
if err != nil {
return
}
bazaarIndex := getBazaarIndex()
@ -131,7 +131,7 @@ func ParseInstalledPlugin(name, frontend string) (found bool, displayName string
}
pluginDirs, err := os.ReadDir(pluginsPath)
if nil != err {
if err != nil {
logging.LogWarnf("read plugins folder failed: %s", err)
return
}
@ -166,7 +166,7 @@ func InstalledPlugins(frontend string, checkUpdate bool) (ret []*Plugin) {
}
pluginDirs, err := os.ReadDir(pluginsPath)
if nil != err {
if err != nil {
logging.LogWarnf("read plugins folder failed: %s", err)
return
}
@ -228,7 +228,7 @@ func InstalledPlugins(frontend string, checkUpdate bool) (ret []*Plugin) {
func InstallPlugin(repoURL, repoHash, installPath string, systemID string) error {
repoURLHash := repoURL + "@" + repoHash
data, err := downloadPackage(repoURLHash, true, systemID)
if nil != err {
if err != nil {
return err
}
return installPackage(data, installPath, repoURLHash)

8
kernel/bazaar/template.go
View file

@ -44,7 +44,7 @@ func Templates() (templates []*Template) {
}
stageIndex, err := getStageIndex("templates")
if nil != err {
if err != nil {
return
}
bazaarIndex := getBazaarIndex()
@ -131,7 +131,7 @@ func InstalledTemplates() (ret []*Template) {
}
templateDirs, err := os.ReadDir(templatesPath)
if nil != err {
if err != nil {
logging.LogWarnf("read templates folder failed: %s", err)
return
}
@ -190,7 +190,7 @@ func InstalledTemplates() (ret []*Template) {
func InstallTemplate(repoURL, repoHash, installPath string, systemID string) error {
repoURLHash := repoURL + "@" + repoHash
data, err := downloadPackage(repoURLHash, true, systemID)
if nil != err {
if err != nil {
return err
}
return installPackage(data, installPath, repoURLHash)
@ -206,7 +206,7 @@ func filterLegacyTemplates(templates []*Template) (ret []*Template) {
if "" != theme.Updated {
updated := theme.Updated[:len("2006-01-02T15:04:05")]
t, err := time.Parse("2006-01-02T15:04:05", updated)
if nil != err {
if err != nil {
logging.LogErrorf("convert update time [%s] failed: %s", updated, err)
continue
}

6
kernel/bazaar/theme.go
View file

@ -45,7 +45,7 @@ func Themes() (ret []*Theme) {
}
stageIndex, err := getStageIndex("themes")
if nil != err {
if err != nil {
return
}
bazaarIndex := getBazaarIndex()
@ -129,7 +129,7 @@ func InstalledThemes() (ret []*Theme) {
}
themeDirs, err := os.ReadDir(util.ThemesPath)
if nil != err {
if err != nil {
logging.LogWarnf("read appearance themes folder failed: %s", err)
return
}
@ -195,7 +195,7 @@ func isBuiltInTheme(dirName string) bool {
func InstallTheme(repoURL, repoHash, installPath string, systemID string) error {
repoURLHash := repoURL + "@" + repoHash
data, err := downloadPackage(repoURLHash, true, systemID)
if nil != err {
if err != nil {
return err
}
return installPackage(data, installPath, repoURLHash)

6
kernel/bazaar/widget.go
View file

@ -43,7 +43,7 @@ func Widgets() (widgets []*Widget) {
}
stageIndex, err := getStageIndex("widgets")
if nil != err {
if err != nil {
return
}
bazaarIndex := getBazaarIndex()
@ -129,7 +129,7 @@ func InstalledWidgets() (ret []*Widget) {
}
widgetDirs, err := os.ReadDir(widgetsPath)
if nil != err {
if err != nil {
logging.LogWarnf("read widgets folder failed: %s", err)
return
}
@ -188,7 +188,7 @@ func InstalledWidgets() (ret []*Widget) {
func InstallWidget(repoURL, repoHash, installPath string, systemID string) error {
repoURLHash := repoURL + "@" + repoHash
data, err := downloadPackage(repoURLHash, true, systemID)
if nil != err {
if err != nil {
return err
}
return installPackage(data, installPath, repoURLHash)