go fmt

api/get_indexes_test.go

@@ -6,9 +6,9 @@ import (
 	"github.com/deluan/gosonic/api/responses"
 	"github.com/deluan/gosonic/consts"
 	"github.com/deluan/gosonic/domain"
+	. "github.com/deluan/gosonic/tests"
 	"github.com/deluan/gosonic/tests/mocks"
 	"github.com/deluan/gosonic/utils"
-	. "github.com/deluan/gosonic/tests"
 	. "github.com/smartystreets/goconvey/convey"
 )
 

api/get_music_directory.go

@@ -1,11 +1,11 @@
 package api
 
 import (
+	"github.com/astaxie/beego"
 	"github.com/deluan/gosonic/api/responses"
 	"github.com/deluan/gosonic/domain"
 	"github.com/deluan/gosonic/utils"
 	"github.com/karlkfi/inject"
-	"github.com/astaxie/beego"
 )
 
 type GetMusicDirectoryController struct {
@@ -74,7 +74,7 @@ func (c *GetMusicDirectoryController) Get() {
 	c.SendResponse(response)
 }
 
-func (c *GetMusicDirectoryController) retrieveArtist(id string) (a *domain.Artist, as[]domain.Album, found bool) {
+func (c *GetMusicDirectoryController) retrieveArtist(id string) (a *domain.Artist, as []domain.Album, found bool) {
 	found, err := c.artistRepo.Exists(id)
 	if err != nil {
 		beego.Error("Error searching for Artist:", err)
@@ -96,7 +96,7 @@ func (c *GetMusicDirectoryController) retrieveArtist(id string) (a *domain.Artis
 	return
 }
 
-func (c *GetMusicDirectoryController) retrieveAlbum(id string) (al *domain.Album, mfs[]domain.MediaFile, found bool) {
+func (c *GetMusicDirectoryController) retrieveAlbum(id string) (al *domain.Album, mfs []domain.MediaFile, found bool) {
 	found, err := c.albumRepo.Exists(id)
 	if err != nil {
 		beego.Error("Error searching for Album:", err)

api/get_music_directory_test.go

@@ -3,12 +3,12 @@ package api_test
 import (
 	"testing"
 
+	"github.com/deluan/gosonic/api/responses"
 	"github.com/deluan/gosonic/domain"
+	. "github.com/deluan/gosonic/tests"
 	"github.com/deluan/gosonic/tests/mocks"
 	"github.com/deluan/gosonic/utils"
-	. "github.com/deluan/gosonic/tests"
 	. "github.com/smartystreets/goconvey/convey"
-	"github.com/deluan/gosonic/api/responses"
 )
 
 func TestGetMusicDirectory(t *testing.T) {

api/ping_test.go

@@ -1,11 +1,11 @@
 package api_test
 
 import (
+	"encoding/json"
 	"github.com/deluan/gosonic/api/responses"
 	. "github.com/deluan/gosonic/tests"
 	. "github.com/smartystreets/goconvey/convey"
 	"testing"
-	"encoding/json"
 )
 
 func TestPing(t *testing.T) {

api/responses/responses_test.go

@@ -1,10 +1,10 @@
 package responses_test
 
 import (
-	"testing"
-	. "github.com/smartystreets/goconvey/convey"
-	. "github.com/deluan/gosonic/tests"
 	. "github.com/deluan/gosonic/api/responses"
+	. "github.com/deluan/gosonic/tests"
+	. "github.com/smartystreets/goconvey/convey"
+	"testing"
 )
 
 func TestSubsonicResponses(t *testing.T) {
@@ -60,7 +60,7 @@ func TestSubsonicResponses(t *testing.T) {
 		Convey("Indexes", func() {
 			artists := make([]Artist, 1)
 			artists[0] = Artist{Id: "111", Name: "aaa"}
-			response.Indexes = &Indexes{LastModified:"1", IgnoredArticles:"A"}
+			response.Indexes = &Indexes{LastModified: "1", IgnoredArticles: "A"}
 
 			Convey("With data", func() {
 				index := make([]Index, 1)
@@ -95,7 +95,7 @@ func TestSubsonicResponses(t *testing.T) {
 			})
 			Convey("With just required data", func() {
 				child := make([]Child, 1)
-				child[0] = Child{ Id:"1", Title: "title", IsDir: false }
+				child[0] = Child{Id: "1", Title: "title", IsDir: false}
 				response.Directory.Child = child
 				Convey("XML", func() {
 					So(response, ShouldMatchXML, `<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.0.0"><directory id="1" name="N"><child id="1" isDir="false" title="title"></child></directory></subsonic-response>`)
@@ -107,7 +107,7 @@ func TestSubsonicResponses(t *testing.T) {
 			Convey("With all data", func() {
 				child := make([]Child, 1)
 				child[0] = Child{
-					Id:"1", IsDir: true, Title: "title", Album: "album", Artist: "artist", Track: 1,
+					Id: "1", IsDir: true, Title: "title", Album: "album", Artist: "artist", Track: 1,
 					Year: 1985, Genre: "Rock", CoverArt: "1", Size: "8421341", ContentType: "audio/flac",
 					Suffix: "flac", TranscodedContentType: "audio/mpeg", TranscodedSuffix: "mp3",
 					Duration: 146, BitRate: 320,

persistence/base_repository.go

@@ -40,7 +40,7 @@ func (r *baseRepository) CountAll() (int, error) {
 }
 
 func (r *baseRepository) Exists(id string) (bool, error) {
-	res, err := db().SIsMember([]byte(r.table + "s:all"), []byte(id))
+	res, err := db().SIsMember([]byte(r.table+"s:all"), []byte(id))
 	return res != 0, err
 }
 
@@ -132,7 +132,7 @@ func (r *baseRepository) loadAll(entities interface{}, sortBy string, alpha bool
 	return r.loadFromSet(setName, entities, sortBy, alpha)
 }
 
-func (r* baseRepository) loadChildren(parentTable string, parentId string, entities interface{}, sortBy string, alpha bool) error {
+func (r *baseRepository) loadChildren(parentTable string, parentId string, entities interface{}, sortBy string, alpha bool) error {
 	setName := fmt.Sprintf("%s:%s:%ss", parentTable, parentId, r.table)
 	return r.loadFromSet(setName, entities, sortBy, alpha)
 }

persistence/mediafile_repository.go

@@ -35,5 +35,5 @@ func (a byTrackNumber) Swap(i, j int) {
 	a[i], a[j] = a[j], a[i]
 }
 func (a byTrackNumber) Less(i, j int) bool {
-	return (a[i].DiscNumber * 1000 + a[i].TrackNumber) < (a[j].DiscNumber * 1000 + a[j].TrackNumber)
+	return (a[i].DiscNumber*1000 + a[i].TrackNumber) < (a[j].DiscNumber*1000 + a[j].TrackNumber)
 }

scanner/itunes_scanner.go

@@ -4,9 +4,9 @@ import (
 	"github.com/dhowden/itl"
 	"net/url"
 	"os"
-	"strings"
 	"path/filepath"
 	"strconv"
+	"strings"
 )
 
 type ItunesScanner struct{}

tests/matchers.go

@@ -1,12 +1,12 @@
 package tests
 
 import (
-	. "github.com/smartystreets/goconvey/convey"
+	"bytes"
 	"encoding/json"
 	"encoding/xml"
 	"fmt"
 	"github.com/deluan/gosonic/api/responses"
-	"bytes"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func ShouldMatchXML(actual interface{}, expected ...interface{}) string {

tests/mocks/mock_album_repo.go

@@ -2,9 +2,9 @@ package mocks
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"github.com/deluan/gosonic/domain"
-"errors"
 )
 
 func CreateMockAlbumRepo() *MockAlbum {
@@ -37,7 +37,7 @@ func (m *MockAlbum) Exists(id string) (bool, error) {
 	if m.err {
 		return false, errors.New("Error!")
 	}
-	_, found := m.data[id];
+	_, found := m.data[id]
 	return found, nil
 }
 

tests/mocks/mock_artist_repo.go

@@ -2,9 +2,9 @@ package mocks
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"github.com/deluan/gosonic/domain"
-"errors"
 )
 
 func CreateMockArtistRepo() *MockArtist {
@@ -37,7 +37,7 @@ func (m *MockArtist) Exists(id string) (bool, error) {
 	if m.err {
 		return false, errors.New("Error!")
 	}
-	_, found := m.data[id];
+	_, found := m.data[id]
 	return found, nil
 }
 

tests/mocks/mock_mediafile_repo.go

@@ -2,9 +2,9 @@ package mocks
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"github.com/deluan/gosonic/domain"
-"errors"
 )
 
 func CreateMockMediaFileRepo() *MockMediaFile {
@@ -37,7 +37,7 @@ func (m *MockMediaFile) Exists(id string) (bool, error) {
 	if m.err {
 		return false, errors.New("Error!")
 	}
-	_, found := m.data[id];
+	_, found := m.data[id]
 	return found, nil
 }