Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

用 os.ReadDir 替换 Readdir(-1) (#6447)

Browse source 
下面这段代码
	dir, err := os.Open(dirname)
	if err != nil {
		return err
	}
	defer dir.Close()

	dirs, err := dir.Readdir(-1)

可以简化成 `os.ReadDir(dirname)`.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun 2022-11-01 21:13:38 +08:00 • committed by GitHub
parent 6e04545ad1
commit b1b4e35a12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/bazaar/icon.go
View file

@ -96,17 +96,11 @@ func Icons() (icons []*Icon) {
func InstalledIcons() (ret []*Icon) {
ret = []*Icon{}
dir, err := os.Open(util.IconsPath)
if nil != err {
logging.LogWarnf("open icons folder failed: %s", err)
return
}
iconDirs, err := dir.Readdir(-1)
iconDirs, err := os.ReadDir(util.IconsPath)
if nil != err {
logging.LogWarnf("read icons folder failed: %s", err)
return
}
dir.Close()
bazaarIcons := Icons()

8
kernel/bazaar/template.go
View file

@ -99,17 +99,11 @@ func Templates() (templates []*Template) {
func InstalledTemplates() (ret []*Template) {
ret = []*Template{}
dir, err := os.Open(filepath.Join(util.DataDir, "templates"))
if nil != err {
logging.LogWarnf("open templates folder [%s] failed: %s", util.ThemesPath, err)
return
}
templateDirs, err := dir.Readdir(-1)
templateDirs, err := os.ReadDir(filepath.Join(util.DataDir, "templates"))
if nil != err {
logging.LogWarnf("read templates folder failed: %s", err)
return
}
dir.Close()
bazaarTemplates := Templates()

8
kernel/bazaar/theme.go
View file

@ -98,17 +98,11 @@ func Themes() (ret []*Theme) {
func InstalledThemes() (ret []*Theme) {
ret = []*Theme{}
dir, err := os.Open(util.ThemesPath)
if nil != err {
logging.LogWarnf("open appearance themes folder [%s] failed: %s", util.ThemesPath, err)
return
}
themeDirs, err := dir.Readdir(-1)
themeDirs, err := os.ReadDir(util.ThemesPath)
if nil != err {
logging.LogWarnf("read appearance themes folder failed: %s", err)
return
}
dir.Close()
bazaarThemes := Themes()

8
kernel/bazaar/widget.go
View file

@ -97,17 +97,11 @@ func Widgets() (widgets []*Widget) {
func InstalledWidgets() (ret []*Widget) {
ret = []*Widget{}
dir, err := os.Open(filepath.Join(util.DataDir, "widgets"))
if nil != err {
logging.LogWarnf("open widgets folder [%s] failed: %s", util.ThemesPath, err)
return
}
widgetDirs, err := dir.Readdir(-1)
widgetDirs, err := os.ReadDir(filepath.Join(util.DataDir, "widgets"))
if nil != err {
logging.LogWarnf("read widgets folder failed: %s", err)
return
}
dir.Close()
bazaarWidgets := Widgets()

22
kernel/model/appearance.go
View file

@ -78,17 +78,11 @@ func unloadThemes() {
return
}
dir, err := os.Open(util.ThemesPath)
if nil != err {
logging.LogErrorf("open appearance themes folder [%s] failed: %s", util.ThemesPath, err)
return
}
themeDirs, err := dir.Readdir(-1)
themeDirs, err := os.ReadDir(util.ThemesPath)
if nil != err {
logging.LogErrorf("read appearance themes folder failed: %s", err)
return
}
dir.Close()
for _, themeDir := range themeDirs {
if !themeDir.IsDir() {
@ -99,15 +93,10 @@ func unloadThemes() {
}
func loadThemes() {
dir, err := os.Open(util.ThemesPath)
if nil != err {
logging.LogFatalf("open appearance themes folder [%s] failed: %s", util.ThemesPath, err)
}
themeDirs, err := dir.Readdir(-1)
themeDirs, err := os.ReadDir(util.ThemesPath)
if nil != err {
logging.LogFatalf("read appearance themes folder failed: %s", err)
}
dir.Close()
Conf.Appearance.DarkThemes = nil
Conf.Appearance.LightThemes = nil
@ -213,15 +202,10 @@ func widgetJSON(widgetName string) (ret map[string]interface{}, err error) {
}
func loadIcons() {
dir, err := os.Open(util.IconsPath)
if nil != err {
logging.LogFatalf("open appearance icons folder [%s] failed: %s", util.IconsPath, err)
}
iconDirs, err := dir.Readdir(-1)
iconDirs, err := os.ReadDir(util.IconsPath)
if nil != err {
logging.LogFatalf("read appearance icons folder failed: %s", err)
}
dir.Close()
Conf.Appearance.Icons = nil
for _, iconDir := range iconDirs {