heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(ci): update golangci-lint and action (#325)

Browse Source 
* Update linter

- Update Github golangci-lint-action to v3
- Update golangci-lint to v1.52.2

* Fix linter issues after updating to linter 1.52.2
This commit is contained in:
Gregor Zurowski
2023-05-19 14:05:14 +02:00
committed by GitHub
parent ab07b876b8
commit 85eeb860bf
15 changed files with 43 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/ctrladmin/handlers.go
View File

@@ -33,11 +33,11 @@ func doScan(scanner *scanner.Scanner, opts scanner.ScanOptions) {
}()
}
func (c *Controller) ServeNotFound(r *http.Request) *Response {
func (c *Controller) ServeNotFound(_ *http.Request) *Response {
return &Response{template: "not_found.tmpl", code: 404}
}
func (c *Controller) ServeLogin(r *http.Request) *Response {
func (c *Controller) ServeLogin(_ *http.Request) *Response {
return &Response{template: "login.tmpl"}
}
@@ -303,7 +303,7 @@ func (c *Controller) ServeDeleteUserDo(r *http.Request) *Response {
return &Response{redirect: "/admin/home"}
}
func (c *Controller) ServeCreateUser(r *http.Request) *Response {
func (c *Controller) ServeCreateUser(_ *http.Request) *Response {
return &Response{template: "create_user.tmpl"}
}
@@ -369,7 +369,7 @@ func (c *Controller) ServeUpdateLastFMAPIKeyDo(r *http.Request) *Response {
return &Response{redirect: "/admin/home"}
}
func (c *Controller) ServeStartScanIncDo(r *http.Request) *Response {
func (c *Controller) ServeStartScanIncDo(_ *http.Request) *Response {
defer doScan(c.Scanner, scanner.ScanOptions{})
return &Response{
redirect: "/admin/home",
@@ -377,7 +377,7 @@ func (c *Controller) ServeStartScanIncDo(r *http.Request) *Response {
}
}
func (c *Controller) ServeStartScanFullDo(r *http.Request) *Response {
func (c *Controller) ServeStartScanFullDo(_ *http.Request) *Response {
defer doScan(c.Scanner, scanner.ScanOptions{IsFull: true})
return &Response{
redirect: "/admin/home",

16
server/ctrlsubsonic/ctrl_test.go
View File

@@ -78,22 +78,6 @@ func makeHTTPMockWithAdmin(query url.Values) (*httptest.ResponseRecorder, *http.
return rr, req
}
func serveRaw(t *testing.T, contr *Controller, h handlerSubsonicRaw, rr *httptest.ResponseRecorder, req *http.Request) {
type middleware func(http.Handler) http.Handler
middlewares := []middleware{
contr.WithParams,
contr.WithRequiredParams,
contr.WithUser,
}
handler := contr.HR(h)
for _, m := range middlewares {
handler = m(handler)
}
handler.ServeHTTP(rr, req)
}
func runQueryCases(t *testing.T, contr *Controller, h handlerSubsonic, cases []*queryCase) {
t.Helper()
for _, qc := range cases {

2
server/ctrlsubsonic/handlers_by_folder.go
View File

@@ -279,7 +279,7 @@ func (c *Controller) ServeSearchTwo(r *http.Request) *spec.Response {
return sub
}
func (c *Controller) ServeGetArtistInfo(r *http.Request) *spec.Response {
func (c *Controller) ServeGetArtistInfo(_ *http.Request) *spec.Response {
return spec.NewResponse()
}

2
server/ctrlsubsonic/handlers_by_tags.go
View File

@@ -382,7 +382,7 @@ func (c *Controller) ServeGetArtistInfoTwo(r *http.Request) *spec.Response {
return sub
}
func (c *Controller) ServeGetGenres(r *http.Request) *spec.Response {
func (c *Controller) ServeGetGenres(_ *http.Request) *spec.Response {
var genres []*db.Genre
c.DB.
Select(`*,

12
server/ctrlsubsonic/handlers_common.go
View File

@@ -40,7 +40,7 @@ func getMusicFolder(musicPaths []MusicPath, p params.Params) string {
return musicPaths[idx].Path
}
func (c *Controller) ServeGetLicence(r *http.Request) *spec.Response {
func (c *Controller) ServeGetLicence(_ *http.Request) *spec.Response {
sub := spec.NewResponse()
sub.Licence = &spec.Licence{
Valid: true,
@@ -48,7 +48,7 @@ func (c *Controller) ServeGetLicence(r *http.Request) *spec.Response {
return sub
}
func (c *Controller) ServePing(r *http.Request) *spec.Response {
func (c *Controller) ServePing(_ *http.Request) *spec.Response {
return spec.NewResponse()
}
@@ -86,7 +86,7 @@ func (c *Controller) ServeScrobble(r *http.Request) *spec.Response {
return spec.NewResponse()
}
func (c *Controller) ServeGetMusicFolders(r *http.Request) *spec.Response {
func (c *Controller) ServeGetMusicFolders(_ *http.Request) *spec.Response {
sub := spec.NewResponse()
sub.MusicFolders = &spec.MusicFolders{}
for i, mp := range c.MusicPaths {
@@ -108,7 +108,7 @@ func (c *Controller) ServeStartScan(r *http.Request) *spec.Response {
return c.ServeGetScanStatus(r)
}
func (c *Controller) ServeGetScanStatus(r *http.Request) *spec.Response {
func (c *Controller) ServeGetScanStatus(_ *http.Request) *spec.Response {
var trackCount int
if err := c.DB.Model(db.Track{}).Count(&trackCount).Error; err != nil {
return spec.NewError(0, "error finding track count: %v", err)
@@ -140,7 +140,7 @@ func (c *Controller) ServeGetUser(r *http.Request) *spec.Response {
return sub
}
func (c *Controller) ServeNotFound(r *http.Request) *spec.Response {
func (c *Controller) ServeNotFound(_ *http.Request) *spec.Response {
return spec.NewError(70, "view not found")
}
@@ -420,7 +420,7 @@ func (c *Controller) ServeJukebox(r *http.Request) *spec.Response { // nolint:go
return sub
}
func (c *Controller) ServeGetLyrics(r *http.Request) *spec.Response {
func (c *Controller) ServeGetLyrics(_ *http.Request) *spec.Response {
sub := spec.NewResponse()
sub.Lyrics = &spec.Lyrics{}
return sub

2
server/ctrlsubsonic/handlers_internet_radio.go
View File

@@ -9,7 +9,7 @@ import (
"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
)
func (c *Controller) ServeGetInternetRadioStations(r *http.Request) *spec.Response {
func (c *Controller) ServeGetInternetRadioStations(_ *http.Request) *spec.Response {
var stations []*db.InternetRadioStation
if err := c.DB.Find(&stations).Error; err != nil {
return spec.NewError(0, "find stations: %v", err)