Skip to content
This repository was archived by the owner on Dec 26, 2024. It is now read-only.

Commit f867a2a

Browse files
feat(config): look in multiple places (#90)
* feat(config): look in multiple places. * sort sort sort sort
1 parent cdca795 commit f867a2a

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

cmd/omegabrr/main.go

+20-6
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,30 @@ func main() {
7575
if configPath == "" {
7676
configPath = os.Getenv("OMEGABRR_CONFIG")
7777

78-
if configPath == "" {
78+
if _, err := os.Stat(configPath); err != nil {
7979
userConfigDir, err := os.UserConfigDir()
8080
if err != nil {
81-
log.Fatal().Err(err).Msg("failed to get user config directory")
81+
log.Error().Err(err).Msg("failed to get user config directory")
8282
}
83-
defaultConfigPath := filepath.Join(userConfigDir, "omegabrr", "config.yaml")
8483

85-
if _, err := os.Stat(defaultConfigPath); err == nil {
86-
configPath = defaultConfigPath
84+
base := []string{filepath.Join(userConfigDir, "omegabrr"), "/config"}
85+
configs := []string{"config.yaml", "config.yml"}
86+
87+
configPath = ""
88+
for _, b := range base {
89+
for _, c := range configs {
90+
p := filepath.Join(b, c)
91+
if _, err := os.Stat(p); err != nil {
92+
continue
93+
}
94+
95+
configPath = p
96+
break
97+
}
98+
99+
if configPath != "" {
100+
break
101+
}
87102
}
88103
}
89104
}
@@ -146,7 +161,6 @@ func main() {
146161
} else {
147162
log.Info().Msgf("Successfully updated to version: %s", latest.Version)
148163
}
149-
break
150164

151165
case "generate-token":
152166
key, err := apitoken.GenerateToken(*length)

internal/processor/sonarr.go

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package processor
22

33
import (
44
"context"
5+
"sort"
56
"strings"
67
"time"
78

@@ -137,6 +138,7 @@ func (s Service) processSonarr(ctx context.Context, cfg *domain.ArrConfig, logge
137138
}
138139
}
139140

141+
sort.Strings(titles)
140142
logger.Debug().Msgf("from a total of %d shows we found %d monitored and created %d release titles", len(shows), monitoredTitles, len(titles))
141143

142144
return titles, nil

0 commit comments

Comments
 (0)