mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-06 05:57:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

go fmt

Browse source
This commit is contained in:
Deluan 2016-03-03 00:46:23 -05:00
parent ffd6304a23
commit 012958cd08
14 changed files with 63 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/get_indexes_test.go
View file

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

6
api/get_music_directory.go
View file

@ -1,11 +1,11 @@
package api package api
import ( import (
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses" "github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain" "github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/utils" "github.com/deluan/gosonic/utils"
"github.com/karlkfi/inject" "github.com/karlkfi/inject"
"github.com/astaxie/beego"
) )
type GetMusicDirectoryController struct { type GetMusicDirectoryController struct {
@ -74,7 +74,7 @@ func (c *GetMusicDirectoryController) Get() {
c.SendResponse(response) 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) found, err := c.artistRepo.Exists(id)
if err != nil { if err != nil {
beego.Error("Error searching for Artist:", err) beego.Error("Error searching for Artist:", err)
@ -96,7 +96,7 @@ func (c *GetMusicDirectoryController) retrieveArtist(id string) (a *domain.Artis
return 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) found, err := c.albumRepo.Exists(id)
if err != nil { if err != nil {
beego.Error("Error searching for Album:", err) beego.Error("Error searching for Album:", err)

6
api/get_music_directory_test.go
View file

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

2
api/ping_test.go
View file

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

60
api/responses/responses.go
View file

@ -18,17 +18,17 @@ type JsonWrapper struct {
} }
type Error struct { type Error struct {
Code int `xml:"code,attr" json:"code"` Code int `xml:"code,attr" json:"code"`
Message string `xml:"message,attr" json: "message"` Message string `xml:"message,attr" json: "message"`
} }
type License struct { type License struct {
Valid bool `xml:"valid,attr" json:"valid"` Valid bool `xml:"valid,attr" json:"valid"`
} }
type MusicFolder struct { type MusicFolder struct {
Id string `xml:"id,attr" json:"id"` Id string `xml:"id,attr" json:"id"`
Name string `xml:"name,attr" json:"name"` Name string `xml:"name,attr" json:"name"`
} }
type MusicFolders struct { type MusicFolders struct {
@ -36,8 +36,8 @@ type MusicFolders struct {
} }
type Artist struct { type Artist struct {
Id string `xml:"id,attr" json:"id"` Id string `xml:"id,attr" json:"id"`
Name string `xml:"name,attr" json:"name"` Name string `xml:"name,attr" json:"name"`
} }
type Index struct { type Index struct {
@ -46,32 +46,32 @@ type Index struct {
} }
type Indexes struct { type Indexes struct {
Index []Index `xml:"index" json:"index,omitempty"` Index []Index `xml:"index" json:"index,omitempty"`
LastModified string `xml:"lastModified,attr" json:"lastModified"` LastModified string `xml:"lastModified,attr" json:"lastModified"`
IgnoredArticles string `xml:"ignoredArticles,attr" json:"ignoredArticles"` IgnoredArticles string `xml:"ignoredArticles,attr" json:"ignoredArticles"`
} }
type Child struct { type Child struct {
Id string `xml:"id,attr" json:"id"` Id string `xml:"id,attr" json:"id"`
IsDir bool `xml:"isDir,attr" json:"isDir"` IsDir bool `xml:"isDir,attr" json:"isDir"`
Title string `xml:"title,attr" json:"title"` Title string `xml:"title,attr" json:"title"`
Album string `xml:"album,attr,omitempty" json:"album,omitempty"` Album string `xml:"album,attr,omitempty" json:"album,omitempty"`
Artist string `xml:"artist,attr,omitempty" json:"artist,omitempty"` Artist string `xml:"artist,attr,omitempty" json:"artist,omitempty"`
Track int `xml:"track,attr,omitempty" json:"track,omitempty"` Track int `xml:"track,attr,omitempty" json:"track,omitempty"`
Year int `xml:"year,attr,omitempty" json:"year,omitempty"` Year int `xml:"year,attr,omitempty" json:"year,omitempty"`
Genre string `xml:"genre,attr,omitempty" json:"genre,omitempty"` Genre string `xml:"genre,attr,omitempty" json:"genre,omitempty"`
CoverArt string `xml:"coverArt,attr,omitempty" json:"coverArt,omitempty"` CoverArt string `xml:"coverArt,attr,omitempty" json:"coverArt,omitempty"`
Size string `xml:"size,attr,omitempty" json:"size,omitempty"` Size string `xml:"size,attr,omitempty" json:"size,omitempty"`
ContentType string `xml:"contentType,attr,omitempty" json:"contentType,omitempty"` ContentType string `xml:"contentType,attr,omitempty" json:"contentType,omitempty"`
Suffix string `xml:"suffix,attr,omitempty" json:"suffix,omitempty"` Suffix string `xml:"suffix,attr,omitempty" json:"suffix,omitempty"`
TranscodedContentType string `xml:"transcodedContentType,attr,omitempty" json:"transcodedContentType,omitempty"` TranscodedContentType string `xml:"transcodedContentType,attr,omitempty" json:"transcodedContentType,omitempty"`
TranscodedSuffix string `xml:"transcodedSuffix,attr,omitempty" json:"transcodedSuffix,omitempty"` TranscodedSuffix string `xml:"transcodedSuffix,attr,omitempty" json:"transcodedSuffix,omitempty"`
Duration int `xml:"duration,attr,omitempty" json:"duration,omitempty"` Duration int `xml:"duration,attr,omitempty" json:"duration,omitempty"`
BitRate int `xml:"bitRate,attr,omitempty" json:"bitRate,omitempty"` BitRate int `xml:"bitRate,attr,omitempty" json:"bitRate,omitempty"`
} }
type Directory struct { type Directory struct {
Child []Child `xml:"child" json:"child,omitempty"` Child []Child `xml:"child" json:"child,omitempty"`
Id string `xml:"id,attr" json:"id"` Id string `xml:"id,attr" json:"id"`
Name string `xml:"name,attr" json:"name"` Name string `xml:"name,attr" json:"name"`
} }

14
api/responses/responses_test.go
View file

@ -1,10 +1,10 @@
package responses_test package responses_test
import ( import (
"testing"
. "github.com/smartystreets/goconvey/convey"
. "github.com/deluan/gosonic/tests"
. "github.com/deluan/gosonic/api/responses" . "github.com/deluan/gosonic/api/responses"
. "github.com/deluan/gosonic/tests"
. "github.com/smartystreets/goconvey/convey"
"testing"
) )
func TestSubsonicResponses(t *testing.T) { func TestSubsonicResponses(t *testing.T) {
@ -60,7 +60,7 @@ func TestSubsonicResponses(t *testing.T) {
Convey("Indexes", func() { Convey("Indexes", func() {
artists := make([]Artist, 1) artists := make([]Artist, 1)
artists[0] = Artist{Id: "111", Name: "aaa"} 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() { Convey("With data", func() {
index := make([]Index, 1) index := make([]Index, 1)
@ -95,7 +95,7 @@ func TestSubsonicResponses(t *testing.T) {
}) })
Convey("With just required data", func() { Convey("With just required data", func() {
child := make([]Child, 1) 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 response.Directory.Child = child
Convey("XML", func() { 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>`) 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() { Convey("With all data", func() {
child := make([]Child, 1) child := make([]Child, 1)
child[0] = Child{ 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", Year: 1985, Genre: "Rock", CoverArt: "1", Size: "8421341", ContentType: "audio/flac",
Suffix: "flac", TranscodedContentType: "audio/mpeg", TranscodedSuffix: "mp3", Suffix: "flac", TranscodedContentType: "audio/mpeg", TranscodedSuffix: "mp3",
Duration: 146, BitRate: 320, Duration: 146, BitRate: 320,
@ -127,4 +127,4 @@ func TestSubsonicResponses(t *testing.T) {
}) })
}) })
} }

6
persistence/base_repository.go
View file

@ -40,7 +40,7 @@ func (r *baseRepository) CountAll() (int, error) {
} }
func (r *baseRepository) Exists(id string) (bool, 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 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) 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) setName := fmt.Sprintf("%s:%s:%ss", parentTable, parentId, r.table)
return r.loadFromSet(setName, entities, sortBy, alpha) return r.loadFromSet(setName, entities, sortBy, alpha)
} }
@ -161,4 +161,4 @@ func (r *baseRepository) loadFromSet(setName string, entities interface{}, sortB
return nil return nil
} }

2
persistence/mediafile_repository.go
View file

@ -35,5 +35,5 @@ func (a byTrackNumber) Swap(i, j int) {
a[i], a[j] = a[j], a[i] a[i], a[j] = a[j], a[i]
} }
func (a byTrackNumber) Less(i, j int) bool { 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)
} }

2
scanner/itunes_scanner.go
View file

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

2
scanner/scanner.go
View file

@ -89,7 +89,7 @@ func parseTrack(t *Track) (*domain.MediaFile, *domain.Album, *domain.Artist) {
Year: t.Year, Year: t.Year,
Compilation: t.Compilation, Compilation: t.Compilation,
Genre: t.Genre, Genre: t.Genre,
Artist: t.Artist, Artist: t.Artist,
AlbumArtist: t.AlbumArtist, AlbumArtist: t.AlbumArtist,
} }

6
tests/matchers.go
View file

@ -1,12 +1,12 @@
package tests package tests
import ( import (
. "github.com/smartystreets/goconvey/convey" "bytes"
"encoding/json" "encoding/json"
"encoding/xml" "encoding/xml"
"fmt" "fmt"
"github.com/deluan/gosonic/api/responses" "github.com/deluan/gosonic/api/responses"
"bytes" . "github.com/smartystreets/goconvey/convey"
) )
func ShouldMatchXML(actual interface{}, expected ...interface{}) string { func ShouldMatchXML(actual interface{}, expected ...interface{}) string {
@ -48,4 +48,4 @@ func UnindentJSON(j []byte) string {
json.Unmarshal(j, &m) json.Unmarshal(j, &m)
s, _ := json.Marshal(m) s, _ := json.Marshal(m)
return string(s) return string(s)
} }

6
tests/mocks/mock_album_repo.go
View file

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

6
tests/mocks/mock_artist_repo.go
View file

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

6
tests/mocks/mock_mediafile_repo.go
View file

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