Skip to content

Commit

Permalink
refactor after #40
Browse files Browse the repository at this point in the history
  • Loading branch information
dvaumoron committed Feb 2, 2024
1 parent 68102ea commit aeaa49d
Showing 1 changed file with 15 additions and 20 deletions.
35 changes: 15 additions & 20 deletions versionmanager/semantic/parser/flat/flatparser.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,11 @@ import (
"github.com/tofuutils/tenv/config"
)

const msgFlatErr = "Failed to read file :"

func RetrieveVersion(versionFileNames []string, conf *config.Config) string {
for _, fileName := range versionFileNames {
data, err := os.ReadFile(fileName)
if err == nil {
resolvedVersion := string(bytes.TrimSpace(data))
if conf.Verbose && resolvedVersion != "" {
fmt.Println("Resolved version from", fileName, ":", resolvedVersion) //nolint
}

if resolvedVersion := retrieveVersionFromFile(fileName, conf.Verbose); resolvedVersion != "" {
return resolvedVersion
}
if conf.Verbose {
fmt.Println(msgFlatErr, err) //nolint
}
}

checkedPath := map[string]struct{}{}
Expand Down Expand Up @@ -78,19 +67,25 @@ func RetrieveVersion(versionFileNames []string, conf *config.Config) string {

func retrieveVersionFromDir(versionFileNames []string, dirPath string, verbose bool) string {
for _, fileName := range versionFileNames {
filePath := filepath.Join(dirPath, fileName)
data, err := os.ReadFile(filePath)
if err == nil {
resolvedVersion := string(bytes.TrimSpace(data))
if verbose && resolvedVersion != "" {
if resolvedVersion := retrieveVersionFromFile(filepath.Join(dirPath, fileName), verbose); resolvedVersion != "" {
return resolvedVersion
}
}

return ""
}

func retrieveVersionFromFile(filePath string, verbose bool) string {
if data, err := os.ReadFile(filePath); err == nil {
if resolvedVersion := string(bytes.TrimSpace(data)); resolvedVersion != "" {
if verbose {
fmt.Println("Resolved version from", filePath, ":", resolvedVersion) //nolint
}

return resolvedVersion
}
if verbose {
fmt.Println(msgFlatErr, err) //nolint
}
} else if verbose {
fmt.Println("Failed to read file :", err) //nolint
}

return ""
Expand Down

0 comments on commit aeaa49d

Please sign in to comment.