diff --git a/.gitignore b/.gitignore index 9fc24b7..daa3045 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .vscode config.toml log/* +go.sum diff --git a/app/config.go b/app/config.go index cd58e52..69c68ac 100644 --- a/app/config.go +++ b/app/config.go @@ -1,10 +1,11 @@ package app import ( - "github.com/theherk/viper" "log" "path/filepath" "strings" + + "github.com/spf13/viper" ) // Initialize config.toml config. Fatal if not exist. diff --git a/app/temp.go b/app/temp.go index 0574f00..53f3489 100644 --- a/app/temp.go +++ b/app/temp.go @@ -1,13 +1,14 @@ package app import ( - "xiamiToLastfm/xiami" - "os" - "encoding/json" - "log" - "fmt" "bufio" + "encoding/json" "errors" + "fmt" + "log" + "os" + + "xiamiToLastfm/xiami" ) var file = "temp.txt" diff --git a/app/temp_test.go b/app/temp_test.go index 6e9373f..2ab9082 100644 --- a/app/temp_test.go +++ b/app/temp_test.go @@ -2,8 +2,9 @@ package app import ( "testing" - "xiamiToLastfm/xiami" + "github.com/stretchr/testify/assert" + "xiamiToLastfm/xiami" ) func TestTempStore(t *testing.T) { diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..bfebbe8 --- /dev/null +++ b/go.mod @@ -0,0 +1,9 @@ +module xiamiToLastfm + +go 1.14 + +require ( + github.com/PuerkitoBio/goquery v1.6.0 + github.com/spf13/viper v1.7.1 + github.com/stretchr/testify v1.6.1 +) diff --git a/lastfm/auth.go b/lastfm/auth.go index 4eb2eb6..551fa98 100644 --- a/lastfm/auth.go +++ b/lastfm/auth.go @@ -13,7 +13,7 @@ import ( "sort" "time" - "github.com/theherk/viper" + "github.com/spf13/viper" ) var ( diff --git a/lastfm/lastfm.go b/lastfm/lastfm.go index 37e33ed..666a15a 100644 --- a/lastfm/lastfm.go +++ b/lastfm/lastfm.go @@ -9,8 +9,9 @@ import ( "net/http" "net/url" "os" - "xiamiToLastfm/xiami" + "xiamiToLastfm/musicbrainz" + "xiamiToLastfm/xiami" ) // QuitChan: an empty channel used to signal main channel to stop. diff --git a/main.go b/main.go index 7008b4b..132e91c 100644 --- a/main.go +++ b/main.go @@ -1,18 +1,18 @@ package main import ( + "flag" "fmt" + "log" "os" "os/signal" "syscall" "time" - "log" - "flag" + "github.com/spf13/viper" "xiamiToLastfm/app" "xiamiToLastfm/lastfm" "xiamiToLastfm/xiami" - "github.com/theherk/viper" ) var debug bool diff --git a/musicbrainz/mbid.go b/musicbrainz/mbid.go index 786ff86..c42c142 100644 --- a/musicbrainz/mbid.go +++ b/musicbrainz/mbid.go @@ -1,13 +1,14 @@ package musicbrainz import ( + "encoding/xml" "fmt" - "net/url" + "io/ioutil" "log" "net/http" - "io/ioutil" - "encoding/xml" - "github.com/theherk/viper" + "net/url" + + "github.com/spf13/viper" ) // get record's MBID from its title, artist and album. diff --git a/musicbrainz/mbid_test.go b/musicbrainz/mbid_test.go index 1cb48bb..76f07f7 100644 --- a/musicbrainz/mbid_test.go +++ b/musicbrainz/mbid_test.go @@ -2,6 +2,7 @@ package musicbrainz import ( "testing" + "github.com/stretchr/testify/assert" ) diff --git a/xiami/xiami.go b/xiami/xiami.go index 934fb5e..544eaf6 100644 --- a/xiami/xiami.go +++ b/xiami/xiami.go @@ -12,7 +12,7 @@ import ( "time" "github.com/PuerkitoBio/goquery" - "github.com/theherk/viper" + "github.com/spf13/viper" ) const ( diff --git a/xiami/xiami_test.go b/xiami/xiami_test.go index f292def..cd6ae8d 100644 --- a/xiami/xiami_test.go +++ b/xiami/xiami_test.go @@ -27,6 +27,6 @@ func TestGetAlbum(t *testing.T) { url := "https://www.xiami.com/song/mSJtnV7aa77?spm=a1z1s.6626017.0.0.nGwy1E" artist, album, ok := album(url) assert.True(t, ok) - assert.Equal(t, "川井憲次" ,artist) - assert.Equal(t, "NHKスペシャル「人体 神秘の巨大ネットワーク」オリジナル・サウンドトラック" ,album) + assert.Equal(t, "川井憲次", artist) + assert.Equal(t, "NHKスペシャル「人体 神秘の巨大ネットワーク」オリジナル・サウンドトラック", album) } diff --git a/xiami_test.go b/xiami_test.go index 0eb5f9a..45e47d3 100644 --- a/xiami_test.go +++ b/xiami_test.go @@ -2,12 +2,13 @@ package main import ( "testing" - "xiamiToLastfm/xiami" + "xiamiToLastfm/app" + "xiamiToLastfm/xiami" ) func TestGetTracks(t *testing.T) { - app.InitConfig() + app.InitConfig("config.toml") xiami.Init() nowPlayingChan := make(chan xiami.Track)