From c66c43ecc804128e2d448789666e7e309cb754be Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Thu, 9 Feb 2023 20:14:26 -0800 Subject: [PATCH] update subsonic client library --- backend/albumiterator.go | 2 +- backend/librarymanager.go | 2 +- backend/playbackmanager.go | 2 +- backend/servermanager.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- ui/bottompanel.go | 2 +- ui/browsing/albumpage.go | 2 +- ui/browsing/artistpage.go | 2 +- ui/browsing/artistsgenrespage.go | 2 +- ui/browsing/browsingpane.go | 2 +- ui/browsing/favoritespage.go | 2 +- ui/browsing/genrepage.go | 2 +- ui/browsing/playlistpage.go | 2 +- ui/browsing/playlistspage.go | 2 +- ui/controller/controller.go | 2 +- ui/mainwindow.go | 2 +- ui/widgets/albumcard.go | 2 +- ui/widgets/albumgrid.go | 2 +- ui/widgets/tracklist.go | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/backend/albumiterator.go b/backend/albumiterator.go index 9f3d2bf..8bb12c8 100644 --- a/backend/albumiterator.go +++ b/backend/albumiterator.go @@ -4,7 +4,7 @@ import ( "log" "strconv" - subsonic "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) type AlbumSortOrder string diff --git a/backend/librarymanager.go b/backend/librarymanager.go index e02e6ed..8ad7801 100644 --- a/backend/librarymanager.go +++ b/backend/librarymanager.go @@ -1,7 +1,7 @@ package backend import ( - subsonic "github.com/dweymouth/go-subsonic" + subsonic "github.com/dweymouth/go-subsonic/subsonic" ) type AlbumIterator interface { diff --git a/backend/playbackmanager.go b/backend/playbackmanager.go index 70feab3..94ea457 100644 --- a/backend/playbackmanager.go +++ b/backend/playbackmanager.go @@ -8,7 +8,7 @@ import ( "supersonic/player" "time" - subsonic "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) const ( diff --git a/backend/servermanager.go b/backend/servermanager.go index a973fa9..f71f7e0 100644 --- a/backend/servermanager.go +++ b/backend/servermanager.go @@ -3,7 +3,7 @@ package backend import ( "net/http" - subsonic "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" "github.com/google/uuid" ) diff --git a/go.mod b/go.mod index 86d6d4f..2aa4e7e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( fyne.io/fyne/v2 v2.2.4 github.com/20after4/configdir v0.1.1 - github.com/dweymouth/go-subsonic v0.0.0-20221214005741-bd8048fa1863 + github.com/dweymouth/go-subsonic v0.0.0-20230210015330-4d630f19878e github.com/google/uuid v1.3.0 github.com/pelletier/go-toml v1.9.3 github.com/wildeyedskies/go-mpv v0.0.0-20221204042335-e8961dc66756 diff --git a/go.sum b/go.sum index e97a078..3949cab 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dweymouth/fyne/v2 v2.2.5-0.20230207011038-d2ef06e09a93 h1:4GGNszUwZhcneapbaBO+rbHtmCjKjZXHKPCqFXQPg4E= github.com/dweymouth/fyne/v2 v2.2.5-0.20230207011038-d2ef06e09a93/go.mod h1:MBoGuHzLLSXdQOWFAwWhIhYTEMp33zqtGCReSWhaQTA= -github.com/dweymouth/go-subsonic v0.0.0-20221214005741-bd8048fa1863 h1:bOWMpFJ9zY839T1EngQ5nxVCiMlatPtpGkg/yHK6szg= -github.com/dweymouth/go-subsonic v0.0.0-20221214005741-bd8048fa1863/go.mod h1:fUez6NFiEJiQTZizZ1BThZr5GJXAbigzGYjEPNm4tdI= +github.com/dweymouth/go-subsonic v0.0.0-20230210015330-4d630f19878e h1:+YR9JrwkWxniJ4/TgvSZze2sSC/USdLswAqebmIK3zo= +github.com/dweymouth/go-subsonic v0.0.0-20230210015330-4d630f19878e/go.mod h1:fUez6NFiEJiQTZizZ1BThZr5GJXAbigzGYjEPNm4tdI= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= diff --git a/ui/bottompanel.go b/ui/bottompanel.go index f1f430d..bf00fb5 100644 --- a/ui/bottompanel.go +++ b/ui/bottompanel.go @@ -13,7 +13,7 @@ import ( "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) type BottomPanel struct { diff --git a/ui/browsing/albumpage.go b/ui/browsing/albumpage.go index 9f23e86..315da1f 100644 --- a/ui/browsing/albumpage.go +++ b/ui/browsing/albumpage.go @@ -14,7 +14,7 @@ import ( "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) type AlbumPage struct { diff --git a/ui/browsing/artistpage.go b/ui/browsing/artistpage.go index 36ea5d7..dc1da27 100644 --- a/ui/browsing/artistpage.go +++ b/ui/browsing/artistpage.go @@ -17,7 +17,7 @@ import ( "fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) var _ fyne.Widget = (*ArtistPage)(nil) diff --git a/ui/browsing/artistsgenrespage.go b/ui/browsing/artistsgenrespage.go index c4346eb..4ce0b56 100644 --- a/ui/browsing/artistsgenrespage.go +++ b/ui/browsing/artistsgenrespage.go @@ -11,7 +11,7 @@ import ( "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) var _ fyne.Widget = (*ArtistPage)(nil) diff --git a/ui/browsing/browsingpane.go b/ui/browsing/browsingpane.go index 55a3638..4efed1c 100644 --- a/ui/browsing/browsingpane.go +++ b/ui/browsing/browsingpane.go @@ -11,7 +11,7 @@ import ( "fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) type Page interface { diff --git a/ui/browsing/favoritespage.go b/ui/browsing/favoritespage.go index c5bef14..82e2b3f 100644 --- a/ui/browsing/favoritespage.go +++ b/ui/browsing/favoritespage.go @@ -10,7 +10,7 @@ import ( "fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) type FavoritesPage struct { diff --git a/ui/browsing/genrepage.go b/ui/browsing/genrepage.go index c860e1c..5d68e78 100644 --- a/ui/browsing/genrepage.go +++ b/ui/browsing/genrepage.go @@ -9,7 +9,7 @@ import ( "fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) // TODO: there is a lot of code duplication between this and albumspage. Refactor? diff --git a/ui/browsing/playlistpage.go b/ui/browsing/playlistpage.go index 523b358..159b01a 100644 --- a/ui/browsing/playlistpage.go +++ b/ui/browsing/playlistpage.go @@ -13,7 +13,7 @@ import ( "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) type PlaylistPage struct { diff --git a/ui/browsing/playlistspage.go b/ui/browsing/playlistspage.go index 581bf82..95af201 100644 --- a/ui/browsing/playlistspage.go +++ b/ui/browsing/playlistspage.go @@ -11,7 +11,7 @@ import ( "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) type PlaylistsPage struct { diff --git a/ui/controller/controller.go b/ui/controller/controller.go index 20326ca..857fd1c 100644 --- a/ui/controller/controller.go +++ b/ui/controller/controller.go @@ -10,7 +10,7 @@ import ( "fyne.io/fyne/v2" "fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) type Controller struct { diff --git a/ui/mainwindow.go b/ui/mainwindow.go index a24b283..399ad14 100644 --- a/ui/mainwindow.go +++ b/ui/mainwindow.go @@ -12,7 +12,7 @@ import ( "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/driver/desktop" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) var ( diff --git a/ui/widgets/albumcard.go b/ui/widgets/albumcard.go index d869159..00ad8a4 100644 --- a/ui/widgets/albumcard.go +++ b/ui/widgets/albumcard.go @@ -14,7 +14,7 @@ import ( "fyne.io/fyne/v2/driver/desktop" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) var _ fyne.Widget = (*AlbumCard)(nil) diff --git a/ui/widgets/albumgrid.go b/ui/widgets/albumgrid.go index 194692b..2c48684 100644 --- a/ui/widgets/albumgrid.go +++ b/ui/widgets/albumgrid.go @@ -8,7 +8,7 @@ import ( "fyne.io/fyne/v2" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) const albumFetchBatchSize = 6 diff --git a/ui/widgets/tracklist.go b/ui/widgets/tracklist.go index 654c7aa..16dcd03 100644 --- a/ui/widgets/tracklist.go +++ b/ui/widgets/tracklist.go @@ -13,7 +13,7 @@ import ( "fyne.io/fyne/v2/driver/desktop" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" - "github.com/dweymouth/go-subsonic" + "github.com/dweymouth/go-subsonic/subsonic" ) type TrackRow struct {