Skip to content

Fix check if config file exists. Directory was detected as file #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix check if config file exists. Directory was detected as file #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,12 @@ func (c Config) MkdirAll() error {
}

func (c Config) Exists(fileName string) bool {
_, err := os.Stat(filepath.Join(c.Path, fileName))
return !os.IsNotExist(err)
return fileExists(filepath.Join(c.Path, fileName))
}

func fileExists(fullPath string) bool {
info, err := os.Stat(fullPath)
return err == nil && info.Mode().IsRegular()
}

// ConfigDir keeps setting for querying folders.
Expand Down Expand Up @@ -135,7 +139,7 @@ func (c ConfigDir) QueryFolders(configType ConfigType) []*Config {
}
var existing []*Config
for _, entry := range result {
if _, err := os.Stat(entry.Path); !os.IsNotExist(err) {
if fileExists(entry.Path) {
existing = append(existing, entry)
}
}
Expand All @@ -145,7 +149,7 @@ func (c ConfigDir) QueryFolders(configType ConfigType) []*Config {
func (c ConfigDir) QueryFolderContainsFile(fileName string) *Config {
configs := c.QueryFolders(Existing)
for _, config := range configs {
if _, err := os.Stat(filepath.Join(config.Path, fileName)); !os.IsNotExist(err) {
if fileExists(filepath.Join(config.Path, fileName)) {
return config
}
}
Expand Down