ari/arimelody-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor errors.New to fmt.Errorf

Browse source
This commit is contained in:
ari melody 2025-09-30 22:30:52 +01:00
parent ef655744bb
commit 419781988a
Signed by: ari
GPG key ID: CF99829C92678188
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
api/api.go
View file

@ -2,7 +2,6 @@ package api
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"net/http" "net/http"
"os" "os"
@ -173,7 +172,7 @@ func getSession(app *model.AppState, r *http.Request) (*model.Session, error) {
// check cookies first // check cookies first
sessionCookie, err := r.Cookie(model.COOKIE_TOKEN) sessionCookie, err := r.Cookie(model.COOKIE_TOKEN)
if err != nil && err != http.ErrNoCookie { 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 { if sessionCookie != nil {
token = sessionCookie.Value 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) session, err := controller.GetSession(app.DB, token)
if err != nil && !strings.Contains(err.Error(), "no rows") { 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 { if session != nil {

13
controller/release.go
View file

@ -1,7 +1,6 @@
package controller package controller
import ( import (
"errors"
"fmt" "fmt"
"arimelody-web/model" "arimelody-web/model"
@ -21,7 +20,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) {
// get credits // get credits
credits, err := GetReleaseCredits(db, id) credits, err := GetReleaseCredits(db, id)
if err != nil { if err != nil {
return nil, errors.New(fmt.Sprintf("Credits: %s", err)) return nil, fmt.Errorf("Credits: %s", err)
} }
for _, credit := range credits { for _, credit := range credits {
release.Credits = append(release.Credits, credit) release.Credits = append(release.Credits, credit)
@ -30,7 +29,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) {
// get tracks // get tracks
tracks, err := GetReleaseTracks(db, id) tracks, err := GetReleaseTracks(db, id)
if err != nil { if err != nil {
return nil, errors.New(fmt.Sprintf("Tracks: %s", err)) return nil, fmt.Errorf("Tracks: %s", err)
} }
for _, track := range tracks { for _, track := range tracks {
release.Tracks = append(release.Tracks, track) release.Tracks = append(release.Tracks, track)
@ -39,7 +38,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) {
// get links // get links
links, err := GetReleaseLinks(db, id) links, err := GetReleaseLinks(db, id)
if err != nil { if err != nil {
return nil, errors.New(fmt.Sprintf("Links: %s", err)) return nil, fmt.Errorf("Links: %s", err)
} }
for _, link := range links { for _, link := range links {
release.Links = append(release.Links, link) release.Links = append(release.Links, link)
@ -71,7 +70,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod
// get credits // get credits
credits, err := GetReleaseCredits(db, release.ID) credits, err := GetReleaseCredits(db, release.ID)
if err != nil { if err != nil {
return nil, errors.New(fmt.Sprintf("Credits: %s", err)) return nil, fmt.Errorf("Credits: %s", err)
} }
for _, credit := range credits { for _, credit := range credits {
release.Credits = append(release.Credits, credit) release.Credits = append(release.Credits, credit)
@ -81,7 +80,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod
// get tracks // get tracks
tracks, err := GetReleaseTracks(db, release.ID) tracks, err := GetReleaseTracks(db, release.ID)
if err != nil { if err != nil {
return nil, errors.New(fmt.Sprintf("Tracks: %s", err)) return nil, fmt.Errorf("Tracks: %s", err)
} }
for _, track := range tracks { for _, track := range tracks {
release.Tracks = append(release.Tracks, track) release.Tracks = append(release.Tracks, track)
@ -90,7 +89,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod
// get links // get links
links, err := GetReleaseLinks(db, release.ID) links, err := GetReleaseLinks(db, release.ID)
if err != nil { if err != nil {
return nil, errors.New(fmt.Sprintf("Links: %s", err)) return nil, fmt.Errorf("Links: %s", err)
} }
for _, link := range links { for _, link := range links {
release.Links = append(release.Links, link) release.Links = append(release.Links, link)

5
controller/session.go
View file

@ -2,7 +2,6 @@ package controller
import ( import (
"database/sql" "database/sql"
"errors"
"fmt" "fmt"
"net/http" "net/http"
"strings" "strings"
@ -19,7 +18,7 @@ const TOKEN_LEN = 64
func GetSessionFromRequest(app *model.AppState, r *http.Request) (*model.Session, error) { func GetSessionFromRequest(app *model.AppState, r *http.Request) (*model.Session, error) {
sessionCookie, err := r.Cookie(model.COOKIE_TOKEN) sessionCookie, err := r.Cookie(model.COOKIE_TOKEN)
if err != nil && err != http.ErrNoCookie { 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 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) session, err = GetSession(app.DB, sessionCookie.Value)
if err != nil && !strings.Contains(err.Error(), "no rows") { 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 { if session != nil {