From 5ce3135f004e4151edd535fb5aa0219a18af7f03 Mon Sep 17 00:00:00 2001
From: Deluan <deluan@deluan.com>
Date: Wed, 13 May 2020 15:32:42 -0400
Subject: [PATCH] Fix gosec's G601

---
 engine/browser.go                     |  3 ++-
 engine/common.go                      |  9 ++++++---
 persistence/artist_repository.go      |  3 ++-
 persistence/persistence_suite_test.go | 12 ++++++++----
 persistence/playlist_repository.go    |  3 ++-
 scanner/tag_scanner.go                |  3 ++-
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/engine/browser.go b/engine/browser.go
index a066883b5..05be0fab2 100644
--- a/engine/browser.go
+++ b/engine/browser.go
@@ -135,7 +135,8 @@ func (b *browser) buildArtistDir(a *model.Artist, albums model.Albums) *Director
 	}
 
 	dir.Entries = make(Entries, len(albums))
-	for i, al := range albums {
+	for i := range albums {
+		al := albums[i]
 		dir.Entries[i] = FromAlbum(&al)
 		dir.PlayCount += int32(al.PlayCount)
 	}
diff --git a/engine/common.go b/engine/common.go
index bbc2915a7..356da3ffe 100644
--- a/engine/common.go
+++ b/engine/common.go
@@ -133,7 +133,8 @@ func realArtistName(mf *model.MediaFile) string {
 
 func FromAlbums(albums model.Albums) Entries {
 	entries := make(Entries, len(albums))
-	for i, al := range albums {
+	for i := range albums {
+		al := albums[i]
 		entries[i] = FromAlbum(&al)
 	}
 	return entries
@@ -141,7 +142,8 @@ func FromAlbums(albums model.Albums) Entries {
 
 func FromMediaFiles(mfs model.MediaFiles) Entries {
 	entries := make(Entries, len(mfs))
-	for i, mf := range mfs {
+	for i := range mfs {
+		mf := mfs[i]
 		entries[i] = FromMediaFile(&mf)
 	}
 	return entries
@@ -149,7 +151,8 @@ func FromMediaFiles(mfs model.MediaFiles) Entries {
 
 func FromArtists(ars model.Artists) Entries {
 	entries := make(Entries, len(ars))
-	for i, ar := range ars {
+	for i := range ars {
+		ar := ars[i]
 		entries[i] = FromArtist(&ar)
 	}
 	return entries
diff --git a/persistence/artist_repository.go b/persistence/artist_repository.go
index 3305f70e6..2d346faae 100644
--- a/persistence/artist_repository.go
+++ b/persistence/artist_repository.go
@@ -88,7 +88,8 @@ func (r *artistRepository) GetIndex() (model.ArtistIndexes, error) {
 	}
 
 	fullIdx := make(map[string]*model.ArtistIndex)
-	for _, a := range all {
+	for i := range all {
+		a := all[i]
 		ax := r.getIndexKey(&a)
 		idx, ok := fullIdx[ax]
 		if !ok {
diff --git a/persistence/persistence_suite_test.go b/persistence/persistence_suite_test.go
index 920a2651d..a85315e4a 100644
--- a/persistence/persistence_suite_test.go
+++ b/persistence/persistence_suite_test.go
@@ -86,7 +86,8 @@ var _ = Describe("Initialize test DB", func() {
 		o := orm.NewOrm()
 		ctx := context.WithValue(log.NewContext(context.TODO()), "user", model.User{ID: "userid"})
 		mr := NewMediaFileRepository(ctx, o)
-		for _, s := range testSongs {
+		for i := range testSongs {
+			s := testSongs[i]
 			err := mr.Put(&s)
 			if err != nil {
 				panic(err)
@@ -94,7 +95,8 @@ var _ = Describe("Initialize test DB", func() {
 		}
 
 		alr := NewAlbumRepository(ctx, o).(*albumRepository)
-		for _, a := range testAlbums {
+		for i := range testAlbums {
+			a := testAlbums[i]
 			_, err := alr.put(a.ID, &a)
 			if err != nil {
 				panic(err)
@@ -102,7 +104,8 @@ var _ = Describe("Initialize test DB", func() {
 		}
 
 		arr := NewArtistRepository(ctx, o)
-		for _, a := range testArtists {
+		for i := range testArtists {
+			a := testArtists[i]
 			err := arr.Put(&a)
 			if err != nil {
 				panic(err)
@@ -110,7 +113,8 @@ var _ = Describe("Initialize test DB", func() {
 		}
 
 		pr := NewPlaylistRepository(ctx, o)
-		for _, pls := range testPlaylists {
+		for i := range testPlaylists {
+			pls := testPlaylists[i]
 			err := pr.Put(&pls)
 			if err != nil {
 				panic(err)
diff --git a/persistence/playlist_repository.go b/persistence/playlist_repository.go
index 693e2c50c..c35d4726a 100644
--- a/persistence/playlist_repository.go
+++ b/persistence/playlist_repository.go
@@ -74,7 +74,8 @@ func (r *playlistRepository) GetAll(options ...model.QueryOptions) (model.Playli
 
 func (r *playlistRepository) toModels(all []playlist) model.Playlists {
 	result := make(model.Playlists, len(all))
-	for i, p := range all {
+	for i := range all {
+		p := all[i]
 		result[i] = r.toModel(&p)
 	}
 	return result
diff --git a/scanner/tag_scanner.go b/scanner/tag_scanner.go
index 2a1eac3c9..dd3cb70f6 100644
--- a/scanner/tag_scanner.go
+++ b/scanner/tag_scanner.go
@@ -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
 		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)
 			updatedArtists[n.AlbumArtistID] = true
 			updatedAlbums[n.AlbumID] = true