home to your local SPACEGIRL 💫
arimelody.space
refactor errors.New to fmt.Errorf
+10
-13
+2
-3
api/api.go
+2
-3
api/api.go
···
2
2
3
3
import (
4
4
"context"
5
-
"errors"
6
5
"fmt"
7
6
"net/http"
8
7
"os"
···
173
172
// check cookies first
174
173
sessionCookie, err := r.Cookie(model.COOKIE_TOKEN)
175
174
if err != nil && err != http.ErrNoCookie {
176
-
return nil, errors.New(fmt.Sprintf("Failed to retrieve session cookie: %v\n", err))
175
+
return nil, fmt.Errorf("Failed to retrieve session cookie: %v\n", err)
177
176
}
178
177
if sessionCookie != nil {
179
178
token = sessionCookie.Value
···
188
187
session, err := controller.GetSession(app.DB, token)
189
188
190
189
if err != nil && !strings.Contains(err.Error(), "no rows") {
191
-
return nil, errors.New(fmt.Sprintf("Failed to retrieve session: %v\n", err))
190
+
return nil, fmt.Errorf("Failed to retrieve session: %v\n", err)
192
191
}
193
192
194
193
if session != nil {
+6
-7
controller/release.go
+6
-7
controller/release.go
···
1
1
package controller
2
2
3
3
import (
4
-
"errors"
5
4
"fmt"
6
5
7
6
"arimelody-web/model"
···
21
20
// get credits
22
21
credits, err := GetReleaseCredits(db, id)
23
22
if err != nil {
24
-
return nil, errors.New(fmt.Sprintf("Credits: %s", err))
23
+
return nil, fmt.Errorf("Credits: %s", err)
25
24
}
26
25
for _, credit := range credits {
27
26
release.Credits = append(release.Credits, credit)
···
30
29
// get tracks
31
30
tracks, err := GetReleaseTracks(db, id)
32
31
if err != nil {
33
-
return nil, errors.New(fmt.Sprintf("Tracks: %s", err))
32
+
return nil, fmt.Errorf("Tracks: %s", err)
34
33
}
35
34
for _, track := range tracks {
36
35
release.Tracks = append(release.Tracks, track)
···
39
38
// get links
40
39
links, err := GetReleaseLinks(db, id)
41
40
if err != nil {
42
-
return nil, errors.New(fmt.Sprintf("Links: %s", err))
41
+
return nil, fmt.Errorf("Links: %s", err)
43
42
}
44
43
for _, link := range links {
45
44
release.Links = append(release.Links, link)
···
71
70
// get credits
72
71
credits, err := GetReleaseCredits(db, release.ID)
73
72
if err != nil {
74
-
return nil, errors.New(fmt.Sprintf("Credits: %s", err))
73
+
return nil, fmt.Errorf("Credits: %s", err)
75
74
}
76
75
for _, credit := range credits {
77
76
release.Credits = append(release.Credits, credit)
···
81
80
// get tracks
82
81
tracks, err := GetReleaseTracks(db, release.ID)
83
82
if err != nil {
84
-
return nil, errors.New(fmt.Sprintf("Tracks: %s", err))
83
+
return nil, fmt.Errorf("Tracks: %s", err)
85
84
}
86
85
for _, track := range tracks {
87
86
release.Tracks = append(release.Tracks, track)
···
90
89
// get links
91
90
links, err := GetReleaseLinks(db, release.ID)
92
91
if err != nil {
93
-
return nil, errors.New(fmt.Sprintf("Links: %s", err))
92
+
return nil, fmt.Errorf("Links: %s", err)
94
93
}
95
94
for _, link := range links {
96
95
release.Links = append(release.Links, link)
+2
-3
controller/session.go
+2
-3
controller/session.go
···
2
2
3
3
import (
4
4
"database/sql"
5
-
"errors"
6
5
"fmt"
7
6
"net/http"
8
7
"strings"
···
19
18
func GetSessionFromRequest(app *model.AppState, r *http.Request) (*model.Session, error) {
20
19
sessionCookie, err := r.Cookie(model.COOKIE_TOKEN)
21
20
if err != nil && err != http.ErrNoCookie {
22
-
return nil, errors.New(fmt.Sprintf("Failed to retrieve session cookie: %v", err))
21
+
return nil, fmt.Errorf("Failed to retrieve session cookie: %v", err)
23
22
}
24
23
25
24
var session *model.Session
···
29
28
session, err = GetSession(app.DB, sessionCookie.Value)
30
29
31
30
if err != nil && !strings.Contains(err.Error(), "no rows") {
32
-
return nil, errors.New(fmt.Sprintf("Failed to retrieve session: %v", err))
31
+
return nil, fmt.Errorf("Failed to retrieve session: %v", err)
33
32
}
34
33
35
34
if session != nil {