From 419781988aede87258eb06cb702db88c7c591dec Mon Sep 17 00:00:00 2001 From: ari melody Date: Tue, 30 Sep 2025 22:30:52 +0100 Subject: [PATCH] refactor errors.New to fmt.Errorf --- api/api.go | 5 ++--- controller/release.go | 13 ++++++------- controller/session.go | 5 ++--- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/api/api.go b/api/api.go index 398db4b..c5156c2 100644 --- a/api/api.go +++ b/api/api.go @@ -2,7 +2,6 @@ package api import ( "context" - "errors" "fmt" "net/http" "os" @@ -173,7 +172,7 @@ func getSession(app *model.AppState, r *http.Request) (*model.Session, error) { // check cookies first sessionCookie, err := r.Cookie(model.COOKIE_TOKEN) if err != nil && err != http.ErrNoCookie { - return nil, errors.New(fmt.Sprintf("Failed to retrieve session cookie: %v\n", err)) + return nil, fmt.Errorf("Failed to retrieve session cookie: %v\n", err) } if sessionCookie != nil { token = sessionCookie.Value @@ -188,7 +187,7 @@ func getSession(app *model.AppState, r *http.Request) (*model.Session, error) { session, err := controller.GetSession(app.DB, token) if err != nil && !strings.Contains(err.Error(), "no rows") { - return nil, errors.New(fmt.Sprintf("Failed to retrieve session: %v\n", err)) + return nil, fmt.Errorf("Failed to retrieve session: %v\n", err) } if session != nil { diff --git a/controller/release.go b/controller/release.go index 3dcad26..afd09fb 100644 --- a/controller/release.go +++ b/controller/release.go @@ -1,7 +1,6 @@ package controller import ( - "errors" "fmt" "arimelody-web/model" @@ -21,7 +20,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) { // get credits credits, err := GetReleaseCredits(db, id) if err != nil { - return nil, errors.New(fmt.Sprintf("Credits: %s", err)) + return nil, fmt.Errorf("Credits: %s", err) } for _, credit := range credits { release.Credits = append(release.Credits, credit) @@ -30,7 +29,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) { // get tracks tracks, err := GetReleaseTracks(db, id) if err != nil { - return nil, errors.New(fmt.Sprintf("Tracks: %s", err)) + return nil, fmt.Errorf("Tracks: %s", err) } for _, track := range tracks { release.Tracks = append(release.Tracks, track) @@ -39,7 +38,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) { // get links links, err := GetReleaseLinks(db, id) if err != nil { - return nil, errors.New(fmt.Sprintf("Links: %s", err)) + return nil, fmt.Errorf("Links: %s", err) } for _, link := range links { release.Links = append(release.Links, link) @@ -71,7 +70,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod // get credits credits, err := GetReleaseCredits(db, release.ID) if err != nil { - return nil, errors.New(fmt.Sprintf("Credits: %s", err)) + return nil, fmt.Errorf("Credits: %s", err) } for _, credit := range credits { release.Credits = append(release.Credits, credit) @@ -81,7 +80,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod // get tracks tracks, err := GetReleaseTracks(db, release.ID) if err != nil { - return nil, errors.New(fmt.Sprintf("Tracks: %s", err)) + return nil, fmt.Errorf("Tracks: %s", err) } for _, track := range tracks { release.Tracks = append(release.Tracks, track) @@ -90,7 +89,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod // get links links, err := GetReleaseLinks(db, release.ID) if err != nil { - return nil, errors.New(fmt.Sprintf("Links: %s", err)) + return nil, fmt.Errorf("Links: %s", err) } for _, link := range links { release.Links = append(release.Links, link) diff --git a/controller/session.go b/controller/session.go index 5028789..dfae551 100644 --- a/controller/session.go +++ b/controller/session.go @@ -2,7 +2,6 @@ package controller import ( "database/sql" - "errors" "fmt" "net/http" "strings" @@ -19,7 +18,7 @@ const TOKEN_LEN = 64 func GetSessionFromRequest(app *model.AppState, r *http.Request) (*model.Session, error) { sessionCookie, err := r.Cookie(model.COOKIE_TOKEN) if err != nil && err != http.ErrNoCookie { - return nil, errors.New(fmt.Sprintf("Failed to retrieve session cookie: %v", err)) + return nil, fmt.Errorf("Failed to retrieve session cookie: %v", err) } var session *model.Session @@ -29,7 +28,7 @@ func GetSessionFromRequest(app *model.AppState, r *http.Request) (*model.Session session, err = GetSession(app.DB, sessionCookie.Value) if err != nil && !strings.Contains(err.Error(), "no rows") { - return nil, errors.New(fmt.Sprintf("Failed to retrieve session: %v", err)) + return nil, fmt.Errorf("Failed to retrieve session: %v", err) } if session != nil {