From faa03a6a6d70979e101f6edd19855fab44ff47de Mon Sep 17 00:00:00 2001 From: Fabio Falci Date: Fri, 27 Jan 2017 21:03:19 +0000 Subject: [PATCH] Use forked go-libspotify with WIP go pointer fix --- glide.lock | 12 ++++++------ glide.yaml | 10 +++++++++- sconsify/track.go | 2 +- spotify/portaudio.go | 2 +- spotify/spotify.go | 2 +- spotify/spotify_actions.go | 2 +- spotify/spotify_playlists.go | 5 ++--- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/glide.lock b/glide.lock index 362d8cb..9178812 100644 --- a/glide.lock +++ b/glide.lock @@ -1,8 +1,12 @@ -hash: b29af25b2d97b9befda3c0e78bfca97a8838b360ed44edaf57b4bc0e79e75b7a -updated: 2017-01-07T21:41:46.397527876Z +hash: b702f64c106c4a73675fe7b155fd3b09eea41319b170a47a2cda01edf12b4d20 +updated: 2017-01-27T20:59:47.060863597Z imports: - name: github.com/fabiofalci/flagrc version: 748e1426fdbd210e5ff8caf145546de70b559f28 +- name: github.com/fabiofalci/go-libspotify + version: fbe297fba0309063d327bd290b0ed3a6e07f98c2 + subpackages: + - spotify - name: github.com/golang/protobuf version: 552c7b9542c194800fd493123b3798ef0a832032 subpackages: @@ -19,10 +23,6 @@ imports: version: 981ab348d865cf048eb7d17e78ac7192632d8415 - name: github.com/nsf/termbox-go version: 362329b0aa6447eadd52edd8d660ec1dff470295 -- name: github.com/op/go-libspotify - version: 12dd11fb33ecf760c356b65dc1116bc92589dea4 - subpackages: - - spotify - name: github.com/zmb3/spotify version: 6de95a1b7a3de7283fc9343bba5b495d7a383b85 - name: golang.org/x/crypto diff --git a/glide.yaml b/glide.yaml index 6dc4796..52a6288 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,14 +1,22 @@ package: github.com/fabiofalci/sconsify import: - package: github.com/fabiofalci/flagrc + version: 748e1426fdbd210e5ff8caf145546de70b559f28 - package: github.com/howeyc/gopass + version: c89a32868e47b1b7ef388b4d94318b359506400a - package: github.com/jroimartin/gocui + version: a8eba6db38c8459e1bbccfe38359b0405084a4f2 - package: github.com/mitchellh/go-homedir -- package: github.com/op/go-libspotify + version: 981ab348d865cf048eb7d17e78ac7192632d8415 +- package: github.com/fabiofalci/go-libspotify + version: fbe297fba0309063d327bd290b0ed3a6e07f98c2 subpackages: - spotify - package: github.com/zmb3/spotify + version: 6de95a1b7a3de7283fc9343bba5b495d7a383b85 - package: golang.org/x/oauth2 + version: 2cd4472c321b6cba78e029d99f0e7fe51032fd21 - package: gopkg.in/vmihailenco/msgpack.v2 + version: 775d4b0cf44d799d42a1f6fded02252340f4e33d - package: github.com/gordonklaus/portaudio version: 2a038c93424fb36d026982db9fd365504a49f566 diff --git a/sconsify/track.go b/sconsify/track.go index 0d6e265..a545348 100644 --- a/sconsify/track.go +++ b/sconsify/track.go @@ -3,7 +3,7 @@ package sconsify import ( "fmt" - sp "github.com/op/go-libspotify/spotify" + sp "github.com/fabiofalci/go-libspotify/spotify" ) type Track struct { diff --git a/spotify/portaudio.go b/spotify/portaudio.go index 4584b28..03bf5b6 100644 --- a/spotify/portaudio.go +++ b/spotify/portaudio.go @@ -2,8 +2,8 @@ package spotify import ( + sp "github.com/fabiofalci/go-libspotify/spotify" "github.com/gordonklaus/portaudio" - sp "github.com/op/go-libspotify/spotify" ) type audio struct { diff --git a/spotify/spotify.go b/spotify/spotify.go index 92d4b2d..df58c2e 100644 --- a/spotify/spotify.go +++ b/spotify/spotify.go @@ -5,11 +5,11 @@ import ( "fmt" "time" + sp "github.com/fabiofalci/go-libspotify/spotify" "github.com/fabiofalci/sconsify/infrastructure" "github.com/fabiofalci/sconsify/sconsify" "github.com/fabiofalci/sconsify/webapi" "github.com/gordonklaus/portaudio" - sp "github.com/op/go-libspotify/spotify" webspotify "github.com/zmb3/spotify" ) diff --git a/spotify/spotify_actions.go b/spotify/spotify_actions.go index b70abe2..456ce57 100644 --- a/spotify/spotify_actions.go +++ b/spotify/spotify_actions.go @@ -1,9 +1,9 @@ package spotify import ( + sp "github.com/fabiofalci/go-libspotify/spotify" "github.com/fabiofalci/sconsify/infrastructure" "github.com/fabiofalci/sconsify/sconsify" - sp "github.com/op/go-libspotify/spotify" webspotify "github.com/zmb3/spotify" "strings" "time" diff --git a/spotify/spotify_playlists.go b/spotify/spotify_playlists.go index 5536fd1..2221e5e 100644 --- a/spotify/spotify_playlists.go +++ b/spotify/spotify_playlists.go @@ -4,15 +4,14 @@ import ( "errors" "strings" + "fmt" + sp "github.com/fabiofalci/go-libspotify/spotify" "github.com/fabiofalci/sconsify/infrastructure" "github.com/fabiofalci/sconsify/sconsify" - sp "github.com/op/go-libspotify/spotify" webspotify "github.com/zmb3/spotify" "strconv" - "fmt" ) - func (spotify *Spotify) initPlaylist() error { playlists := sconsify.InitPlaylists()