From 0e9a8fc38b19757cb7041485b129da53d7bac2bb Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Tue, 6 Aug 2024 20:30:44 -0700 Subject: [PATCH] change module locations --- backend/mediaprovider/subsonic/albumiterator.go | 2 +- backend/mediaprovider/subsonic/artistiterator.go | 2 +- backend/mediaprovider/subsonic/searchall.go | 2 +- backend/mediaprovider/subsonic/searchiterbase.go | 2 +- backend/mediaprovider/subsonic/subsonicmediaprovider.go | 2 +- backend/mediaprovider/subsonic/subsonicserver.go | 2 +- backend/mediaprovider/subsonic/trackiterator.go | 2 +- backend/player/mpv/peaks.go | 2 +- backend/player/mpv/player.go | 2 +- backend/servermanager.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/backend/mediaprovider/subsonic/albumiterator.go b/backend/mediaprovider/subsonic/albumiterator.go index de539cd..ad44c6d 100644 --- a/backend/mediaprovider/subsonic/albumiterator.go +++ b/backend/mediaprovider/subsonic/albumiterator.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" - "github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/supersonic/backend/mediaprovider" "github.com/dweymouth/supersonic/backend/mediaprovider/helpers" "github.com/dweymouth/supersonic/sharedutil" + "github.com/supersonic-app/go-subsonic/subsonic" ) func (s *subsonicMediaProvider) AlbumSortOrders() []string { diff --git a/backend/mediaprovider/subsonic/artistiterator.go b/backend/mediaprovider/subsonic/artistiterator.go index 987795b..e02d97d 100644 --- a/backend/mediaprovider/subsonic/artistiterator.go +++ b/backend/mediaprovider/subsonic/artistiterator.go @@ -8,10 +8,10 @@ import ( "golang.org/x/text/collate" "golang.org/x/text/language" - "github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/supersonic/backend/mediaprovider" "github.com/dweymouth/supersonic/backend/mediaprovider/helpers" "github.com/dweymouth/supersonic/sharedutil" + "github.com/supersonic-app/go-subsonic/subsonic" ) func (s *subsonicMediaProvider) ArtistSortOrders() []string { diff --git a/backend/mediaprovider/subsonic/searchall.go b/backend/mediaprovider/subsonic/searchall.go index 7a9d95a..ffb099f 100644 --- a/backend/mediaprovider/subsonic/searchall.go +++ b/backend/mediaprovider/subsonic/searchall.go @@ -6,10 +6,10 @@ import ( "sync" "github.com/deluan/sanitize" - "github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/supersonic/backend/mediaprovider" "github.com/dweymouth/supersonic/backend/mediaprovider/helpers" "github.com/dweymouth/supersonic/sharedutil" + "github.com/supersonic-app/go-subsonic/subsonic" ) func (s *subsonicMediaProvider) SearchAll(searchQuery string, maxResults int) ([]*mediaprovider.SearchResult, error) { diff --git a/backend/mediaprovider/subsonic/searchiterbase.go b/backend/mediaprovider/subsonic/searchiterbase.go index b423dda..d7ffc1a 100644 --- a/backend/mediaprovider/subsonic/searchiterbase.go +++ b/backend/mediaprovider/subsonic/searchiterbase.go @@ -4,7 +4,7 @@ import ( "log" "strconv" - "github.com/dweymouth/go-subsonic/subsonic" + "github.com/supersonic-app/go-subsonic/subsonic" ) type searchIterBase struct { diff --git a/backend/mediaprovider/subsonic/subsonicmediaprovider.go b/backend/mediaprovider/subsonic/subsonicmediaprovider.go index 6072a4f..9dc7df5 100644 --- a/backend/mediaprovider/subsonic/subsonicmediaprovider.go +++ b/backend/mediaprovider/subsonic/subsonicmediaprovider.go @@ -12,10 +12,10 @@ import ( "sync" "time" - "github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/supersonic/backend/mediaprovider" "github.com/dweymouth/supersonic/backend/mediaprovider/helpers" "github.com/dweymouth/supersonic/sharedutil" + "github.com/supersonic-app/go-subsonic/subsonic" ) const ( diff --git a/backend/mediaprovider/subsonic/subsonicserver.go b/backend/mediaprovider/subsonic/subsonicserver.go index b64fe07..d86be26 100644 --- a/backend/mediaprovider/subsonic/subsonicserver.go +++ b/backend/mediaprovider/subsonic/subsonicserver.go @@ -1,8 +1,8 @@ package subsonic import ( - subsonicCli "github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/supersonic/backend/mediaprovider" + subsonicCli "github.com/supersonic-app/go-subsonic/subsonic" ) type SubsonicServer struct { diff --git a/backend/mediaprovider/subsonic/trackiterator.go b/backend/mediaprovider/subsonic/trackiterator.go index 8179bb4..8c77e42 100644 --- a/backend/mediaprovider/subsonic/trackiterator.go +++ b/backend/mediaprovider/subsonic/trackiterator.go @@ -3,8 +3,8 @@ package subsonic import ( "log" - "github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/supersonic/backend/mediaprovider" + "github.com/supersonic-app/go-subsonic/subsonic" ) func (s *subsonicMediaProvider) IterateTracks(searchQuery string) mediaprovider.TrackIterator { diff --git a/backend/player/mpv/peaks.go b/backend/player/mpv/peaks.go index e2bbbd3..afc8722 100644 --- a/backend/player/mpv/peaks.go +++ b/backend/player/mpv/peaks.go @@ -4,7 +4,7 @@ package mpv // int mpv_get_peaks(mpv_handle* handle, double* lPeak, double* rPeak, double* lRMS, double* rRMS); import "C" import ( - "github.com/dweymouth/go-mpv" + "github.com/supersonic-app/go-mpv" ) // rather than querying peaks through m.mpv.GetProperty which necessitates diff --git a/backend/player/mpv/player.go b/backend/player/mpv/player.go index 30feef4..076f83f 100644 --- a/backend/player/mpv/player.go +++ b/backend/player/mpv/player.go @@ -7,7 +7,7 @@ import ( "math" "strconv" - "github.com/dweymouth/go-mpv" + "github.com/supersonic-app/go-mpv" "github.com/dweymouth/supersonic/backend/player" ) diff --git a/backend/servermanager.go b/backend/servermanager.go index 23ccfeb..627b316 100644 --- a/backend/servermanager.go +++ b/backend/servermanager.go @@ -9,12 +9,12 @@ import ( "time" "github.com/dweymouth/go-jellyfin" - "github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/supersonic/backend/mediaprovider" jellyfinMP "github.com/dweymouth/supersonic/backend/mediaprovider/jellyfin" subsonicMP "github.com/dweymouth/supersonic/backend/mediaprovider/subsonic" "github.com/dweymouth/supersonic/res" "github.com/google/uuid" + "github.com/supersonic-app/go-subsonic/subsonic" "github.com/zalando/go-keyring" ) diff --git a/go.mod b/go.mod index a472350..6b3a8fd 100644 --- a/go.mod +++ b/go.mod @@ -12,12 +12,12 @@ require ( github.com/dweymouth/fyne-lyrics v0.0.0-20240528234907-15eee7ce5e64 github.com/dweymouth/fyne-tooltip v0.2.0 github.com/dweymouth/go-jellyfin v0.0.0-20240517151952-5ceca61cb645 - github.com/dweymouth/go-mpv v0.0.0-20240807015218-e559655c9879 - github.com/dweymouth/go-subsonic v0.0.0-20240726004217-2e8e348ad417 github.com/godbus/dbus/v5 v5.1.0 github.com/google/uuid v1.3.0 github.com/pelletier/go-toml/v2 v2.0.8 github.com/quarckster/go-mpris-server v1.0.3 + github.com/supersonic-app/go-mpv v0.1.0 + github.com/supersonic-app/go-subsonic v0.0.0-20240807031555-2cb1ccd78f85 github.com/zalando/go-keyring v0.2.1 golang.org/x/net v0.25.0 golang.org/x/text v0.16.0 diff --git a/go.sum b/go.sum index f75ba99..bf5e9fd 100644 --- a/go.sum +++ b/go.sum @@ -85,10 +85,6 @@ github.com/dweymouth/fyne/v2 v2.3.0-rc1.0.20240805144743-24df77c3cc7e h1:FSTLNY9 github.com/dweymouth/fyne/v2 v2.3.0-rc1.0.20240805144743-24df77c3cc7e/go.mod h1:9D4oT3NWeG+MLi/lP7ItZZyujHC/qqMJpoGTAYX5Uqc= github.com/dweymouth/go-jellyfin v0.0.0-20240517151952-5ceca61cb645 h1:KzqSaQwG3HsTZQlEtkp0BeUy9vmYZ0rq0B15qIPSiBs= github.com/dweymouth/go-jellyfin v0.0.0-20240517151952-5ceca61cb645/go.mod h1:fcUagHBaQnt06GmBAllNE0J4O/7064zXRWdqnTTtVjI= -github.com/dweymouth/go-mpv v0.0.0-20240807015218-e559655c9879 h1:5wQ4/CKwzS4xOmoD++7vzXpTDNEs0mtQK/3uEIrzTEs= -github.com/dweymouth/go-mpv v0.0.0-20240807015218-e559655c9879/go.mod h1:Ov0ieN90M7i+0k3OxhA/g1dozGs+UcPHDsMKqPgRDk0= -github.com/dweymouth/go-subsonic v0.0.0-20240726004217-2e8e348ad417 h1:VVVqQvHwm2K3+h8z4Tw3jYIDKETpEMR++XICdJDx0pE= -github.com/dweymouth/go-subsonic v0.0.0-20240726004217-2e8e348ad417/go.mod h1:OWtcumdQsan8uM6wmx6PqKhldaCthH10CQ+vb+94kzo= 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= @@ -313,6 +309,10 @@ github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/supersonic-app/go-mpv v0.1.0 h1:U+cCnLQxmpqx5mY6nMlC0J4uIdCCXUbAjpjS04XkFu8= +github.com/supersonic-app/go-mpv v0.1.0/go.mod h1:1bQz6kBQumJopXEbkiqoLxIXLy7F7yWFBvknvpAtIC0= +github.com/supersonic-app/go-subsonic v0.0.0-20240807031555-2cb1ccd78f85 h1:7PpVvIoF3kUQwqRyIJcKJui8VxbkLzqWH+Ysw1g84tU= +github.com/supersonic-app/go-subsonic v0.0.0-20240807031555-2cb1ccd78f85/go.mod h1:D+OWPXeD9owcdcoXATv5YPBGWxxVvn5k98rt5B4wMc4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=