third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-06-17 15:51:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix gosec's G601

Browse Source
This commit is contained in:
Deluan 2020-05-13 15:32:42 -04:00
parent 162971f7b3
commit 5ce3135f00
6 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/browser.go
View File

@ -135,7 +135,8 @@ func (b *browser) buildArtistDir(a *model.Artist, albums model.Albums) *Director
} }
dir.Entries = make(Entries, len(albums)) dir.Entries = make(Entries, len(albums))
for i, al := range albums { for i := range albums {
al := albums[i]
dir.Entries[i] = FromAlbum(&al) dir.Entries[i] = FromAlbum(&al)
dir.PlayCount += int32(al.PlayCount) dir.PlayCount += int32(al.PlayCount)
} }

9
engine/common.go
View File

@ -133,7 +133,8 @@ func realArtistName(mf *model.MediaFile) string {
func FromAlbums(albums model.Albums) Entries { func FromAlbums(albums model.Albums) Entries {
entries := make(Entries, len(albums)) entries := make(Entries, len(albums))
for i, al := range albums { for i := range albums {
al := albums[i]
entries[i] = FromAlbum(&al) entries[i] = FromAlbum(&al)
} }
return entries return entries
@ -141,7 +142,8 @@ func FromAlbums(albums model.Albums) Entries {
func FromMediaFiles(mfs model.MediaFiles) Entries { func FromMediaFiles(mfs model.MediaFiles) Entries {
entries := make(Entries, len(mfs)) entries := make(Entries, len(mfs))
for i, mf := range mfs { for i := range mfs {
mf := mfs[i]
entries[i] = FromMediaFile(&mf) entries[i] = FromMediaFile(&mf)
} }
return entries return entries
@ -149,7 +151,8 @@ func FromMediaFiles(mfs model.MediaFiles) Entries {
func FromArtists(ars model.Artists) Entries { func FromArtists(ars model.Artists) Entries {
entries := make(Entries, len(ars)) entries := make(Entries, len(ars))
for i, ar := range ars { for i := range ars {
ar := ars[i]
entries[i] = FromArtist(&ar) entries[i] = FromArtist(&ar)
} }
return entries return entries

3
persistence/artist_repository.go
View File

@ -88,7 +88,8 @@ func (r *artistRepository) GetIndex() (model.ArtistIndexes, error) {
} }
fullIdx := make(map[string]*model.ArtistIndex) fullIdx := make(map[string]*model.ArtistIndex)
for _, a := range all { for i := range all {
a := all[i]
ax := r.getIndexKey(&a) ax := r.getIndexKey(&a)
idx, ok := fullIdx[ax] idx, ok := fullIdx[ax]
if !ok { if !ok {

12
persistence/persistence_suite_test.go
View File

@ -86,7 +86,8 @@ var _ = Describe("Initialize test DB", func() {
o := orm.NewOrm() o := orm.NewOrm()
ctx := context.WithValue(log.NewContext(context.TODO()), "user", model.User{ID: "userid"}) ctx := context.WithValue(log.NewContext(context.TODO()), "user", model.User{ID: "userid"})
mr := NewMediaFileRepository(ctx, o) mr := NewMediaFileRepository(ctx, o)
for _, s := range testSongs { for i := range testSongs {
s := testSongs[i]
err := mr.Put(&s) err := mr.Put(&s)
if err != nil { if err != nil {
panic(err) panic(err)
@ -94,7 +95,8 @@ var _ = Describe("Initialize test DB", func() {
} }
alr := NewAlbumRepository(ctx, o).(*albumRepository) alr := NewAlbumRepository(ctx, o).(*albumRepository)
for _, a := range testAlbums { for i := range testAlbums {
a := testAlbums[i]
_, err := alr.put(a.ID, &a) _, err := alr.put(a.ID, &a)
if err != nil { if err != nil {
panic(err) panic(err)
@ -102,7 +104,8 @@ var _ = Describe("Initialize test DB", func() {
} }
arr := NewArtistRepository(ctx, o) arr := NewArtistRepository(ctx, o)
for _, a := range testArtists { for i := range testArtists {
a := testArtists[i]
err := arr.Put(&a) err := arr.Put(&a)
if err != nil { if err != nil {
panic(err) panic(err)
@ -110,7 +113,8 @@ var _ = Describe("Initialize test DB", func() {
} }
pr := NewPlaylistRepository(ctx, o) pr := NewPlaylistRepository(ctx, o)
for _, pls := range testPlaylists { for i := range testPlaylists {
pls := testPlaylists[i]
err := pr.Put(&pls) err := pr.Put(&pls)
if err != nil { if err != nil {
panic(err) panic(err)

3
persistence/playlist_repository.go
View File

@ -74,7 +74,8 @@ func (r *playlistRepository) GetAll(options ...model.QueryOptions) (model.Playli
func (r *playlistRepository) toModels(all []playlist) model.Playlists { func (r *playlistRepository) toModels(all []playlist) model.Playlists {
result := make(model.Playlists, len(all)) result := make(model.Playlists, len(all))
for i, p := range all { for i := range all {
p := all[i]
result[i] = r.toModel(&p) result[i] = r.toModel(&p)
} }
return result return result

3
scanner/tag_scanner.go
View File

@ -183,7 +183,8 @@ func (s *TagScanner) processChangedDir(ctx context.Context, dir string, updatedA
// If track from folder is newer than the one in DB, update/insert in DB and delete from the current tracks // If track from folder is newer than the one in DB, update/insert in DB and delete from the current tracks
log.Trace("Updating mediaFiles in DB", "dir", dir, "files", filesToUpdate, "numFiles", len(filesToUpdate)) log.Trace("Updating mediaFiles in DB", "dir", dir, "files", filesToUpdate, "numFiles", len(filesToUpdate))
for _, n := range newTracks { for i := range newTracks {
n := newTracks[i]
err := s.ds.MediaFile(ctx).Put(&n) err := s.ds.MediaFile(ctx).Put(&n)
updatedArtists[n.AlbumArtistID] = true updatedArtists[n.AlbumArtistID] = true
updatedAlbums[n.AlbumID] = true updatedAlbums[n.AlbumID] = true