wy
/
cordless
mirror of https://github.com/Bios-Marcel/cordless.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move ensureDirectory into files-util

This commit is contained in:
Marcel Schramm 2020-08-30 14:48:52 +02:00
parent 975087ae7e
commit 23954890d6
No known key found for this signature in database
GPG Key ID: 05971054C70EEDC7
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config/config.go
View File

@ -219,7 +219,7 @@ func createDefaultConfig() *Config {
func SetConfigFile(configFilePath string) error {
// get parent directory of config file
parent := filepath.Dir(configFilePath)
err := ensureDirectory(parent)
err := files.EnsureDirectoryExists(parent)
if err == nil {
cachedConfigFile = configFilePath
} else {
@ -227,7 +227,7 @@ func SetConfigFile(configFilePath string) error {
if err != nil {
return err
}
err = ensureDirectory(absolute)
err = files.EnsureDirectoryExists(absolute)
if err == nil {
cachedConfigFile = configFilePath
}
@ -254,7 +254,7 @@ func GetConfigFile() (string, error) {
// SetScriptDirectory sets the script directory cache
// to the specified value
func SetScriptDirectory(directoryPath string) error {
err := ensureDirectory(directoryPath)
err := files.EnsureDirectoryExists(directoryPath)
if err == nil {
cachedScriptDir = directoryPath
} else {
@ -262,7 +262,7 @@ func SetScriptDirectory(directoryPath string) error {
if err != nil {
return err
}
err = ensureDirectory(absolute)
err = files.EnsureDirectoryExists(absolute)
if err == nil {
cachedConfigFile = absolute
}
@ -282,7 +282,7 @@ func GetScriptDirectory() string {
// SetConfigDirectory sets the directory cache
func SetConfigDirectory(directoryPath string) error {
err := ensureDirectory(directoryPath)
err := files.EnsureDirectoryExists(directoryPath)
if err == nil {
cachedConfigDir = directoryPath
} else {
@ -290,7 +290,7 @@ func SetConfigDirectory(directoryPath string) error {
if err != nil {
return err
}
err = ensureDirectory(absolute)
err = files.EnsureDirectoryExists(absolute)
if err == nil {
cachedConfigFile = absolute
}
@ -311,7 +311,7 @@ func GetConfigDirectory() (string, error) {
return "", err
}
statError := ensureDirectory(directory)
statError := files.EnsureDirectoryExists(directory)
if statError != nil {
return "", statError
}
@ -322,14 +322,6 @@ func GetConfigDirectory() (string, error) {
return cachedConfigDir, nil
}
func ensureDirectory(directoryPath string) error {
_, statError := os.Stat(directoryPath)
if os.IsNotExist(statError) {
return os.MkdirAll(directoryPath, 0766)
}
return statError
}
func getAbsolutePath(directoryPath string) (string, error) {
absolutePath, resolveError := files.ToAbsolutePath(directoryPath)
if resolveError != nil {

11
util/files/files.go
View File

@ -76,3 +76,14 @@ func DownloadFileOrAccessCache(filepath, url string) error {
return DownloadFile(filepath, url)
}
// EnsureDirectoryExists creates a directy if doesn't already exist.
// If an error occurs during the existence check, that error is returned
// directly.
func EnsureDirectoryExists(directoryPath string) error {
_, statError := os.Stat(directoryPath)
if os.IsNotExist(statError) {
return os.MkdirAll(directoryPath, 0766)
}
return statError
}