Skip to content

Commit 3b307f2

Browse files
replacing log.Fatalf() by returning an error (#201)
1 parent 47266b8 commit 3b307f2

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

cmd/card/card.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func CardCommand() (string, error) {
5454

5555
if result.SeriesID != "" {
5656
// Program 2: Sets selection
57-
setsModel := SetsList(result.SeriesID)
57+
setsModel, _ := SetsList(result.SeriesID)
5858
finalSetsModel, err := tea.NewProgram(setsModel).Run()
5959
if err != nil {
6060
return "", fmt.Errorf("error running sets selection program: %w", err)

cmd/card/setslist.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"encoding/json"
55
"fmt"
66
"io"
7-
"log"
87
"net/http"
98
"time"
109

@@ -72,12 +71,16 @@ type setData struct {
7271
Symbol string `json:"symbol"`
7372
}
7473

75-
func SetsList(seriesID string) SetsModel {
76-
body, _ := callSetsData("https://uoddayfnfkebrijlpfbh.supabase.co/rest/v1/sets")
74+
func SetsList(seriesID string) (SetsModel, error) {
75+
body, err := callSetsData("https://uoddayfnfkebrijlpfbh.supabase.co/rest/v1/sets")
76+
if err != nil {
77+
return SetsModel{}, fmt.Errorf("error getting sets data: %v", err)
78+
}
7779
var allSets []setData
78-
err := json.Unmarshal(body, &allSets)
80+
81+
err = json.Unmarshal(body, &allSets)
7982
if err != nil {
80-
log.Fatal(err)
83+
return SetsModel{}, fmt.Errorf("error parsing sets data: %v", err)
8184
}
8285

8386
// Filter sets by series_id and build ID map
@@ -102,10 +105,11 @@ func SetsList(seriesID string) SetsModel {
102105
l.Styles.HelpStyle = helpStyle
103106

104107
return SetsModel{
105-
List: l,
106-
SeriesName: seriesID,
107-
setsIDMap: setsIDMap,
108-
}
108+
List: l,
109+
SeriesName: seriesID,
110+
setsIDMap: setsIDMap,
111+
},
112+
nil
109113
}
110114

111115
func callSetsData(url string) ([]byte, error) {

0 commit comments

Comments
 (0)