git.iko.soy/crush
on main help sign in
refactor(catwalk): remove stale helper to avoid confusion
449de92Andrey Nering
internal/config/provider.go+2−12
compare with main
unifiedsplit
@@ -10,7 +10,6 @@ import (
10 "runtime"
10 "runtime"
11 "strings"
11 "strings"
12 "sync"
12 "sync"
13− "time"
14
13
15 "github.com/charmbracelet/catwalk/pkg/catwalk"
14 "github.com/charmbracelet/catwalk/pkg/catwalk"
16 "github.com/charmbracelet/catwalk/pkg/embedded"
15 "github.com/charmbracelet/catwalk/pkg/embedded"
@@ -126,8 +125,6 @@ func Providers(cfg *Config) ([]catwalk.Provider, error) {
126}
125}
127
126
128func loadProviders(autoUpdateDisabled bool, client ProviderClient, path string) ([]catwalk.Provider, error) {
127func loadProviders(autoUpdateDisabled bool, client ProviderClient, path string) ([]catwalk.Provider, error) {
129− _, cacheExists := isCacheStale(path)
130−
131 catwalkGetAndSave := func() ([]catwalk.Provider, error) {
128 catwalkGetAndSave := func() ([]catwalk.Provider, error) {
132 providers, err := client.GetProviders()
129 providers, err := client.GetProviders()
133 if err != nil {
130 if err != nil {
@@ -141,11 +138,12 @@ func loadProviders(autoUpdateDisabled bool, client ProviderClient, path string)
141 }
138 }
142 return providers, nil
139 return providers, nil
143 }
140 }
141+
144 switch {
142 switch {
145 case autoUpdateDisabled:
143 case autoUpdateDisabled:
146 slog.Warn("Providers auto-update is disabled")
144 slog.Warn("Providers auto-update is disabled")
147
145
148− if cacheExists {
146+ if _, err := os.Stat(path); err == nil {
149 slog.Warn("Using locally cached providers")
147 slog.Warn("Using locally cached providers")
150 return loadProvidersFromCache(path)
148 return loadProvidersFromCache(path)
151 }
149 }
@@ -168,11 +166,3 @@ func loadProviders(autoUpdateDisabled bool, client ProviderClient, path string)
168 return providers, nil
166 return providers, nil
169 }
167 }
170}
168}
171−
172−func isCacheStale(path string) (stale, exists bool) {
173− info, err := os.Stat(path)
174− if err != nil {
175− return true, false
176− }
177− return time.Since(info.ModTime()) > 24*time.Hour, true
178−}