git.iko.soy/crush
on main help sign in
Merge pull request #76 from charmbracelet/feature/finder-config
21e25d5Kujtim Hoxha
cspell.json+39−1
compare with main
unifiedsplit
@@ -1 +1,39 @@
1−{"flagWords":[],"words":["crush","charmbracelet","lipgloss","bubbletea","textinput","Focusable","lsps","Sourcegraph","filepicker","imageorient","rasterx","oksvg","termenv","trashhalo","lucasb","nfnt","srwiley","Lanczos","fsext","GROQ","alecthomas","Preproc","Emph","charmtone","Charple","Guac","diffview","Strikethrough","Unticked","uniseg","rivo"],"version":"0.2","language":"en"}
1+{
2+ "flagWords": [],
3+ "words": [
4+ "afero",
5+ "alecthomas",
6+ "bubbletea",
7+ "charmbracelet",
8+ "charmtone",
9+ "Charple",
10+ "crush",
11+ "diffview",
12+ "Emph",
13+ "filepicker",
14+ "Focusable",
15+ "fsext",
16+ "GROQ",
17+ "Guac",
18+ "imageorient",
19+ "Lanczos",
20+ "lipgloss",
21+ "lsps",
22+ "lucasb",
23+ "nfnt",
24+ "oksvg",
25+ "Preproc",
26+ "rasterx",
27+ "rivo",
28+ "Sourcegraph",
29+ "srwiley",
30+ "Strikethrough",
31+ "termenv",
32+ "textinput",
33+ "trashhalo",
34+ "uniseg",
35+ "Unticked"
36+ ],
37+ "version": "0.2",
38+ "language": "en"
39+}
internal/config/config.go+53−11
@@ -11,6 +11,7 @@ import (
11
11
12 "github.com/charmbracelet/crush/internal/llm/models"
12 "github.com/charmbracelet/crush/internal/llm/models"
13 "github.com/charmbracelet/crush/internal/logging"
13 "github.com/charmbracelet/crush/internal/logging"
14+ "github.com/spf13/afero"
14 "github.com/spf13/viper"
15 "github.com/spf13/viper"
15)
16)
16
17
@@ -201,21 +202,62 @@ func Load(workingDir string, debug bool) (*Config, error) {
201 return cfg, nil
202 return cfg, nil
202}
203}
203
204
205+type configFinder struct {
206+ appName string
207+ dotPrefix bool
208+ paths []string
209+}
210+
211+func (f configFinder) Find(fsys afero.Fs) ([]string, error) {
212+ var configFiles []string
213+ configName := fmt.Sprintf("%s.json", f.appName)
214+ if f.dotPrefix {
215+ configName = fmt.Sprintf(".%s.json", f.appName)
216+ }
217+ paths := []string{}
218+ for _, p := range f.paths {
219+ if p == "" {
220+ continue
221+ }
222+ paths = append(paths, os.ExpandEnv(p))
223+ }
224+
225+ for _, path := range paths {
226+ if path == "" {
227+ continue
228+ }
229+
230+ configPath := filepath.Join(path, configName)
231+ if exists, err := afero.Exists(fsys, configPath); err == nil && exists {
232+ configFiles = append(configFiles, configPath)
233+ }
234+ }
235+ return configFiles, nil
236+}
237+
204// configureViper sets up viper's configuration paths and environment variables.
238// configureViper sets up viper's configuration paths and environment variables.
205func configureViper() {
239func configureViper() {
206− viper.SetConfigName(fmt.Sprintf(".%s", appName))
207 viper.SetConfigType("json")
240 viper.SetConfigType("json")
208
241
209− // Unix-style paths
242+ // Create the three finders
210− viper.AddConfigPath("$HOME")
243+ windowsFinder := configFinder{appName: appName, dotPrefix: false, paths: []string{
244+ "$USERPROFILE",
245+ fmt.Sprintf("$APPDATA/%s", appName),
246+ fmt.Sprintf("$LOCALAPPDATA/%s", appName),
247+ }}
248+
249+ unixFinder := configFinder{appName: appName, dotPrefix: false, paths: []string{
250+ "$HOME",
211− viper.AddConfigPath(fmt.Sprintf("$XDG_CONFIG_HOME/%s", appName))
251+ fmt.Sprintf("$XDG_CONFIG_HOME/%s", appName),
212− viper.AddConfigPath(fmt.Sprintf("$HOME/.config/%s", appName))
252+ fmt.Sprintf("$HOME/.config/%s", appName),
213−
253+ }}
214− // Windows-style paths
254+
215− viper.AddConfigPath(fmt.Sprintf("$USERPROFILE"))
255+ localFinder := configFinder{appName: appName, dotPrefix: true, paths: []string{
216− viper.AddConfigPath(fmt.Sprintf("$APPDATA/%s", appName))
256+ ".",
217− viper.AddConfigPath(fmt.Sprintf("$LOCALAPPDATA/%s", appName))
257+ }}
218−
258+
259+ // Use all finders with viper
260+ viper.SetOptions(viper.WithFinder(viper.Finders(windowsFinder, unixFinder, localFinder)))
219 viper.SetEnvPrefix(strings.ToUpper(appName))
261 viper.SetEnvPrefix(strings.ToUpper(appName))
220 viper.AutomaticEnv()
262 viper.AutomaticEnv()
221}
263}