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

go fmt

Browse source
This commit is contained in:
Deluan 2016-03-02 13:18:39 -05:00
parent 9d41f5a39f
commit 4843ccb46c
42 changed files with 150 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/api_test.go
View file

@ -3,9 +3,9 @@ package api_test
import (
"fmt"
"github.com/astaxie/beego"
_ "github.com/deluan/gosonic/conf"
"net/http"
"net/http/httptest"
_ "github.com/deluan/gosonic/conf"
"strings"
)

17
api/base_api_controller.go
View file

@ -1,10 +1,10 @@
package api
import (
"encoding/xml"
"fmt"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"fmt"
"encoding/xml"
)
type BaseAPIController struct{ beego.Controller }
@ -16,7 +16,7 @@ func (c *BaseAPIController) NewEmpty() responses.Subsonic {
func (c *BaseAPIController) SendError(errorCode int, message ...interface{}) {
response := responses.Subsonic{Version: beego.AppConfig.String("apiVersion"), Status: "fail"}
var msg string
if (len(message) == 0) {
if len(message) == 0 {
msg = responses.ErrorMsg(errorCode)
} else {
msg = fmt.Sprintf(message[0].(string), message[1:len(message)]...)
@ -24,13 +24,15 @@ func (c *BaseAPIController) SendError(errorCode int, message ...interface{}) {
response.Error = &responses.Error{Code: errorCode, Message: msg}
xmlBody, _ := xml.Marshal(&response)
c.CustomAbort(200, xml.Header + string(xmlBody))
c.CustomAbort(200, xml.Header+string(xmlBody))
}
func (c *BaseAPIController) prepResponse(response responses.Subsonic) interface{} {
f := c.GetString("f")
if f == "json" {
type jsonWrapper struct{ Subsonic responses.Subsonic `json:"subsonic-response"` }
type jsonWrapper struct {
Subsonic responses.Subsonic `json:"subsonic-response"`
}
return jsonWrapper{Subsonic: response}
}
return response
@ -39,7 +41,9 @@ func (c *BaseAPIController) prepResponse(response responses.Subsonic) interface{
func (c *BaseAPIController) SendResponse(response responses.Subsonic) {
f := c.GetString("f")
if f == "json" {
type jsonWrapper struct{ Subsonic responses.Subsonic `json:"subsonic-response"` }
type jsonWrapper struct {
Subsonic responses.Subsonic `json:"subsonic-response"`
}
w := &jsonWrapper{Subsonic: response}
c.Data["json"] = &w
c.ServeJSON()
@ -48,4 +52,3 @@ func (c *BaseAPIController) SendResponse(response responses.Subsonic) {
c.ServeXML()
}
}

8
api/get_indexes.go
View file

@ -2,12 +2,12 @@ package api
import (
"github.com/astaxie/beego"
"github.com/deluan/gosonic/utils"
"github.com/karlkfi/inject"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/consts"
"strconv"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/utils"
"github.com/karlkfi/inject"
"strconv"
)
type GetIndexesController struct {
@ -42,7 +42,7 @@ func (c *GetIndexesController) Get() {
i, _ := strconv.Atoi(ifModifiedSince)
l, _ := strconv.Atoi(res.LastModified)
if (l > i) {
if l > i {
indexes, err := c.repo.GetAll()
if err != nil {
beego.Error("Error retrieving Indexes:", err)

8
api/get_indexes_test.go
View file

@ -3,14 +3,14 @@ package api_test
import (
"testing"
"github.com/deluan/gosonic/utils"
. "github.com/smartystreets/goconvey/convey"
"github.com/deluan/gosonic/tests"
"encoding/xml"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/consts"
"github.com/deluan/gosonic/tests/mocks"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/tests"
"github.com/deluan/gosonic/tests/mocks"
"github.com/deluan/gosonic/utils"
. "github.com/smartystreets/goconvey/convey"
)
const (

2
api/get_license_test.go
View file

@ -2,9 +2,9 @@ package api_test
import (
"encoding/xml"
"github.com/deluan/gosonic/tests"
. "github.com/smartystreets/goconvey/convey"
"testing"
"github.com/deluan/gosonic/tests"
)
func TestGetLicense(t *testing.T) {

2
api/get_music_folders.go
View file

@ -3,8 +3,8 @@ package api
import (
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/karlkfi/inject"
"github.com/deluan/gosonic/utils"
"github.com/karlkfi/inject"
)
type GetMusicFoldersController struct {

2
api/get_music_folders_test.go
View file

@ -4,8 +4,8 @@ import (
"testing"
"encoding/xml"
. "github.com/smartystreets/goconvey/convey"
"github.com/deluan/gosonic/tests"
. "github.com/smartystreets/goconvey/convey"
)
func TestGetMusicFolders(t *testing.T) {

2
api/ping_test.go
View file

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

3
api/responses/responses.go
View file

@ -19,7 +19,7 @@ type Error struct {
}
type License struct {
XMLName xml.Name `xml:"license" json:"-" json:"-"`
XMLName xml.Name `xml:"license" json:"-"`
Valid bool `xml:"valid,attr" json:"valid"`
}
@ -52,4 +52,3 @@ type Indexes struct {
LastModified string `xml:"lastModified,attr" json:"lastModified"`
IgnoredArticles string `xml:"ignoredArticles,attr" json:"ignoredArticles"`
}

2
api/validation_test.go
View file

@ -3,9 +3,9 @@ package api_test
import (
"encoding/xml"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/tests"
. "github.com/smartystreets/goconvey/convey"
"testing"
"github.com/deluan/gosonic/tests"
)
func TestCheckParams(t *testing.T) {

6
conf/inject_definitions.go
View file

@ -1,12 +1,12 @@
package conf
import (
"github.com/deluan/gosonic/utils"
"github.com/deluan/gosonic/persistence"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/persistence"
"github.com/deluan/gosonic/utils"
)
func init () {
func init() {
utils.DefineSingleton(new(domain.ArtistIndexRepository), persistence.NewArtistIndexRepository)
utils.DefineSingleton(new(domain.PropertyRepository), persistence.NewPropertyRepository)
utils.DefineSingleton(new(domain.MediaFolderRepository), persistence.NewMediaFolderRepository)

8
controllers/main_test.go
View file

@ -1,14 +1,14 @@
package controllers_test
import (
"fmt"
"github.com/astaxie/beego"
_ "github.com/deluan/gosonic/conf"
"github.com/deluan/gosonic/tests"
. "github.com/smartystreets/goconvey/convey"
"testing"
"net/http"
"net/http/httptest"
"github.com/astaxie/beego"
"fmt"
_ "github.com/deluan/gosonic/conf"
"testing"
)
func TestErrorHandler(t *testing.T) {

2
controllers/sync.go
View file

@ -11,5 +11,3 @@ func (c *SyncController) Get() {
scanner.StartImport()
c.Ctx.WriteString("Import started. Check logs")
}

1
domain/artist.go
View file

@ -11,4 +11,3 @@ type ArtistRepository interface {
Get(id string) (*Artist, error)
GetByName(name string) (*Artist, error)
}

2
domain/base.go
View file

@ -3,6 +3,4 @@ package domain
type BaseRepository interface {
NewId(fields ...string) string
CountAll() (int, error)
}

1
domain/index.go
View file

@ -10,7 +10,6 @@ type ArtistIndex struct {
Artists []ArtistInfo
}
type ArtistIndexRepository interface {
BaseRepository
Put(m *ArtistIndex) error

1
domain/media_folder.go
View file

@ -9,4 +9,3 @@ type MediaFolder struct {
type MediaFolderRepository interface {
GetAll() ([]MediaFolder, error)
}

1
domain/property.go
View file

@ -10,4 +10,3 @@ type PropertyRepository interface {
Get(id string) (string, error)
DefaultGet(id string, defaultValue string) (string, error)
}

2
main.go
View file

@ -1,8 +1,8 @@
package main
import (
_ "github.com/deluan/gosonic/conf"
"github.com/astaxie/beego"
_ "github.com/deluan/gosonic/conf"
)
func main() {

1
persistence/artist_repository.go
View file

@ -31,4 +31,3 @@ func (r *artistRepository) GetByName(name string) (*domain.Artist, error) {
id := r.NewId(name)
return r.Get(id)
}

14
persistence/base_repository.go
View file

@ -1,12 +1,12 @@
package persistence
import (
"fmt"
"crypto/md5"
"strings"
"github.com/deluan/gosonic/utils"
"encoding/json"
"fmt"
"github.com/deluan/gosonic/utils"
"reflect"
"strings"
)
type baseRepository struct {
@ -90,7 +90,7 @@ func (r *baseRepository) getFieldKeys(id string) [][]byte {
return fieldKeys
}
func (r*baseRepository) newInstance() interface{} {
func (r *baseRepository) newInstance() interface{} {
return reflect.New(r.entityType).Interface()
}
@ -123,7 +123,7 @@ func (r *baseRepository) toEntity(response [][]byte, entity interface{}) error {
// TODO Optimize it! Probably very slow (and confusing!)
func (r *baseRepository) loadAll(entities interface{}, sortBy string) error {
total, err := r.CountAll()
if (err != nil) {
if err != nil {
return err
}
@ -134,7 +134,7 @@ func (r *baseRepository) loadAll(entities interface{}, sortBy string) error {
}
setName := r.table + "s:all"
response, err := db().XSSort([]byte(setName), 0, 0, true, false, sortKey, r.getFieldKeys("*"))
if (err != nil) {
if err != nil {
return err
}
numFields := len(r.fieldNames)
@ -142,7 +142,7 @@ func (r *baseRepository) loadAll(entities interface{}, sortBy string) error {
start := i * numFields
entity := reflect.New(r.entityType).Interface()
if err := r.toEntity(response[start:start + numFields], entity); err != nil {
if err := r.toEntity(response[start:start+numFields], entity); err != nil {
return err
}
reflected.Set(reflect.Append(reflected, reflect.ValueOf(entity).Elem()))

6
persistence/base_repository_test.go
View file

@ -1,11 +1,11 @@
package persistence
import (
"testing"
. "github.com/smartystreets/goconvey/convey"
"github.com/deluan/gosonic/tests"
"fmt"
"github.com/deluan/gosonic/tests"
. "github.com/smartystreets/goconvey/convey"
"strconv"
"testing"
)
type TestEntity struct {

4
persistence/index_repository.go
View file

@ -1,10 +1,10 @@
package persistence
import (
"github.com/deluan/gosonic/domain"
"errors"
"sort"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/utils"
"sort"
)
type artistIndex struct {

10
persistence/index_repository_test.go
View file

@ -1,11 +1,11 @@
package persistence
import (
"testing"
. "github.com/smartystreets/goconvey/convey"
"github.com/deluan/gosonic/tests"
"github.com/deluan/gosonic/domain"
"strconv"
"github.com/deluan/gosonic/tests"
. "github.com/smartystreets/goconvey/convey"
"strconv"
"testing"
)
func TestIndexRepository(t *testing.T) {
@ -19,7 +19,7 @@ func TestIndexRepository(t *testing.T) {
i := &domain.ArtistIndex{Id: "123"}
repo.Put(i)
s,_ := repo.Get("123")
s, _ := repo.Get("123")
So(s, shouldBeEqual, i)
})

5
persistence/ledis_utils.go
View file

@ -1,10 +1,10 @@
package persistence
import (
"sync"
"github.com/astaxie/beego"
"github.com/siddontang/ledisdb/ledis"
"github.com/siddontang/ledisdb/config"
"github.com/siddontang/ledisdb/ledis"
"sync"
)
var (
@ -28,7 +28,6 @@ func db() *ledis.DB {
return _dbInstance
}
func dropDb() {
db()
_ledisInstance.FlushAll()

3
persistence/media_folders_repository.go
View file

@ -1,8 +1,8 @@
package persistence
import (
"github.com/deluan/gosonic/domain"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/domain"
)
type mediaFolderRepository struct {
@ -13,7 +13,6 @@ func NewMediaFolderRepository() domain.MediaFolderRepository {
return &mediaFolderRepository{}
}
func (*mediaFolderRepository) GetAll() ([]domain.MediaFolder, error) {
mediaFolder := domain.MediaFolder{Id: "0", Name: "iTunes Library", Path: beego.AppConfig.String("musicFolder")}
result := make([]domain.MediaFolder, 1)

4
persistence/property_repository.go
View file

@ -1,8 +1,8 @@
package persistence
import (
"errors"
"github.com/deluan/gosonic/domain"
"errors"
)
type propertyRepository struct {
@ -29,7 +29,7 @@ func (r *propertyRepository) Get(id string) (string, error) {
return rec.(*domain.Property).Value, err
}
func (r*propertyRepository) DefaultGet(id string, defaultValue string) (string, error) {
func (r *propertyRepository) DefaultGet(id string, defaultValue string) (string, error) {
v, err := r.Get(id)
if v == "" {

4
scanner/itunes_scanner.go
View file

@ -7,7 +7,7 @@ import (
"strings"
)
type ItunesScanner struct {}
type ItunesScanner struct{}
func (s *ItunesScanner) LoadFolder(path string) []Track {
xml, _ := os.Open(path)
@ -35,7 +35,7 @@ func (s *ItunesScanner) LoadFolder(path string) []Track {
}
func unescape(s string) string {
s,_ = url.QueryUnescape(s)
s, _ = url.QueryUnescape(s)
return strings.Replace(s, "&", "&", -1)
}

16
scanner/scanner.go
View file

@ -1,14 +1,14 @@
package scanner
import (
"github.com/astaxie/beego"
"github.com/deluan/gosonic/persistence"
"github.com/deluan/gosonic/domain"
"strings"
"github.com/deluan/gosonic/utils"
"github.com/deluan/gosonic/consts"
"time"
"fmt"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/consts"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/persistence"
"github.com/deluan/gosonic/utils"
"strings"
"time"
)
type Scanner interface {
@ -29,7 +29,7 @@ func doImport(mediaFolder string, scanner Scanner) {
beego.Info("Finished importing", len(files), "files")
}
func importLibrary(files []Track) (err error){
func importLibrary(files []Track) (err error) {
indexGroups := utils.ParseIndexGroups(beego.AppConfig.String("indexGroups"))
mfRepo := persistence.NewMediaFileRepository()
albumRepo := persistence.NewAlbumRepository()

10
scanner/scanner_test.go
View file

@ -1,17 +1,17 @@
package scanner
import (
"testing"
. "github.com/smartystreets/goconvey/convey"
"github.com/deluan/gosonic/utils"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/tests"
"github.com/deluan/gosonic/tests"
"github.com/deluan/gosonic/utils"
. "github.com/smartystreets/goconvey/convey"
"testing"
)
func TestCollectIndex(t *testing.T) {
tests.Init(t, false)
ig := utils.IndexGroups{"A":"A", "B":"B", "Tom":"Tom", "X":"X-Z"}
ig := utils.IndexGroups{"A": "A", "B": "B", "Tom": "Tom", "X": "X-Z"}
Convey("Simple Name", t, func() {
a := &domain.Artist{Name: "Björk"}

4
scanner/track.go
View file

@ -18,10 +18,10 @@ type Track struct {
}
func (m *Track) RealArtist() string {
if (m.Compilation) {
if m.Compilation {
return "Various Artists"
}
if (m.AlbumArtist != "") {
if m.AlbumArtist != "" {
return m.AlbumArtist
}
return m.Artist

1
tests/init_tests.go
View file

@ -22,4 +22,3 @@ func Init(t *testing.T, skipOnShort bool) {
beego.SetLevel(beego.LevelError)
}
}

4
tests/mocks/mock_index_repo_tests.go
View file

@ -1,10 +1,10 @@
package mocks
import (
"github.com/deluan/gosonic/domain"
"fmt"
"encoding/json"
"errors"
"fmt"
"github.com/deluan/gosonic/domain"
)
func CreateMockArtistIndexRepo() *MockArtistIndex {

2
utils/index_group_parser.go
View file

@ -13,8 +13,8 @@
package utils
import (
"strings"
"regexp"
"strings"
)
type IndexGroups map[string]string

6
utils/mapping.go
View file

@ -3,8 +3,8 @@
package utils
import (
"strconv"
"encoding/json"
"strconv"
)
const delimiter = "."
@ -110,7 +110,7 @@ func FlattenMap(input map[string]interface{}) (map[string]interface{}, error) {
func ToMap(rec interface{}) (map[string]interface{}, error) {
// Convert to JSON...
b, err := json.Marshal(rec);
b, err := json.Marshal(rec)
if err != nil {
return nil, err
}
@ -123,7 +123,7 @@ func ToMap(rec interface{}) (map[string]interface{}, error) {
func ToStruct(m map[string]interface{}, rec interface{}) error {
// Convert to JSON...
b, err := json.Marshal(m);
b, err := json.Marshal(m)
if err != nil {
return err
}

6
utils/strings.go
View file

@ -1,15 +1,15 @@
package utils
import (
"strings"
"github.com/astaxie/beego"
"strings"
)
func NoArticle(name string) string {
articles := strings.Split(beego.AppConfig.String("ignoredArticles"), " ")
for _, a := range articles {
n := strings.TrimPrefix(name, a + " ")
if (n != name) {
n := strings.TrimPrefix(name, a+" ")
if n != name {
return n
}
}

2
utils/utils_test.go
View file

@ -1,8 +1,8 @@
package utils
import (
"testing"
. "github.com/smartystreets/goconvey/convey"
"testing"
)
func TestParseIndexGroup(t *testing.T) {