diff --git a/README.md b/README.md index b690b6620..13ef2c92a 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ environment.systemPackages = [ **Go** ```sh -go install github.com/bjarneo/cliamp@latest +go install github.com/bjarneo/cliamp/v2@latest ``` Install ALSA development headers before you build on Linux. See [Building from source](#building-from-source). diff --git a/cmd/history.go b/cmd/history.go index 3fc52b6db..96ae563b5 100644 --- a/cmd/history.go +++ b/cmd/history.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/bjarneo/cliamp/history" + "github.com/bjarneo/cliamp/v2/history" ) // HistoryShow prints recently played tracks, newest first. limit <= 0 prints all. diff --git a/cmd/history_test.go b/cmd/history_test.go index 2b36577c2..d0ebdcc16 100644 --- a/cmd/history_test.go +++ b/cmd/history_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestWriteHistory(t *testing.T) { diff --git a/cmd/playlist.go b/cmd/playlist.go index 484295faf..df3d8fce3 100644 --- a/cmd/playlist.go +++ b/cmd/playlist.go @@ -14,12 +14,12 @@ import ( "sort" "strings" - "github.com/bjarneo/cliamp/external/local" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/internal/sshurl" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/external/local" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/internal/sshurl" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/resolve" ) // PlaylistList prints all playlists with their track counts. diff --git a/cmd/playlist_enrich_test.go b/cmd/playlist_enrich_test.go index 6e2b6d83f..ea793c2f6 100644 --- a/cmd/playlist_enrich_test.go +++ b/cmd/playlist_enrich_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" ) // fakeFFprobe puts an ffprobe script first on PATH. The script appends its diff --git a/cmd/playlist_ops_test.go b/cmd/playlist_ops_test.go index 1ddb89928..1daa03373 100644 --- a/cmd/playlist_ops_test.go +++ b/cmd/playlist_ops_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/playlist" ) // captureStdout runs fn with os.Stdout redirected to a buffer and returns what diff --git a/cmd/protocol_test.go b/cmd/protocol_test.go index 224105e0f..286bebe8c 100644 --- a/cmd/protocol_test.go +++ b/cmd/protocol_test.go @@ -3,7 +3,7 @@ package cmd import ( "testing" - "github.com/bjarneo/cliamp/internal/deeplink" + "github.com/bjarneo/cliamp/v2/internal/deeplink" ) // TestSchemeMatches keeps the registered scheme and the parsed scheme in step. diff --git a/cmd/radio.go b/cmd/radio.go index bae378ff1..768cf2da4 100644 --- a/cmd/radio.go +++ b/cmd/radio.go @@ -16,8 +16,8 @@ import ( "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/resolve" ) // statsTimeout bounds one round of statistics requests. diff --git a/cmd/radio_globe.go b/cmd/radio_globe.go index 7a4458215..0be08ccf3 100644 --- a/cmd/radio_globe.go +++ b/cmd/radio_globe.go @@ -16,12 +16,12 @@ import ( "charm.land/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/internal/globe" - "github.com/bjarneo/cliamp/internal/worldmap" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/internal/globe" + "github.com/bjarneo/cliamp/v2/internal/worldmap" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" ) const ( diff --git a/cmd/radio_test.go b/cmd/radio_test.go index f1bfbbc85..a9c5a0e91 100644 --- a/cmd/radio_test.go +++ b/cmd/radio_test.go @@ -8,10 +8,10 @@ import ( tea "charm.land/bubbletea/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/internal/worldmap" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/internal/worldmap" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" ) func sampleSummary() radio.Summary { diff --git a/cmd/setup.go b/cmd/setup.go index 59e938b2d..3c7dace7e 100644 --- a/cmd/setup.go +++ b/cmd/setup.go @@ -24,16 +24,16 @@ import ( tea "charm.land/bubbletea/v2" "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/external/audiobookshelf" - "github.com/bjarneo/cliamp/external/bandcamp" - "github.com/bjarneo/cliamp/external/emby" - "github.com/bjarneo/cliamp/external/jellyfin" - "github.com/bjarneo/cliamp/external/lyrion" - "github.com/bjarneo/cliamp/external/mixcloud" - "github.com/bjarneo/cliamp/external/navidrome" - "github.com/bjarneo/cliamp/external/netease" - "github.com/bjarneo/cliamp/external/plex" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/external/audiobookshelf" + "github.com/bjarneo/cliamp/v2/external/bandcamp" + "github.com/bjarneo/cliamp/v2/external/emby" + "github.com/bjarneo/cliamp/v2/external/jellyfin" + "github.com/bjarneo/cliamp/v2/external/lyrion" + "github.com/bjarneo/cliamp/v2/external/mixcloud" + "github.com/bjarneo/cliamp/v2/external/navidrome" + "github.com/bjarneo/cliamp/v2/external/netease" + "github.com/bjarneo/cliamp/v2/external/plex" ) // Setup launches the interactive wizard. Returns nil on clean exit. diff --git a/cmd/setup_roundtrip_test.go b/cmd/setup_roundtrip_test.go index 0d427b667..d17abe13c 100644 --- a/cmd/setup_roundtrip_test.go +++ b/cmd/setup_roundtrip_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/bjarneo/cliamp/config" + "github.com/bjarneo/cliamp/v2/config" ) // TestSetupBodyRoundTrip saves each provider body with values that need diff --git a/cmd/setup_save_test.go b/cmd/setup_save_test.go index df0ae98b8..cf984dc85 100644 --- a/cmd/setup_save_test.go +++ b/cmd/setup_save_test.go @@ -9,7 +9,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/config" + "github.com/bjarneo/cliamp/v2/config" ) // TestSetupRewriteKeepsUserLines runs setup over an existing config file and diff --git a/commands.go b/commands.go index 7d29f39d1..4e0d8f766 100644 --- a/commands.go +++ b/commands.go @@ -13,22 +13,22 @@ import ( cli "github.com/urfave/cli/v3" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/cmd" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/external/bandcamp" - "github.com/bjarneo/cliamp/external/qobuz" - "github.com/bjarneo/cliamp/external/spotify" - "github.com/bjarneo/cliamp/external/tidal" - "github.com/bjarneo/cliamp/external/ytmusic" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/pluginmgr" - "github.com/bjarneo/cliamp/resolve" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" - "github.com/bjarneo/cliamp/upgrade" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/cmd" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/external/bandcamp" + "github.com/bjarneo/cliamp/v2/external/qobuz" + "github.com/bjarneo/cliamp/v2/external/spotify" + "github.com/bjarneo/cliamp/v2/external/tidal" + "github.com/bjarneo/cliamp/v2/external/ytmusic" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/pluginmgr" + "github.com/bjarneo/cliamp/v2/resolve" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" + "github.com/bjarneo/cliamp/v2/upgrade" ) func buildApp() *cli.Command { diff --git a/commands_test.go b/commands_test.go index 98b0afd85..fa5cce90a 100644 --- a/commands_test.go +++ b/commands_test.go @@ -18,10 +18,10 @@ import ( cli "github.com/urfave/cli/v3" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/resolve" - "github.com/bjarneo/cliamp/theme" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/resolve" + "github.com/bjarneo/cliamp/v2/theme" ) func TestInverseBoolFlags(t *testing.T) { diff --git a/config/config.go b/config/config.go index 4b553cb5c..815cc6521 100644 --- a/config/config.go +++ b/config/config.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/fileutil" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/fileutil" ) // maxVisRows caps the configurable visualizer height. The layout shrinks the diff --git a/docs_providers_test.go b/docs_providers_test.go index 64025965b..06f7e9fb0 100644 --- a/docs_providers_test.go +++ b/docs_providers_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // everyProviderConfig enables every provider that needs no external tool. diff --git a/external/audiobookshelf/client.go b/external/audiobookshelf/client.go index 7f68f339b..a8c239249 100644 --- a/external/audiobookshelf/client.go +++ b/external/audiobookshelf/client.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/netdiag" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/netdiag" ) var defaultHTTPClient = httpclient.NewAPI(30 * time.Second) diff --git a/external/audiobookshelf/client_test.go b/external/audiobookshelf/client_test.go index 653145127..6af1582e3 100644 --- a/external/audiobookshelf/client_test.go +++ b/external/audiobookshelf/client_test.go @@ -13,8 +13,8 @@ import ( "syscall" "testing" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/netdiag" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/netdiag" ) type roundTripFunc func(*http.Request) (*http.Response, error) diff --git a/external/audiobookshelf/provider.go b/external/audiobookshelf/provider.go index d1627a318..451820469 100644 --- a/external/audiobookshelf/provider.go +++ b/external/audiobookshelf/provider.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) var ( diff --git a/external/audiobookshelf/provider_test.go b/external/audiobookshelf/provider_test.go index fd1183ffa..2c76878d7 100644 --- a/external/audiobookshelf/provider_test.go +++ b/external/audiobookshelf/provider_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func mockProvider(fn roundTripFunc) *Provider { diff --git a/external/bandcamp/probe.go b/external/bandcamp/probe.go index b215692eb..79e27bb0e 100644 --- a/external/bandcamp/probe.go +++ b/external/bandcamp/probe.go @@ -9,9 +9,9 @@ import ( "net/url" "time" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/subsonicapi" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/subsonicapi" ) // Probe runs a sanitized diagnostic sweep against Bandcamp's Subsonic beta diff --git a/external/bandcamp/provider.go b/external/bandcamp/provider.go index 34afff088..2cfe4b0ca 100644 --- a/external/bandcamp/provider.go +++ b/external/bandcamp/provider.go @@ -28,11 +28,11 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/internal/subsonicapi" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/internal/subsonicapi" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // Compile-time checks for the interfaces Provider overrides. The browse, diff --git a/external/bandcamp/provider_test.go b/external/bandcamp/provider_test.go index 30fa35263..03970eec6 100644 --- a/external/bandcamp/provider_test.go +++ b/external/bandcamp/provider_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/internal/subsonicapi" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/internal/subsonicapi" + "github.com/bjarneo/cliamp/v2/playlist" ) // fakeServer serves the endpoints the provider uses. failPlaylists and diff --git a/external/emby/client.go b/external/emby/client.go index 430f8587c..e10b96cef 100644 --- a/external/emby/client.go +++ b/external/emby/client.go @@ -2,7 +2,7 @@ // Emby server and exposes it as a playlist provider. package emby -import "github.com/bjarneo/cliamp/internal/embyapi" +import "github.com/bjarneo/cliamp/v2/internal/embyapi" // Client aliases the shared embyapi type so external callers keep using // emby.Client. diff --git a/external/emby/provider.go b/external/emby/provider.go index 1fc1b5ff2..7891cf47a 100644 --- a/external/emby/provider.go +++ b/external/emby/provider.go @@ -1,9 +1,9 @@ package emby import ( - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/internal/embyapi" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/internal/embyapi" + "github.com/bjarneo/cliamp/v2/provider" ) var ( diff --git a/external/emby/provider_test.go b/external/emby/provider_test.go index 1d85dcc33..ff809ab75 100644 --- a/external/emby/provider_test.go +++ b/external/emby/provider_test.go @@ -3,9 +3,9 @@ package emby import ( "testing" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // The shared provider body is tested in internal/embyapi. These tests cover diff --git a/external/jellyfin/client.go b/external/jellyfin/client.go index 42eaf1769..a1c61fdaf 100644 --- a/external/jellyfin/client.go +++ b/external/jellyfin/client.go @@ -2,7 +2,7 @@ // to a Jellyfin server and exposes it as a playlist provider. package jellyfin -import "github.com/bjarneo/cliamp/internal/embyapi" +import "github.com/bjarneo/cliamp/v2/internal/embyapi" // Client aliases the shared embyapi type so external callers keep using // jellyfin.Client. diff --git a/external/jellyfin/provider.go b/external/jellyfin/provider.go index 9dd9f845d..e90545407 100644 --- a/external/jellyfin/provider.go +++ b/external/jellyfin/provider.go @@ -1,9 +1,9 @@ package jellyfin import ( - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/internal/embyapi" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/internal/embyapi" + "github.com/bjarneo/cliamp/v2/provider" ) var ( diff --git a/external/jellyfin/provider_test.go b/external/jellyfin/provider_test.go index f03245a8e..3e1735fb3 100644 --- a/external/jellyfin/provider_test.go +++ b/external/jellyfin/provider_test.go @@ -3,9 +3,9 @@ package jellyfin import ( "testing" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // The shared provider body is tested in internal/embyapi. These tests cover diff --git a/external/local/bookmark_migration.go b/external/local/bookmark_migration.go index be96f1a9d..ed79414fe 100644 --- a/external/local/bookmark_migration.go +++ b/external/local/bookmark_migration.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/playlist" ) // bookmarksMigratedFile records that MigrateBookmarks ran. It is kept next to diff --git a/external/local/bookmark_migration_test.go b/external/local/bookmark_migration_test.go index ee45db26e..e22ad831a 100644 --- a/external/local/bookmark_migration_test.go +++ b/external/local/bookmark_migration_test.go @@ -6,7 +6,7 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestMigrateBookmarks(t *testing.T) { diff --git a/external/local/dirs.go b/external/local/dirs.go index fda8c4096..30572ee0c 100644 --- a/external/local/dirs.go +++ b/external/local/dirs.go @@ -8,9 +8,9 @@ import ( "slices" "strings" - "github.com/bjarneo/cliamp/internal/tomlutil" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/internal/tomlutil" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/resolve" ) // ExpandPath expands a leading ~ and environment variables in p. diff --git a/external/local/dirs_test.go b/external/local/dirs_test.go index d6c6480fd..c5ad065bd 100644 --- a/external/local/dirs_test.go +++ b/external/local/dirs_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" ) // writeAudioFile creates an empty file with a supported extension. Tag reading diff --git a/external/local/lock_test.go b/external/local/lock_test.go index f66148780..3ca3f8f38 100644 --- a/external/local/lock_test.go +++ b/external/local/lock_test.go @@ -9,7 +9,7 @@ import ( "sync" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // The TUI, the daemon and the `cliamp playlist` CLI each build their own diff --git a/external/local/podcast_meta_test.go b/external/local/podcast_meta_test.go index 004512dc2..bb8de31f3 100644 --- a/external/local/podcast_meta_test.go +++ b/external/local/podcast_meta_test.go @@ -4,8 +4,8 @@ import ( "maps" "testing" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // An episode saved into a playlist has to come back recognizable: the feed diff --git a/external/local/prepend_test.go b/external/local/prepend_test.go index 1011a33c8..adfb1a73b 100644 --- a/external/local/prepend_test.go +++ b/external/local/prepend_test.go @@ -4,8 +4,8 @@ import ( "path/filepath" "testing" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func paths(tracks []playlist.Track) []string { diff --git a/external/local/provider.go b/external/local/provider.go index 04bae0d94..ff97a71af 100644 --- a/external/local/provider.go +++ b/external/local/provider.go @@ -14,13 +14,13 @@ import ( "strings" "sync" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/internal/fuzzy" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/internal/fuzzy" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // Compile-time interface checks. diff --git a/external/local/provider_test.go b/external/local/provider_test.go index f364e971c..477a1c7f7 100644 --- a/external/local/provider_test.go +++ b/external/local/provider_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func newTestProvider(t *testing.T) *Provider { diff --git a/external/local/trackstore_test.go b/external/local/trackstore_test.go index 7cd0d24ad..a0de3f016 100644 --- a/external/local/trackstore_test.go +++ b/external/local/trackstore_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // A track must come back with the same shared fields from every store that diff --git a/external/local/update_test.go b/external/local/update_test.go index 10637c59e..786eb2148 100644 --- a/external/local/update_test.go +++ b/external/local/update_test.go @@ -7,9 +7,9 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestUpdatePlaylist(t *testing.T) { diff --git a/external/lyrion/client.go b/external/lyrion/client.go index c935e740e..274b81346 100644 --- a/external/lyrion/client.go +++ b/external/lyrion/client.go @@ -19,11 +19,11 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/netdiag" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/netdiag" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) const ( diff --git a/external/lyrion/client_test.go b/external/lyrion/client_test.go index 4f02eee1b..96652f533 100644 --- a/external/lyrion/client_test.go +++ b/external/lyrion/client_test.go @@ -15,11 +15,11 @@ import ( "syscall" "testing" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/netdiag" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/netdiag" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // capture records the decoded envelope of the last request a test server saw. diff --git a/external/lyrion/live_test.go b/external/lyrion/live_test.go index c392dfb45..d9bea6e92 100644 --- a/external/lyrion/live_test.go +++ b/external/lyrion/live_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // liveClient returns a client for a real LMS instance, or skips. diff --git a/external/mixcloud/client.go b/external/mixcloud/client.go index 6326ebae2..f36de2829 100644 --- a/external/mixcloud/client.go +++ b/external/mixcloud/client.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) const ( diff --git a/external/mixcloud/live_test.go b/external/mixcloud/live_test.go index e4b8f04cd..aec045ef8 100644 --- a/external/mixcloud/live_test.go +++ b/external/mixcloud/live_test.go @@ -6,8 +6,8 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // TestLivePublicAPI is opt-in so ordinary and offline test runs remain diff --git a/external/mixcloud/provider.go b/external/mixcloud/provider.go index 45d194be2..a4449f059 100644 --- a/external/mixcloud/provider.go +++ b/external/mixcloud/provider.go @@ -14,9 +14,9 @@ import ( "time" "unicode" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/resolve" ) const ( diff --git a/external/mixcloud/provider_test.go b/external/mixcloud/provider_test.go index 088ad0dd0..065070624 100644 --- a/external/mixcloud/provider_test.go +++ b/external/mixcloud/provider_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func providerWithServer(t *testing.T, cfg Config, handler http.HandlerFunc) (*Provider, *httptest.Server) { diff --git a/external/mixcloud/proxy_test.go b/external/mixcloud/proxy_test.go index 66ea06bce..250a3fece 100644 --- a/external/mixcloud/proxy_test.go +++ b/external/mixcloud/proxy_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/internal/httpclient/httpclienttest" + "github.com/bjarneo/cliamp/v2/internal/httpclient/httpclienttest" ) // TestClientUsesEnvironmentProxy checks that API calls follow ALL_PROXY. diff --git a/external/navidrome/client.go b/external/navidrome/client.go index caf1dfcf1..3a13f37f8 100644 --- a/external/navidrome/client.go +++ b/external/navidrome/client.go @@ -5,9 +5,9 @@ package navidrome import ( "os" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/internal/subsonicapi" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/internal/subsonicapi" + "github.com/bjarneo/cliamp/v2/playlist" ) // NavidromeClient aliases the shared Subsonic client so the provider layer diff --git a/external/navidrome/client_test.go b/external/navidrome/client_test.go index 2712705f6..5112bcf36 100644 --- a/external/navidrome/client_test.go +++ b/external/navidrome/client_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/internal/subsonicapi" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/internal/subsonicapi" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // Protocol-level tests live in internal/subsonicapi; these cover only the diff --git a/external/navidrome/favorites_test.go b/external/navidrome/favorites_test.go index 3a081dd7c..728f5a614 100644 --- a/external/navidrome/favorites_test.go +++ b/external/navidrome/favorites_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func TestCanFavoriteTrack(t *testing.T) { diff --git a/external/netease/provider.go b/external/netease/provider.go index 051ba4d9b..ef0cec924 100644 --- a/external/netease/provider.go +++ b/external/netease/provider.go @@ -16,11 +16,11 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/ytdlp" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/ytdlp" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/resolve" ) var ( diff --git a/external/netease/provider_test.go b/external/netease/provider_test.go index a588169b4..f7f6d3491 100644 --- a/external/netease/provider_test.go +++ b/external/netease/provider_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/internal/ytdlp" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/internal/ytdlp" + "github.com/bjarneo/cliamp/v2/provider" ) func TestPlaylistsIncludesAccountListsAndCharts(t *testing.T) { diff --git a/external/netease/proxy_test.go b/external/netease/proxy_test.go index 0b7e0d5b0..ec89ac976 100644 --- a/external/netease/proxy_test.go +++ b/external/netease/proxy_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/internal/httpclient/httpclienttest" + "github.com/bjarneo/cliamp/v2/internal/httpclient/httpclienttest" ) // TestAPIUsesEnvironmentProxy checks that API calls follow ALL_PROXY. diff --git a/external/plex/client.go b/external/plex/client.go index e5e0dd558..4bcc7881f 100644 --- a/external/plex/client.go +++ b/external/plex/client.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/netdiag" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/netdiag" ) // maxResponseBody limits API responses to 10 MB to prevent unbounded memory growth. diff --git a/external/plex/client_test.go b/external/plex/client_test.go index 2c9cf224c..45fbc69e5 100644 --- a/external/plex/client_test.go +++ b/external/plex/client_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) // newTestClient returns a Client pointed at the given test server. diff --git a/external/plex/provider.go b/external/plex/provider.go index ad5c60220..c2ccd28fa 100644 --- a/external/plex/provider.go +++ b/external/plex/provider.go @@ -7,9 +7,9 @@ import ( "strings" "sync" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // ID prefixes and section labels used to group Plex playlists and albums in diff --git a/external/plex/provider_test.go b/external/plex/provider_test.go index 950beb7a9..939d869ff 100644 --- a/external/plex/provider_test.go +++ b/external/plex/provider_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/config" + "github.com/bjarneo/cliamp/v2/config" ) // sectionsHandler returns a handler that serves a single music section diff --git a/external/podcast/client.go b/external/podcast/client.go index 6d89334da..71947a4ef 100644 --- a/external/podcast/client.go +++ b/external/podcast/client.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/appmeta" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/appmeta" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) type show struct { diff --git a/external/podcast/client_test.go b/external/podcast/client_test.go index 935c26d5f..06109c8bb 100644 --- a/external/podcast/client_test.go +++ b/external/podcast/client_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/appmeta" + "github.com/bjarneo/cliamp/v2/internal/appmeta" ) func newDirectoryTestClient(t *testing.T, handler http.HandlerFunc) *client { diff --git a/external/podcast/progress.go b/external/podcast/progress.go index 939b1bfcd..3036b8e96 100644 --- a/external/podcast/progress.go +++ b/external/podcast/progress.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) const ( diff --git a/external/podcast/progress_test.go b/external/podcast/progress_test.go index 3cf46f975..d53737981 100644 --- a/external/podcast/progress_test.go +++ b/external/podcast/progress_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func episodeTrack(guid, path string) playlist.Track { diff --git a/external/podcast/provider.go b/external/podcast/provider.go index c9c6870b6..c16f92ae6 100644 --- a/external/podcast/provider.go +++ b/external/podcast/provider.go @@ -11,11 +11,11 @@ import ( "strings" "sync" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/resolve" ) var ( diff --git a/external/podcast/provider_test.go b/external/podcast/provider_test.go index 364464190..1f9826fda 100644 --- a/external/podcast/provider_test.go +++ b/external/podcast/provider_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) const providerTestDirectory = `{"results":[ diff --git a/external/qobuz/bundle.go b/external/qobuz/bundle.go index 5d29d07eb..646013dd1 100644 --- a/external/qobuz/bundle.go +++ b/external/qobuz/bundle.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) // bundleBaseURL is the Qobuz web player origin that ships the JS bundle. diff --git a/external/qobuz/client.go b/external/qobuz/client.go index a603bc12d..6f363772d 100644 --- a/external/qobuz/client.go +++ b/external/qobuz/client.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) const ( diff --git a/external/qobuz/creds.go b/external/qobuz/creds.go index 65d6f3f8c..9f332617c 100644 --- a/external/qobuz/creds.go +++ b/external/qobuz/creds.go @@ -1,6 +1,6 @@ package qobuz -import "github.com/bjarneo/cliamp/internal/credstore" +import "github.com/bjarneo/cliamp/v2/internal/credstore" // storedCreds holds persisted Qobuz credentials so the user only signs in once. // The app_id, secrets and private key are scraped from the Qobuz web player and diff --git a/external/qobuz/provider.go b/external/qobuz/provider.go index 0481d59a6..3f286c5ff 100644 --- a/external/qobuz/provider.go +++ b/external/qobuz/provider.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // Compile-time interface checks. diff --git a/external/qobuz/provider_test.go b/external/qobuz/provider_test.go index 29da76514..5f2bfa43f 100644 --- a/external/qobuz/provider_test.go +++ b/external/qobuz/provider_test.go @@ -13,7 +13,7 @@ import ( "sync/atomic" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestTrackArtist(t *testing.T) { diff --git a/external/qobuz/proxy_test.go b/external/qobuz/proxy_test.go index 0ca981039..fd7f4f865 100644 --- a/external/qobuz/proxy_test.go +++ b/external/qobuz/proxy_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/internal/httpclient/httpclienttest" + "github.com/bjarneo/cliamp/v2/internal/httpclient/httpclienttest" ) // TestClientUsesEnvironmentProxy checks that API calls and the bundle fetch diff --git a/external/qobuz/session.go b/external/qobuz/session.go index f1649e5e3..3d97b67f4 100644 --- a/external/qobuz/session.go +++ b/external/qobuz/session.go @@ -9,9 +9,9 @@ import ( "net/url" "time" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/internal/authurl" - "github.com/bjarneo/cliamp/internal/browser" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/internal/authurl" + "github.com/bjarneo/cliamp/v2/internal/browser" ) // authURLObserver receives the OAuth URL when interactive auth begins. diff --git a/external/radio/builtin_test.go b/external/radio/builtin_test.go index 249b47992..ef2116155 100644 --- a/external/radio/builtin_test.go +++ b/external/radio/builtin_test.go @@ -3,8 +3,8 @@ package radio_test import ( "testing" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/resolve" ) // TestArgsBuiltinRadioURLGoesToPending pins the assumption the default startup diff --git a/external/radio/catalog.go b/external/radio/catalog.go index ce6a89834..2671d5052 100644 --- a/external/radio/catalog.go +++ b/external/radio/catalog.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) const radioBrowserBase = "https://de1.api.radio-browser.info/json" diff --git a/external/radio/catalog_test.go b/external/radio/catalog_test.go index c0a90fcd9..a02bead67 100644 --- a/external/radio/catalog_test.go +++ b/external/radio/catalog_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) type hostRewriter struct { diff --git a/external/radio/channels.go b/external/radio/channels.go index 3462d545c..20434a107 100644 --- a/external/radio/channels.go +++ b/external/radio/channels.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // ChannelsURL lists the cliamp radio channels in the order the server runs diff --git a/external/radio/countries.go b/external/radio/countries.go index d55daa193..7b58a1a1f 100644 --- a/external/radio/countries.go +++ b/external/radio/countries.go @@ -4,8 +4,8 @@ import ( "fmt" "slices" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // browseCountriesID is the provider-pane shortcut into the country browser. diff --git a/external/radio/countries_test.go b/external/radio/countries_test.go index 1228fb0b4..b0946af6b 100644 --- a/external/radio/countries_test.go +++ b/external/radio/countries_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // directory is a stand-in Radio Browser server that records the query it was diff --git a/external/radio/favorites.go b/external/radio/favorites.go index 56b184b14..8b3564c68 100644 --- a/external/radio/favorites.go +++ b/external/radio/favorites.go @@ -11,9 +11,9 @@ import ( "strings" "sync" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/internal/tomlutil" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/internal/tomlutil" ) const favoritesFile = "radio_favorites.toml" diff --git a/external/radio/pins.go b/external/radio/pins.go index 4ea50212b..402a28e5c 100644 --- a/external/radio/pins.go +++ b/external/radio/pins.go @@ -10,9 +10,9 @@ import ( "strings" "sync" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/internal/tomlutil" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/internal/tomlutil" ) const pinsFile = "radio_countries.toml" diff --git a/external/radio/provider.go b/external/radio/provider.go index 7e031baba..b741785e1 100644 --- a/external/radio/provider.go +++ b/external/radio/provider.go @@ -16,10 +16,10 @@ import ( "strings" "sync" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/tomlutil" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/tomlutil" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // Compile-time interface checks. diff --git a/external/radio/provider_test.go b/external/radio/provider_test.go index edd14c55c..88666f973 100644 --- a/external/radio/provider_test.go +++ b/external/radio/provider_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // newTestProvider builds a provider with the location question already diff --git a/external/radio/station_track_test.go b/external/radio/station_track_test.go index d912cfa7c..a10380751 100644 --- a/external/radio/station_track_test.go +++ b/external/radio/station_track_test.go @@ -3,7 +3,7 @@ package radio import ( "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestStationFromTrack(t *testing.T) { diff --git a/external/radio/stats.go b/external/radio/stats.go index 0c4b2a87e..60596cc6b 100644 --- a/external/radio/stats.go +++ b/external/radio/stats.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) // StatsURL serves live and all-time listener statistics for the cliamp radio diff --git a/external/radio/stats_test.go b/external/radio/stats_test.go index 014ff15ff..a60c58751 100644 --- a/external/radio/stats_test.go +++ b/external/radio/stats_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) const statsFixture = `{ diff --git a/external/radio/tags.go b/external/radio/tags.go index 268f443f7..6c78889be 100644 --- a/external/radio/tags.go +++ b/external/radio/tags.go @@ -7,8 +7,8 @@ import ( "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // browseTagsID is the provider-pane shortcut into the tag browser. diff --git a/external/radio/tags_test.go b/external/radio/tags_test.go index 2ad5b6645..563649c9d 100644 --- a/external/radio/tags_test.go +++ b/external/radio/tags_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func TestFetchTagsCleansDuplicatesAndSortsByStationCount(t *testing.T) { diff --git a/external/radiometa/radiometa.go b/external/radiometa/radiometa.go index 121665119..2f34352b2 100644 --- a/external/radiometa/radiometa.go +++ b/external/radiometa/radiometa.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) var client = httpclient.NewAPI(8 * time.Second) diff --git a/external/radiometa/radiometa_test.go b/external/radiometa/radiometa_test.go index 6ecfc67db..134008be1 100644 --- a/external/radiometa/radiometa_test.go +++ b/external/radiometa/radiometa_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) func TestResolverMatching(t *testing.T) { diff --git a/external/soundcloud/provider.go b/external/soundcloud/provider.go index d87c805b2..863e7deb8 100644 --- a/external/soundcloud/provider.go +++ b/external/soundcloud/provider.go @@ -15,9 +15,9 @@ import ( "slices" "strings" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/resolve" ) // Compile-time interface checks. diff --git a/external/soundcloud/provider_test.go b/external/soundcloud/provider_test.go index 9e2332db2..1398deb5e 100644 --- a/external/soundcloud/provider_test.go +++ b/external/soundcloud/provider_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/internal/ytdlcookies" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/internal/ytdlcookies" + "github.com/bjarneo/cliamp/v2/resolve" ) func TestNewFromConfig(t *testing.T) { diff --git a/external/spotify/albums.go b/external/spotify/albums.go index 102742abc..ce74cbeb9 100644 --- a/external/spotify/albums.go +++ b/external/spotify/albums.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // AlbumTracks returns every track of a Spotify album, in disc and track order. diff --git a/external/spotify/creds.go b/external/spotify/creds.go index 0971e29ef..cb3f2cd60 100644 --- a/external/spotify/creds.go +++ b/external/spotify/creds.go @@ -1,6 +1,6 @@ package spotify -import "github.com/bjarneo/cliamp/internal/credstore" +import "github.com/bjarneo/cliamp/v2/internal/credstore" // DefaultClientID is the librespot keymaster client_id, shared by spotify-player // and other librespot-based players. Used when the user hasn't configured their diff --git a/external/spotify/favorites.go b/external/spotify/favorites.go index f0d5431c0..c56dde7fa 100644 --- a/external/spotify/favorites.go +++ b/external/spotify/favorites.go @@ -7,8 +7,8 @@ import ( "net/url" "strings" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) var _ provider.TrackFavoriter = (*SpotifyProvider)(nil) diff --git a/external/spotify/favorites_test.go b/external/spotify/favorites_test.go index f5f59fe91..3f23fb462 100644 --- a/external/spotify/favorites_test.go +++ b/external/spotify/favorites_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // stubLibrary serves the Web API with status and records each request. diff --git a/external/spotify/lyrics.go b/external/spotify/lyrics.go index 30d394283..b8a06fec7 100644 --- a/external/spotify/lyrics.go +++ b/external/spotify/lyrics.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/lyrics" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/lyrics" + "github.com/bjarneo/cliamp/v2/playlist" ) // maxLyricsBody limits color-lyrics responses to 2 MB. diff --git a/external/spotify/lyrics_test.go b/external/spotify/lyrics_test.go index c01f164ac..9e474ed08 100644 --- a/external/spotify/lyrics_test.go +++ b/external/spotify/lyrics_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/lyrics" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/lyrics" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestTrackIDFromPath(t *testing.T) { diff --git a/external/spotify/playlists.go b/external/spotify/playlists.go index 3b6590464..b6e29212d 100644 --- a/external/spotify/playlists.go +++ b/external/spotify/playlists.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) const playlistListCacheTTL = 5 * time.Minute diff --git a/external/spotify/provider.go b/external/spotify/provider.go index e44ade5b0..933d5e97f 100644 --- a/external/spotify/provider.go +++ b/external/spotify/provider.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // Compile-time interface checks. diff --git a/external/spotify/provider_close_test.go b/external/spotify/provider_close_test.go index 4121037ee..1fb3ed1dd 100644 --- a/external/spotify/provider_close_test.go +++ b/external/spotify/provider_close_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // TestCloseDuringPlaylists runs Close next to a Web API load. Run it with diff --git a/external/spotify/provider_errors_test.go b/external/spotify/provider_errors_test.go index c42fcd99d..48129bcab 100644 --- a/external/spotify/provider_errors_test.go +++ b/external/spotify/provider_errors_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // stubSpotifyAPI serves each request path from routes and fails on others. diff --git a/external/spotify/provider_shared.go b/external/spotify/provider_shared.go index 516d28705..3b508865d 100644 --- a/external/spotify/provider_shared.go +++ b/external/spotify/provider_shared.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // maxResponseBody limits JSON API responses to 10 MB. diff --git a/external/spotify/proxy_test.go b/external/spotify/proxy_test.go index 2b3d3274e..5454ea137 100644 --- a/external/spotify/proxy_test.go +++ b/external/spotify/proxy_test.go @@ -8,7 +8,7 @@ import ( "golang.org/x/oauth2" - "github.com/bjarneo/cliamp/internal/httpclient/httpclienttest" + "github.com/bjarneo/cliamp/v2/internal/httpclient/httpclienttest" ) // TestWebClientUsesEnvironmentProxy checks that Web API, lyrics and token diff --git a/external/spotify/related.go b/external/spotify/related.go index 3ef59f95d..fc03579f8 100644 --- a/external/spotify/related.go +++ b/external/spotify/related.go @@ -16,7 +16,7 @@ import ( "github.com/devgianlu/go-librespot/spclient" "google.golang.org/protobuf/proto" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // maxStationPages bounds how far RelatedTracks pages through a station, which diff --git a/external/spotify/related_test.go b/external/spotify/related_test.go index 2cb380f99..3c5afea7d 100644 --- a/external/spotify/related_test.go +++ b/external/spotify/related_test.go @@ -14,7 +14,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func contextTracks(uris ...string) []*connectpb.ContextTrack { diff --git a/external/spotify/search.go b/external/spotify/search.go index 6d1405aa9..e94d1e211 100644 --- a/external/spotify/search.go +++ b/external/spotify/search.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // devModeSearchLimit is the largest per-request limit /v1/search accepts for an diff --git a/external/spotify/session.go b/external/spotify/session.go index 184d323f4..8c987a832 100644 --- a/external/spotify/session.go +++ b/external/spotify/session.go @@ -13,11 +13,11 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/internal/authurl" - "github.com/bjarneo/cliamp/internal/browser" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/internal/authurl" + "github.com/bjarneo/cliamp/v2/internal/browser" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/playlist" librespot "github.com/devgianlu/go-librespot" librespotPlayer "github.com/devgianlu/go-librespot/player" diff --git a/external/spotify/session_test.go b/external/spotify/session_test.go index edfd1923e..e98270390 100644 --- a/external/spotify/session_test.go +++ b/external/spotify/session_test.go @@ -20,7 +20,7 @@ import ( librespotPlayer "github.com/devgianlu/go-librespot/player" "golang.org/x/oauth2" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) type tokenSourceFunc func() (*oauth2.Token, error) diff --git a/external/spotify/streamer.go b/external/spotify/streamer.go index 5d3a5205f..872ab280f 100644 --- a/external/spotify/streamer.go +++ b/external/spotify/streamer.go @@ -17,8 +17,8 @@ import ( librespotPlayer "github.com/devgianlu/go-librespot/player" "github.com/gopxl/beep/v2" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/playlist" ) const ( diff --git a/external/spotify/tracks.go b/external/spotify/tracks.go index 35f2168bd..57ae07ce1 100644 --- a/external/spotify/tracks.go +++ b/external/spotify/tracks.go @@ -9,7 +9,7 @@ import ( "strconv" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // playlistCache holds a snapshot_id and the fetched tracks for a playlist, diff --git a/external/spotify/webapi.go b/external/spotify/webapi.go index 3bbd77a83..bb6d7f2cc 100644 --- a/external/spotify/webapi.go +++ b/external/spotify/webapi.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/playlist" ) // webAPI calls the Spotify Web API via the session with retry on 429. diff --git a/external/tidal/auth.go b/external/tidal/auth.go index d194e34bf..47e10617d 100644 --- a/external/tidal/auth.go +++ b/external/tidal/auth.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/internal/authurl" - "github.com/bjarneo/cliamp/internal/browser" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/internal/authurl" + "github.com/bjarneo/cliamp/v2/internal/browser" ) const ( diff --git a/external/tidal/client.go b/external/tidal/client.go index a23226ae3..20240b23a 100644 --- a/external/tidal/client.go +++ b/external/tidal/client.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) const ( diff --git a/external/tidal/client_test.go b/external/tidal/client_test.go index 917925e44..8d1de59ff 100644 --- a/external/tidal/client_test.go +++ b/external/tidal/client_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // testClient returns a client with a valid-looking token pointed at srv. diff --git a/external/tidal/creds.go b/external/tidal/creds.go index 4b35c5d34..29299ea02 100644 --- a/external/tidal/creds.go +++ b/external/tidal/creds.go @@ -3,7 +3,7 @@ package tidal import ( "time" - "github.com/bjarneo/cliamp/internal/credstore" + "github.com/bjarneo/cliamp/v2/internal/credstore" ) // Built-in fallback OAuth client credentials: the device ("TV") client pair diff --git a/external/tidal/provider.go b/external/tidal/provider.go index a1cb6ee84..4433bd080 100644 --- a/external/tidal/provider.go +++ b/external/tidal/provider.go @@ -10,9 +10,9 @@ import ( "sync/atomic" "time" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // Compile-time interface checks. diff --git a/external/tidal/provider_test.go b/external/tidal/provider_test.go index defb040bf..21a99417f 100644 --- a/external/tidal/provider_test.go +++ b/external/tidal/provider_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/provider" ) func TestBrowseEntriesExposeFavoriteArtistsAndAlbums(t *testing.T) { diff --git a/external/tidal/proxy_test.go b/external/tidal/proxy_test.go index 101d0e1f2..c36f54869 100644 --- a/external/tidal/proxy_test.go +++ b/external/tidal/proxy_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/httpclient/httpclienttest" + "github.com/bjarneo/cliamp/v2/internal/httpclient/httpclienttest" ) // TestClientUsesEnvironmentProxy checks that API calls follow ALL_PROXY. diff --git a/external/yandex/client.go b/external/yandex/client.go index 4cf112942..e4eb7e0eb 100644 --- a/external/yandex/client.go +++ b/external/yandex/client.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) const ( diff --git a/external/yandex/provider.go b/external/yandex/provider.go index 7ceb219d7..ad1e9b8cb 100644 --- a/external/yandex/provider.go +++ b/external/yandex/provider.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) var ( diff --git a/external/yandex/provider_test.go b/external/yandex/provider_test.go index b18864e82..990c88157 100644 --- a/external/yandex/provider_test.go +++ b/external/yandex/provider_test.go @@ -6,8 +6,8 @@ import ( "encoding/json" "testing" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func md5Hex(s string) string { diff --git a/external/yandex/proxy_test.go b/external/yandex/proxy_test.go index eb4db5e9f..3804eae0c 100644 --- a/external/yandex/proxy_test.go +++ b/external/yandex/proxy_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/internal/httpclient/httpclienttest" + "github.com/bjarneo/cliamp/v2/internal/httpclient/httpclienttest" ) // TestClientUsesEnvironmentProxy checks that the API client and the download diff --git a/external/yandex/wave_test.go b/external/yandex/wave_test.go index 5e85e8e09..b0c27d87c 100644 --- a/external/yandex/wave_test.go +++ b/external/yandex/wave_test.go @@ -9,8 +9,8 @@ import ( "sync" "testing" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func writeResult(w http.ResponseWriter, v any) { diff --git a/external/ytmusic/cache.go b/external/ytmusic/cache.go index e799d52b4..59dd4d55e 100644 --- a/external/ytmusic/cache.go +++ b/external/ytmusic/cache.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/playlist" ) // cacheTTL is how long cached playlist/track data is considered fresh. diff --git a/external/ytmusic/cache_scope_test.go b/external/ytmusic/cache_scope_test.go index d7f601304..faa9ccd76 100644 --- a/external/ytmusic/cache_scope_test.go +++ b/external/ytmusic/cache_scope_test.go @@ -3,7 +3,7 @@ package ytmusic import ( "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestYTCacheRejectsDifferentOAuthAccount(t *testing.T) { diff --git a/external/ytmusic/classify.go b/external/ytmusic/classify.go index 6c10553eb..7fd50edf0 100644 --- a/external/ytmusic/classify.go +++ b/external/ytmusic/classify.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/appdir" "google.golang.org/api/youtube/v3" ) diff --git a/external/ytmusic/cookie_provider.go b/external/ytmusic/cookie_provider.go index e8bf66c30..fcf7e3dbe 100644 --- a/external/ytmusic/cookie_provider.go +++ b/external/ytmusic/cookie_provider.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/resolve" ) // Compile-time interface checks. diff --git a/external/ytmusic/cookie_provider_test.go b/external/ytmusic/cookie_provider_test.go index 4c68418fe..4f0f35e10 100644 --- a/external/ytmusic/cookie_provider_test.go +++ b/external/ytmusic/cookie_provider_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/resolve" ) func TestCookieProviderInterfaces(t *testing.T) { diff --git a/external/ytmusic/provider.go b/external/ytmusic/provider.go index 4d169f891..944a4e11f 100644 --- a/external/ytmusic/provider.go +++ b/external/ytmusic/provider.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" "google.golang.org/api/youtube/v3" ) diff --git a/external/ytmusic/provider_test.go b/external/ytmusic/provider_test.go index 6d7d9ff80..75750674a 100644 --- a/external/ytmusic/provider_test.go +++ b/external/ytmusic/provider_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestRefreshInvalidatesAllCaches(t *testing.T) { diff --git a/external/ytmusic/proxy_test.go b/external/ytmusic/proxy_test.go index 2a9966840..d383e0b6c 100644 --- a/external/ytmusic/proxy_test.go +++ b/external/ytmusic/proxy_test.go @@ -8,7 +8,7 @@ import ( "golang.org/x/oauth2" - "github.com/bjarneo/cliamp/internal/httpclient/httpclienttest" + "github.com/bjarneo/cliamp/v2/internal/httpclient/httpclienttest" ) // TestRequestsUseEnvironmentProxy checks that token requests and YouTube diff --git a/external/ytmusic/session.go b/external/ytmusic/session.go index a68a7c6b6..73535fc0d 100644 --- a/external/ytmusic/session.go +++ b/external/ytmusic/session.go @@ -9,11 +9,11 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/internal/authurl" - "github.com/bjarneo/cliamp/internal/browser" - "github.com/bjarneo/cliamp/internal/credstore" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/internal/authurl" + "github.com/bjarneo/cliamp/v2/internal/browser" + "github.com/bjarneo/cliamp/v2/internal/credstore" + "github.com/bjarneo/cliamp/v2/internal/httpclient" "golang.org/x/oauth2" "golang.org/x/oauth2/google" diff --git a/favorites/favorites.go b/favorites/favorites.go index f7105f1b4..1e9c562b8 100644 --- a/favorites/favorites.go +++ b/favorites/favorites.go @@ -19,10 +19,10 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/internal/tomlutil" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/internal/tomlutil" + "github.com/bjarneo/cliamp/v2/playlist" ) // PlaylistName is the virtual playlist name surfaced to the UI by the local diff --git a/favorites/favorites_test.go b/favorites/favorites_test.go index fe411457a..dd48125d9 100644 --- a/favorites/favorites_test.go +++ b/favorites/favorites_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/playlist" ) func newTestStore(t *testing.T) *Store { diff --git a/go.mod b/go.mod index adfb15e9d..053b9c531 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/bjarneo/cliamp +module github.com/bjarneo/cliamp/v2 go 1.26.10 diff --git a/headless_signal_test.go b/headless_signal_test.go index a1ec3ca64..e343f3709 100644 --- a/headless_signal_test.go +++ b/headless_signal_test.go @@ -11,7 +11,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" + "github.com/bjarneo/cliamp/v2/internal/playback" ) // quitRecorder quits on playback.QuitMsg, as the Model does after it keeps diff --git a/headless_test.go b/headless_test.go index 2c1cfb934..acf52c928 100644 --- a/headless_test.go +++ b/headless_test.go @@ -15,14 +15,14 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/internal/plugintrust" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui/model" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/internal/plugintrust" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui/model" ) func TestV2Operations(t *testing.T) { diff --git a/history/history.go b/history/history.go index df2dcab6f..4c140167d 100644 --- a/history/history.go +++ b/history/history.go @@ -20,10 +20,10 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/internal/tomlutil" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/internal/tomlutil" + "github.com/bjarneo/cliamp/v2/playlist" ) // DefaultCap is the maximum number of entries kept on disk. Older entries are diff --git a/history/history_test.go b/history/history_test.go index 8d76436d3..e40ffef33 100644 --- a/history/history_test.go +++ b/history/history_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func newTestStore(t *testing.T) *Store { diff --git a/internal/authurl/authurl.go b/internal/authurl/authurl.go index 09c0f69d0..8fd15a77e 100644 --- a/internal/authurl/authurl.go +++ b/internal/authurl/authurl.go @@ -6,7 +6,7 @@ package authurl import ( "sync/atomic" - "github.com/bjarneo/cliamp/applog" + "github.com/bjarneo/cliamp/v2/applog" ) // Observer holds the callback that receives sign-in URLs. The zero value has diff --git a/internal/credstore/credstore.go b/internal/credstore/credstore.go index 345d2cd1e..cde096eca 100644 --- a/internal/credstore/credstore.go +++ b/internal/credstore/credstore.go @@ -10,8 +10,8 @@ import ( "os" "path/filepath" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/fileutil" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/fileutil" ) // File is one credentials file in the cliamp config directory. T is the JSON diff --git a/internal/embyapi/catalog_test.go b/internal/embyapi/catalog_test.go index 9b8218fe1..b1b733464 100644 --- a/internal/embyapi/catalog_test.go +++ b/internal/embyapi/catalog_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/provider" ) // catalogAlbums is the album catalog that catalogClient serves. diff --git a/internal/embyapi/client.go b/internal/embyapi/client.go index d8b7aeff6..afaf8d368 100644 --- a/internal/embyapi/client.go +++ b/internal/embyapi/client.go @@ -18,10 +18,10 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/netdiag" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/netdiag" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) var defaultHTTPClient = httpclient.NewAPI(30 * time.Second) diff --git a/internal/embyapi/client_test.go b/internal/embyapi/client_test.go index da4fc6270..fc379be44 100644 --- a/internal/embyapi/client_test.go +++ b/internal/embyapi/client_test.go @@ -19,11 +19,11 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/appmeta" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/netdiag" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/internal/appmeta" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/netdiag" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) type roundTripFunc func(*http.Request) (*http.Response, error) diff --git a/internal/embyapi/dialect.go b/internal/embyapi/dialect.go index 5742541c9..a9421cc96 100644 --- a/internal/embyapi/dialect.go +++ b/internal/embyapi/dialect.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "github.com/bjarneo/cliamp/internal/appmeta" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/internal/appmeta" + "github.com/bjarneo/cliamp/v2/provider" ) // dialect captures the handful of behaviors that differ between Emby and diff --git a/internal/embyapi/provider.go b/internal/embyapi/provider.go index 4264104fa..f227c4bcc 100644 --- a/internal/embyapi/provider.go +++ b/internal/embyapi/provider.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) var ( diff --git a/internal/embyapi/provider_test.go b/internal/embyapi/provider_test.go index d19ae895a..67abc28d2 100644 --- a/internal/embyapi/provider_test.go +++ b/internal/embyapi/provider_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // providerDialects runs a provider test once for each server dialect. diff --git a/internal/httpclient/client.go b/internal/httpclient/client.go index 5c73e0e31..5d41232a1 100644 --- a/internal/httpclient/client.go +++ b/internal/httpclient/client.go @@ -19,7 +19,7 @@ import ( // UserAgent is shared by API and stream requests so Navidrome identifies them // as the same player when applying per-player settings. -const UserAgent = "cliamp/1.0 (https://github.com/bjarneo/cliamp)" +const UserAgent = "cliamp/1.0 (https://github.com/bjarneo/cliamp/v2)" // Streaming is a shared HTTP client for audio streaming connections. // It sets a generous header timeout but no overall timeout, so infinite diff --git a/internal/httpclient/httpclienttest/proxy_test.go b/internal/httpclient/httpclienttest/proxy_test.go index 36946aa4d..aaebac0ea 100644 --- a/internal/httpclient/httpclienttest/proxy_test.go +++ b/internal/httpclient/httpclienttest/proxy_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) func TestUseAllProxy(t *testing.T) { diff --git a/internal/kittyimg/kittyimg.go b/internal/kittyimg/kittyimg.go index 7d2351d29..7ca0fe789 100644 --- a/internal/kittyimg/kittyimg.go +++ b/internal/kittyimg/kittyimg.go @@ -22,7 +22,7 @@ import ( "sync" "sync/atomic" - "github.com/bjarneo/cliamp/applog" + "github.com/bjarneo/cliamp/v2/applog" ) // maxPixels caps the decoded image: a plugin can point ShowImage at a photo diff --git a/internal/plugintrust/trust.go b/internal/plugintrust/trust.go index 24af500ac..8d95a710c 100644 --- a/internal/plugintrust/trust.go +++ b/internal/plugintrust/trust.go @@ -11,7 +11,7 @@ import ( "os" "path/filepath" - "github.com/bjarneo/cliamp/internal/fileutil" + "github.com/bjarneo/cliamp/v2/internal/fileutil" ) const manifestName = ".trust.json" diff --git a/internal/resume/resume.go b/internal/resume/resume.go index f9320abd9..421783643 100644 --- a/internal/resume/resume.go +++ b/internal/resume/resume.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/playlist" ) // State holds enough information to resume a previous playback session. diff --git a/internal/resume/resume_test.go b/internal/resume/resume_test.go index f7bbc88b6..c76e1ca0e 100644 --- a/internal/resume/resume_test.go +++ b/internal/resume/resume_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // withTempHome sets HOME so appdir.Dir() points inside a temp directory, diff --git a/internal/subsonicapi/bandcamp_test.go b/internal/subsonicapi/bandcamp_test.go index 187760be2..974ce3815 100644 --- a/internal/subsonicapi/bandcamp_test.go +++ b/internal/subsonicapi/bandcamp_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // fakeBandcampServer serves the standard fake Subsonic responses; the diff --git a/internal/subsonicapi/client.go b/internal/subsonicapi/client.go index c5d20a03d..d9b2a20b0 100644 --- a/internal/subsonicapi/client.go +++ b/internal/subsonicapi/client.go @@ -21,10 +21,10 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/netdiag" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/netdiag" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // Compile-time interface checks. diff --git a/internal/subsonicapi/client_test.go b/internal/subsonicapi/client_test.go index ec13ddfa4..217ec2105 100644 --- a/internal/subsonicapi/client_test.go +++ b/internal/subsonicapi/client_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/netdiag" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/netdiag" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // subsonicHandler serves fake Subsonic API responses for testing. diff --git a/internal/subsonicapi/dialect.go b/internal/subsonicapi/dialect.go index 799646b92..ea8f0525b 100644 --- a/internal/subsonicapi/dialect.go +++ b/internal/subsonicapi/dialect.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/provider" ) // dialect captures the handful of behaviors that differ between the Subsonic diff --git a/internal/subsonicapi/favorites.go b/internal/subsonicapi/favorites.go index 382cd69af..d32920fdf 100644 --- a/internal/subsonicapi/favorites.go +++ b/internal/subsonicapi/favorites.go @@ -5,8 +5,8 @@ import ( "fmt" "net/url" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) var _ provider.TrackFavoriter = (*Client)(nil) diff --git a/internal/ytdlcookies/cookies.go b/internal/ytdlcookies/cookies.go index b0bd96899..48c33d75c 100644 --- a/internal/ytdlcookies/cookies.go +++ b/internal/ytdlcookies/cookies.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) var ( diff --git a/ipc/client.go b/ipc/client.go index 2bc02a808..1f7481194 100644 --- a/ipc/client.go +++ b/ipc/client.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/bjarneo/cliamp/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/appdir" ) // DefaultSocketPath returns the default IPC socket path (~/.config/cliamp/cliamp.sock). diff --git a/ipc/server.go b/ipc/server.go index bc4a32719..61c9ba317 100644 --- a/ipc/server.go +++ b/ipc/server.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/applog" + "github.com/bjarneo/cliamp/v2/applog" ) const ipcRequestReadTimeout = 60 * time.Second diff --git a/ipc_client.go b/ipc_client.go index d540a47a4..248228958 100644 --- a/ipc_client.go +++ b/ipc_client.go @@ -11,7 +11,7 @@ import ( "os" "time" - "github.com/bjarneo/cliamp/ipc" + "github.com/bjarneo/cliamp/v2/ipc" ) // cliRequestID is the V2 request ID of every CLI request. diff --git a/ipc_client_test.go b/ipc_client_test.go index 6ccdd6a4c..4bfad0494 100644 --- a/ipc_client_test.go +++ b/ipc_client_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/ui" ) // socketDir returns a new config directory for a test that binds the diff --git a/jellyfin_restore_test.go b/jellyfin_restore_test.go index d26840e65..16d048292 100644 --- a/jellyfin_restore_test.go +++ b/jellyfin_restore_test.go @@ -5,12 +5,12 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/external/emby" - "github.com/bjarneo/cliamp/external/jellyfin" - "github.com/bjarneo/cliamp/internal/resume" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/external/emby" + "github.com/bjarneo/cliamp/v2/external/jellyfin" + "github.com/bjarneo/cliamp/v2/internal/resume" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func TestRestoreServerContextRestoresAlbumAndActiveTrack(t *testing.T) { diff --git a/jellyfin_source_test.go b/jellyfin_source_test.go index 88cbf692c..559cfd278 100644 --- a/jellyfin_source_test.go +++ b/jellyfin_source_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/external/emby" - "github.com/bjarneo/cliamp/external/jellyfin" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/external/emby" + "github.com/bjarneo/cliamp/v2/external/jellyfin" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func TestJellyfinSourceResolutionForPlayAndPreload(t *testing.T) { diff --git a/lua_wiring.go b/lua_wiring.go index c9474ebf6..297d72c9d 100644 --- a/lua_wiring.go +++ b/lua_wiring.go @@ -6,10 +6,10 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui/model" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui/model" ) // luaStateProvider gives Lua plugins read access to the playback state. The diff --git a/lua_wiring_test.go b/lua_wiring_test.go index 887149142..9aceba44c 100644 --- a/lua_wiring_test.go +++ b/lua_wiring_test.go @@ -7,10 +7,10 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui/model" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui/model" ) // Each Lua control reaches the Model as a message, so the Update loop makes diff --git a/luaplugin/api_fs.go b/luaplugin/api_fs.go index 40b60d15c..c6b1aac70 100644 --- a/luaplugin/api_fs.go +++ b/luaplugin/api_fs.go @@ -12,8 +12,8 @@ import ( lua "github.com/yuin/gopher-lua" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/ipc" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/ipc" ) // cachedWriteRules holds the write rules for this process. The paths they diff --git a/luaplugin/api_image.go b/luaplugin/api_image.go index 3dd481be1..fc0170d9c 100644 --- a/luaplugin/api_image.go +++ b/luaplugin/api_image.go @@ -3,7 +3,7 @@ package luaplugin import ( "strings" - "github.com/bjarneo/cliamp/internal/kittyimg" + "github.com/bjarneo/cliamp/v2/internal/kittyimg" lua "github.com/yuin/gopher-lua" ) diff --git a/luaplugin/api_keymap_test.go b/luaplugin/api_keymap_test.go index aa206cde1..5fba2eed6 100644 --- a/luaplugin/api_keymap_test.go +++ b/luaplugin/api_keymap_test.go @@ -13,7 +13,7 @@ import ( lua "github.com/yuin/gopher-lua" - "github.com/bjarneo/cliamp/internal/plugintrust" + "github.com/bjarneo/cliamp/v2/internal/plugintrust" ) func TestPluginBindAndEmit(t *testing.T) { diff --git a/luaplugin/api_layout.go b/luaplugin/api_layout.go index 78586ae39..5b3211d8e 100644 --- a/luaplugin/api_layout.go +++ b/luaplugin/api_layout.go @@ -3,7 +3,7 @@ package luaplugin import ( "strings" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/ui" lua "github.com/yuin/gopher-lua" ) diff --git a/luaplugin/api_layout_test.go b/luaplugin/api_layout_test.go index 3fd72fa50..4744fedc4 100644 --- a/luaplugin/api_layout_test.go +++ b/luaplugin/api_layout_test.go @@ -3,7 +3,7 @@ package luaplugin import ( "testing" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/ui" lua "github.com/yuin/gopher-lua" ) diff --git a/luaplugin/api_store.go b/luaplugin/api_store.go index b9d4151b8..966ff7c8e 100644 --- a/luaplugin/api_store.go +++ b/luaplugin/api_store.go @@ -9,7 +9,7 @@ import ( lua "github.com/yuin/gopher-lua" - "github.com/bjarneo/cliamp/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/appdir" ) // pluginStore is a per-plugin key/value store persisted as a single JSON file diff --git a/luaplugin/api_ui.go b/luaplugin/api_ui.go index c0fd7e574..2a75f521f 100644 --- a/luaplugin/api_ui.go +++ b/luaplugin/api_ui.go @@ -3,7 +3,7 @@ package luaplugin import ( "strings" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/ui" lua "github.com/yuin/gopher-lua" ) diff --git a/luaplugin/luaplugin.go b/luaplugin/luaplugin.go index 72150d9e7..0366478ea 100644 --- a/luaplugin/luaplugin.go +++ b/luaplugin/luaplugin.go @@ -16,8 +16,8 @@ import ( lua "github.com/yuin/gopher-lua" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/plugintrust" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/plugintrust" ) // Plugin represents a single loaded Lua plugin. diff --git a/luaplugin/luaplugin_test.go b/luaplugin/luaplugin_test.go index bc21400b1..78e275ae6 100644 --- a/luaplugin/luaplugin_test.go +++ b/luaplugin/luaplugin_test.go @@ -22,7 +22,7 @@ import ( lua "github.com/yuin/gopher-lua" - "github.com/bjarneo/cliamp/internal/plugintrust" + "github.com/bjarneo/cliamp/v2/internal/plugintrust" ) // newTestManager returns a Manager ready for testing (no disk I/O). diff --git a/luaplugin/regression_bundled_test.go b/luaplugin/regression_bundled_test.go index 5f2137acd..97cd2c563 100644 --- a/luaplugin/regression_bundled_test.go +++ b/luaplugin/regression_bundled_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/internal/plugintrust" + "github.com/bjarneo/cliamp/v2/internal/plugintrust" ) // TestBundledPluginsLoad is the backward-compatibility guard for the plugin diff --git a/lyrics/lookup_test.go b/lyrics/lookup_test.go index 8f98ae5bd..5a9a93ec2 100644 --- a/lyrics/lookup_test.go +++ b/lyrics/lookup_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) // lyricsAPI holds the replies of a fake LRCLIB and a fake NetEase. A nil diff --git a/lyrics/lyrics.go b/lyrics/lyrics.go index 892c31a24..126605422 100644 --- a/lyrics/lyrics.go +++ b/lyrics/lyrics.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) // ErrNotFound is returned when no lyrics could be found from any source. diff --git a/lyrion_wiring_test.go b/lyrion_wiring_test.go index 4fdee33bf..b9e908d85 100644 --- a/lyrion_wiring_test.go +++ b/lyrion_wiring_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/bjarneo/cliamp/external/lyrion" + "github.com/bjarneo/cliamp/v2/external/lyrion" ) // A Lyrion track is a finite file, so it must route to the buffered download diff --git a/main.go b/main.go index bc9397391..727f60a03 100644 --- a/main.go +++ b/main.go @@ -17,23 +17,23 @@ import ( tea "charm.land/bubbletea/v2" "github.com/charmbracelet/x/term" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/appmeta" - "github.com/bjarneo/cliamp/internal/embyapi" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/internal/resume" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/mediactl" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/resolve" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" - "github.com/bjarneo/cliamp/ui/model" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/appmeta" + "github.com/bjarneo/cliamp/v2/internal/embyapi" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/internal/resume" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/mediactl" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/resolve" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" + "github.com/bjarneo/cliamp/v2/ui/model" ) // version is set at build time via -ldflags "-X main.version=vX.Y.Z". diff --git a/main_test.go b/main_test.go index bf89d6720..112807111 100644 --- a/main_test.go +++ b/main_test.go @@ -7,11 +7,11 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/external/emby" - "github.com/bjarneo/cliamp/internal/embyapi" - "github.com/bjarneo/cliamp/internal/resume" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/external/emby" + "github.com/bjarneo/cliamp/v2/internal/embyapi" + "github.com/bjarneo/cliamp/v2/internal/resume" + "github.com/bjarneo/cliamp/v2/playlist" ) // cliamp search and cliamp search-sc play the first match of the query. Any diff --git a/mediactl/metadata.go b/mediactl/metadata.go index b38f27922..b1e6df724 100644 --- a/mediactl/metadata.go +++ b/mediactl/metadata.go @@ -6,7 +6,7 @@ import ( "github.com/godbus/dbus/v5" - "github.com/bjarneo/cliamp/internal/playback" + "github.com/bjarneo/cliamp/v2/internal/playback" ) // trackPath returns a unique MPRIS track object path for a sequence number. diff --git a/mediactl/metadata_test.go b/mediactl/metadata_test.go index f63dfb5b4..b4f6df35c 100644 --- a/mediactl/metadata_test.go +++ b/mediactl/metadata_test.go @@ -7,7 +7,7 @@ import ( "github.com/godbus/dbus/v5" - "github.com/bjarneo/cliamp/internal/playback" + "github.com/bjarneo/cliamp/v2/internal/playback" ) func TestMakeMetadataMapsPlaybackTrackToMPRISFields(t *testing.T) { diff --git a/mediactl/service_darwin.go b/mediactl/service_darwin.go index eb1bccab2..28fb06bb4 100644 --- a/mediactl/service_darwin.go +++ b/mediactl/service_darwin.go @@ -181,7 +181,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" + "github.com/bjarneo/cliamp/v2/internal/playback" ) func Run(prog *tea.Program, svc *Service) (tea.Model, error) { diff --git a/mediactl/service_darwin_test.go b/mediactl/service_darwin_test.go index ff91db858..ca844bd8a 100644 --- a/mediactl/service_darwin_test.go +++ b/mediactl/service_darwin_test.go @@ -9,7 +9,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" + "github.com/bjarneo/cliamp/v2/internal/playback" ) func TestDarwinCallbacksUseHandleRouting(t *testing.T) { diff --git a/mediactl/service_linux.go b/mediactl/service_linux.go index f5b0e0e5f..4a229f50c 100644 --- a/mediactl/service_linux.go +++ b/mediactl/service_linux.go @@ -14,8 +14,8 @@ import ( "github.com/godbus/dbus/v5/introspect" "github.com/godbus/dbus/v5/prop" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/internal/playback" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/internal/playback" ) func Run(prog *tea.Program, svc *Service) (tea.Model, error) { diff --git a/mediactl/service_linux_test.go b/mediactl/service_linux_test.go index 43609c463..3970b4a12 100644 --- a/mediactl/service_linux_test.go +++ b/mediactl/service_linux_test.go @@ -12,7 +12,7 @@ import ( "github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5/prop" - "github.com/bjarneo/cliamp/internal/playback" + "github.com/bjarneo/cliamp/v2/internal/playback" ) // discardTransport is a D-Bus transport that drops every write. It lets diff --git a/mediactl/service_stub.go b/mediactl/service_stub.go index d51df122f..eedc5317f 100644 --- a/mediactl/service_stub.go +++ b/mediactl/service_stub.go @@ -7,7 +7,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" + "github.com/bjarneo/cliamp/v2/internal/playback" ) func Run(prog *tea.Program, svc *Service) (tea.Model, error) { diff --git a/mediactl/service_windows.go b/mediactl/service_windows.go index b6b0bd24a..cc458c008 100644 --- a/mediactl/service_windows.go +++ b/mediactl/service_windows.go @@ -11,7 +11,7 @@ import ( tea "charm.land/bubbletea/v2" "golang.org/x/sys/windows" - "github.com/bjarneo/cliamp/internal/playback" + "github.com/bjarneo/cliamp/v2/internal/playback" ) const ( diff --git a/mediactl/service_windows_test.go b/mediactl/service_windows_test.go index 90edfe22f..b539dd41c 100644 --- a/mediactl/service_windows_test.go +++ b/mediactl/service_windows_test.go @@ -7,7 +7,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" + "github.com/bjarneo/cliamp/v2/internal/playback" ) // A Win-held ID exists only so RegisterHotKey matches when Win happens to diff --git a/open.go b/open.go index 2914a793a..b9af31678 100644 --- a/open.go +++ b/open.go @@ -22,10 +22,10 @@ import ( "github.com/urfave/cli/v3" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/internal/deeplink" - "github.com/bjarneo/cliamp/ipc" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/internal/deeplink" + "github.com/bjarneo/cliamp/v2/ipc" ) // deepLinkStartupTimeout bounds how long a cold start waits for its own IPC diff --git a/open_test.go b/open_test.go index 7dea79ab2..f1d4e51b2 100644 --- a/open_test.go +++ b/open_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/deeplink" - "github.com/bjarneo/cliamp/ipc" + "github.com/bjarneo/cliamp/v2/internal/deeplink" + "github.com/bjarneo/cliamp/v2/ipc" ) // sentOperation is one operation that dispatchDeepLink submitted. diff --git a/player/decode.go b/player/decode.go index a45cc9037..ccefb48ef 100644 --- a/player/decode.go +++ b/player/decode.go @@ -13,14 +13,14 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/sshurl" + "github.com/bjarneo/cliamp/v2/internal/sshurl" "github.com/gopxl/beep/v2" "github.com/gopxl/beep/v2/flac" "github.com/gopxl/beep/v2/vorbis" "github.com/gopxl/beep/v2/wav" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) // httpClient is the shared streaming HTTP client. See internal/httpclient diff --git a/player/decode_test.go b/player/decode_test.go index 7e29c8211..7d782410e 100644 --- a/player/decode_test.go +++ b/player/decode_test.go @@ -6,8 +6,8 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestIsHLS(t *testing.T) { diff --git a/player/nav_buffer.go b/player/nav_buffer.go index ed2a7451b..e657c329e 100644 --- a/player/nav_buffer.go +++ b/player/nav_buffer.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) // readStallTimeout is how long a navReader waits for new data before it diff --git a/player/nav_buffer_test.go b/player/nav_buffer_test.go index af5d75d4c..0889aff88 100644 --- a/player/nav_buffer_test.go +++ b/player/nav_buffer_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) // startNavRead reads n bytes from r in a goroutine. started closes before the diff --git a/player/pipeline_test.go b/player/pipeline_test.go index 738a74ff9..7e76cf752 100644 --- a/player/pipeline_test.go +++ b/player/pipeline_test.go @@ -19,7 +19,7 @@ import ( "github.com/gopxl/beep/v2/generators" "github.com/gopxl/beep/v2/wav" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // installPipelineRouteFixtures puts fake ffmpeg, ffprobe and ssh binaries diff --git a/player/ytdl.go b/player/ytdl.go index ce5d7bb1a..9aab09b4f 100644 --- a/player/ytdl.go +++ b/player/ytdl.go @@ -15,8 +15,8 @@ import ( "github.com/gopxl/beep/v2" - "github.com/bjarneo/cliamp/internal/ytdlcookies" - "github.com/bjarneo/cliamp/internal/ytdlp" + "github.com/bjarneo/cliamp/v2/internal/ytdlcookies" + "github.com/bjarneo/cliamp/v2/internal/ytdlp" ) // pipeBufSize is the buffer size for audio pipe readers (yt-dlp, ffmpeg). diff --git a/player/ytdl_cookies_test.go b/player/ytdl_cookies_test.go index 88cb4965d..32bf483a4 100644 --- a/player/ytdl_cookies_test.go +++ b/player/ytdl_cookies_test.go @@ -4,7 +4,7 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/internal/ytdlcookies" + "github.com/bjarneo/cliamp/v2/internal/ytdlcookies" ) func TestAppendYTDLCookieArgsSelectsBrowserByURLHost(t *testing.T) { diff --git a/playlist/tags.go b/playlist/tags.go index 0c1ce8593..5646a1524 100644 --- a/playlist/tags.go +++ b/playlist/tags.go @@ -12,7 +12,7 @@ import ( "github.com/dhowden/tag" - "github.com/bjarneo/cliamp/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/appdir" ) const ( diff --git a/playlist/tracktoml_test.go b/playlist/tracktoml_test.go index a74c306e7..bea4dc47d 100644 --- a/playlist/tracktoml_test.go +++ b/playlist/tracktoml_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/internal/tomlutil" + "github.com/bjarneo/cliamp/v2/internal/tomlutil" ) // fullTOMLTrack sets every exported Track field, so the tests show which diff --git a/pluginmgr/pluginmgr.go b/pluginmgr/pluginmgr.go index 57bffc2c2..023fd8a78 100644 --- a/pluginmgr/pluginmgr.go +++ b/pluginmgr/pluginmgr.go @@ -16,11 +16,11 @@ import ( "time" "unicode" - "github.com/bjarneo/cliamp/internal/appdir" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/plugintrust" - "github.com/bjarneo/cliamp/luaplugin" + "github.com/bjarneo/cliamp/v2/internal/appdir" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/plugintrust" + "github.com/bjarneo/cliamp/v2/luaplugin" ) var httpClient = httpclient.NewAPI(30 * time.Second) diff --git a/pluginmgr/pluginmgr_test.go b/pluginmgr/pluginmgr_test.go index 9905079a1..0b23156fc 100644 --- a/pluginmgr/pluginmgr_test.go +++ b/pluginmgr/pluginmgr_test.go @@ -14,8 +14,8 @@ import ( "time" "unicode" - "github.com/bjarneo/cliamp/internal/plugintrust" - "github.com/bjarneo/cliamp/luaplugin" + "github.com/bjarneo/cliamp/v2/internal/plugintrust" + "github.com/bjarneo/cliamp/v2/luaplugin" ) // redirectTransport rewrites every request's Host to point at target. diff --git a/pluginmgr/proxy_test.go b/pluginmgr/proxy_test.go index a3a35bc6d..d7590fd98 100644 --- a/pluginmgr/proxy_test.go +++ b/pluginmgr/proxy_test.go @@ -6,7 +6,7 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/internal/httpclient/httpclienttest" + "github.com/bjarneo/cliamp/v2/internal/httpclient/httpclienttest" ) // TestDownloadUsesEnvironmentProxy checks that plugin downloads follow diff --git a/provider/add.go b/provider/add.go index 7a1c02da8..d722e617e 100644 --- a/provider/add.go +++ b/provider/add.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) var errAddUnsupported = errors.New("provider does not support adding tracks") diff --git a/provider/add_test.go b/provider/add_test.go index 59cfaed64..bcd9bfafa 100644 --- a/provider/add_test.go +++ b/provider/add_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) type addTestProvider struct{ added []string } diff --git a/provider/interfaces.go b/provider/interfaces.go index 7ec9f69e5..e3feeb7d2 100644 --- a/provider/interfaces.go +++ b/provider/interfaces.go @@ -6,7 +6,7 @@ import ( "github.com/gopxl/beep/v2" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // Searcher is implemented by providers that support searching for tracks. diff --git a/provider/types.go b/provider/types.go index 4d5a31143..f525cb834 100644 --- a/provider/types.go +++ b/provider/types.go @@ -8,7 +8,7 @@ package provider import ( "strconv" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // Entry pairs a display name with a key and provider implementation. The diff --git a/provider_log_test.go b/provider_log_test.go index a56e46e6a..a6c0ee93e 100644 --- a/provider_log_test.go +++ b/provider_log_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/provider" ) // readLog opens a fresh log file for the test and returns a func that reads diff --git a/providers.go b/providers.go index 2fcb0c358..82d485199 100644 --- a/providers.go +++ b/providers.go @@ -11,37 +11,37 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/external/audiobookshelf" - "github.com/bjarneo/cliamp/external/bandcamp" - "github.com/bjarneo/cliamp/external/emby" - "github.com/bjarneo/cliamp/external/jellyfin" - "github.com/bjarneo/cliamp/external/local" - "github.com/bjarneo/cliamp/external/lyrion" - "github.com/bjarneo/cliamp/external/mixcloud" - "github.com/bjarneo/cliamp/external/navidrome" - "github.com/bjarneo/cliamp/external/netease" - "github.com/bjarneo/cliamp/external/plex" - "github.com/bjarneo/cliamp/external/podcast" - "github.com/bjarneo/cliamp/external/qobuz" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/external/radiometa" - "github.com/bjarneo/cliamp/external/soundcloud" - "github.com/bjarneo/cliamp/external/spotify" - "github.com/bjarneo/cliamp/external/tidal" - "github.com/bjarneo/cliamp/external/yandex" - "github.com/bjarneo/cliamp/external/ytmusic" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/internal/embyapi" - "github.com/bjarneo/cliamp/internal/resume" - "github.com/bjarneo/cliamp/internal/ytdlp" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/resolve" - "github.com/bjarneo/cliamp/ui/model" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/external/audiobookshelf" + "github.com/bjarneo/cliamp/v2/external/bandcamp" + "github.com/bjarneo/cliamp/v2/external/emby" + "github.com/bjarneo/cliamp/v2/external/jellyfin" + "github.com/bjarneo/cliamp/v2/external/local" + "github.com/bjarneo/cliamp/v2/external/lyrion" + "github.com/bjarneo/cliamp/v2/external/mixcloud" + "github.com/bjarneo/cliamp/v2/external/navidrome" + "github.com/bjarneo/cliamp/v2/external/netease" + "github.com/bjarneo/cliamp/v2/external/plex" + "github.com/bjarneo/cliamp/v2/external/podcast" + "github.com/bjarneo/cliamp/v2/external/qobuz" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/external/radiometa" + "github.com/bjarneo/cliamp/v2/external/soundcloud" + "github.com/bjarneo/cliamp/v2/external/spotify" + "github.com/bjarneo/cliamp/v2/external/tidal" + "github.com/bjarneo/cliamp/v2/external/yandex" + "github.com/bjarneo/cliamp/v2/external/ytmusic" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/internal/embyapi" + "github.com/bjarneo/cliamp/v2/internal/resume" + "github.com/bjarneo/cliamp/v2/internal/ytdlp" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/resolve" + "github.com/bjarneo/cliamp/v2/ui/model" ) // providerSet holds the providers of one run, in the order of the provider diff --git a/providers_test.go b/providers_test.go index d2f4c4d48..e04f6d65b 100644 --- a/providers_test.go +++ b/providers_test.go @@ -13,18 +13,18 @@ import ( "github.com/gopxl/beep/v2" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/external/bandcamp" - "github.com/bjarneo/cliamp/external/emby" - "github.com/bjarneo/cliamp/external/jellyfin" - "github.com/bjarneo/cliamp/external/navidrome" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/internal/resume" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/ui/model" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/external/bandcamp" + "github.com/bjarneo/cliamp/v2/external/emby" + "github.com/bjarneo/cliamp/v2/external/jellyfin" + "github.com/bjarneo/cliamp/v2/external/navidrome" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/internal/resume" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/ui/model" ) // isolateProviderEnv points every config and credential lookup at a new diff --git a/resolve/feed.go b/resolve/feed.go index d85d00d3a..78bee2ad4 100644 --- a/resolve/feed.go +++ b/resolve/feed.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" "golang.org/x/net/html/charset" ) diff --git a/resolve/feed_test.go b/resolve/feed_test.go index 9bb30c869..c627c7ff5 100644 --- a/resolve/feed_test.go +++ b/resolve/feed_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestFeedMetadata(t *testing.T) { diff --git a/resolve/m3u.go b/resolve/m3u.go index fb458e9c5..52c72e507 100644 --- a/resolve/m3u.go +++ b/resolve/m3u.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // m3uEntry holds a single parsed M3U entry with optional EXTINF metadata. diff --git a/resolve/pls.go b/resolve/pls.go index ffc9d8161..1c360ae37 100644 --- a/resolve/pls.go +++ b/resolve/pls.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // plsEntry holds a single parsed PLS entry. diff --git a/resolve/proxy_test.go b/resolve/proxy_test.go index fae5134f3..1e42f3657 100644 --- a/resolve/proxy_test.go +++ b/resolve/proxy_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/internal/httpclient/httpclienttest" + "github.com/bjarneo/cliamp/v2/internal/httpclient/httpclienttest" ) // TestClientsUseEnvironmentProxy checks that feed, sniff and YouTube page diff --git a/resolve/related.go b/resolve/related.go index c5003f5e1..d1030000a 100644 --- a/resolve/related.go +++ b/resolve/related.go @@ -5,8 +5,8 @@ import ( "net/url" "strings" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // YouTubeRelater finds songs related to a YouTube or YouTube Music video from diff --git a/resolve/related_test.go b/resolve/related_test.go index d3a2030dd..d0448bdcf 100644 --- a/resolve/related_test.go +++ b/resolve/related_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestYouTubeRelaterCanRelate(t *testing.T) { diff --git a/resolve/remote_entries.go b/resolve/remote_entries.go index 6db5bb9c1..b36225a2f 100644 --- a/resolve/remote_entries.go +++ b/resolve/remote_entries.go @@ -3,7 +3,7 @@ package resolve import ( "strings" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // filterRemoteEntries drops tracks from a network-fetched playlist whose path diff --git a/resolve/remote_entries_test.go b/resolve/remote_entries_test.go index cf09bb7d2..482dad44f 100644 --- a/resolve/remote_entries_test.go +++ b/resolve/remote_entries_test.go @@ -3,7 +3,7 @@ package resolve import ( "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestURIScheme(t *testing.T) { diff --git a/resolve/resolve.go b/resolve/resolve.go index 96ee08b97..7488ba2d7 100644 --- a/resolve/resolve.go +++ b/resolve/resolve.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/bjarneo/cliamp/internal/httpclient" - "github.com/bjarneo/cliamp/internal/ytdlcookies" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/ytdlcookies" + "github.com/bjarneo/cliamp/v2/playlist" "github.com/kkdai/youtube/v2" ) diff --git a/resolve/resolve_test.go b/resolve/resolve_test.go index 86520c519..ba04b5a45 100644 --- a/resolve/resolve_test.go +++ b/resolve/resolve_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestArgsTreatsXiaoyuzhouEpisodeAsPending(t *testing.T) { diff --git a/resolve/xiaoyuzhou.go b/resolve/xiaoyuzhou.go index ea9d37d8f..bfcd6413c 100644 --- a/resolve/xiaoyuzhou.go +++ b/resolve/xiaoyuzhou.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) var ( diff --git a/resolve/ytdl_playlists.go b/resolve/ytdl_playlists.go index 51fb61ee9..6f0d05177 100644 --- a/resolve/ytdl_playlists.go +++ b/resolve/ytdl_playlists.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/ytdlcookies" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/ytdlcookies" + "github.com/bjarneo/cliamp/v2/playlist" ) // ytdlPlaylistFeedEntry holds JSON fields for a single playlist item returned diff --git a/site/index.html b/site/index.html index fe914a790..388a9d649 100644 --- a/site/index.html +++ b/site/index.html @@ -404,9 +404,9 @@

Install

NIXcopy nix run github:bjarneo/cliamp -

then just run cliamp — cliamp setup walks you through streaming services and media servers. Optional: ffmpeg for AAC, ALAC, Opus and WMA, yt-dlp for YouTube, YouTube Music, SoundCloud, Mixcloud, Bandcamp, Bilibili and NetEase. GNOME Keyring browser cookies also require Python secretstorage on Linux. Behind a proxy? cliamp reads HTTP_PROXY, HTTPS_PROXY, ALL_PROXY and NO_PROXY, and SOCKS5 proxies work (proxy docs). Windows builds are in Releases. Windows source builds need CGO and MSYS2 MinGW64 even when Spotify is not configured; see the source-build instructions.

diff --git a/theme/load_test.go b/theme/load_test.go index 11918d011..9d5a4d8d6 100644 --- a/theme/load_test.go +++ b/theme/load_test.go @@ -9,7 +9,7 @@ import ( "testing" "testing/fstest" - "github.com/bjarneo/cliamp/applog" + "github.com/bjarneo/cliamp/v2/applog" ) func TestLoadAllIncludesBuiltinThemes(t *testing.T) { diff --git a/theme/theme.go b/theme/theme.go index f4707ae63..6639dade7 100644 --- a/theme/theme.go +++ b/theme/theme.go @@ -17,8 +17,8 @@ import ( "strings" "sync" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/internal/appdir" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/internal/appdir" ) //go:embed themes/*.toml diff --git a/tracksave/save.go b/tracksave/save.go index 458bce043..6abad8cf9 100644 --- a/tracksave/save.go +++ b/tracksave/save.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "github.com/bjarneo/cliamp/internal/fileutil" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/internal/fileutil" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/resolve" ) // Directory resolves the configured directory, falling back to ~/Music/cliamp. diff --git a/tracksave/save_test.go b/tracksave/save_test.go index c0c2d332a..d91442fbc 100644 --- a/tracksave/save_test.go +++ b/tracksave/save_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestSaveToCopiesTemporaryDownload(t *testing.T) { diff --git a/ui/model/actions.go b/ui/model/actions.go index af2c3acd4..c02705adc 100644 --- a/ui/model/actions.go +++ b/ui/model/actions.go @@ -3,7 +3,7 @@ package model import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // This file holds one action verb for each user intent that more than one diff --git a/ui/model/audio_test.go b/ui/model/audio_test.go index 0ccded565..b3a98e665 100644 --- a/ui/model/audio_test.go +++ b/ui/model/audio_test.go @@ -5,7 +5,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func newEQTestModel(custom [eqBandCount]float64, saver ConfigSaver) Model { diff --git a/ui/model/audiobookshelf_resume_test.go b/ui/model/audiobookshelf_resume_test.go index bdc2b41e7..b4ed952c3 100644 --- a/ui/model/audiobookshelf_resume_test.go +++ b/ui/model/audiobookshelf_resume_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // resumeProv is a stub provider that reports a fixed resume target. diff --git a/ui/model/backfill_duration_test.go b/ui/model/backfill_duration_test.go index 12b1a4d4e..311446aab 100644 --- a/ui/model/backfill_duration_test.go +++ b/ui/model/backfill_duration_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) // backfillTestProvider is a local playlist store that records its calls. diff --git a/ui/model/channel_immediate_test.go b/ui/model/channel_immediate_test.go index c58d48169..2b69505aa 100644 --- a/ui/model/channel_immediate_test.go +++ b/ui/model/channel_immediate_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestOpenProviderListImmediateNavigation(t *testing.T) { diff --git a/ui/model/command_registry.go b/ui/model/command_registry.go index c86721862..b7086446b 100644 --- a/ui/model/command_registry.go +++ b/ui/model/command_registry.go @@ -6,7 +6,7 @@ import ( "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/provider" ) // commandMode identifies the UI contexts in which a command is available. diff --git a/ui/model/command_registry_test.go b/ui/model/command_registry_test.go index 9412277fd..e867b9368 100644 --- a/ui/model/command_registry_test.go +++ b/ui/model/command_registry_test.go @@ -6,8 +6,8 @@ import ( "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func TestCommandHelpKeepsEssentialHintsAtMinimumWidth(t *testing.T) { diff --git a/ui/model/commands.go b/ui/model/commands.go index aa0660989..5fbeeeb1c 100644 --- a/ui/model/commands.go +++ b/ui/model/commands.go @@ -8,13 +8,13 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/lyrics" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/lyrics" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/resolve" ) // — Message types used by tea.Cmd constructors — diff --git a/ui/model/commands_subs.go b/ui/model/commands_subs.go index e60a901d8..277c104a6 100644 --- a/ui/model/commands_subs.go +++ b/ui/model/commands_subs.go @@ -6,8 +6,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // subsLoadMode says what to do with the episodes a subscription returns. diff --git a/ui/model/commands_test.go b/ui/model/commands_test.go index 4d895c415..f7b03bf87 100644 --- a/ui/model/commands_test.go +++ b/ui/model/commands_test.go @@ -7,11 +7,11 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/ui" ) type commandsTestProvider struct { diff --git a/ui/model/custom_stream_test.go b/ui/model/custom_stream_test.go index abc773658..677d355d7 100644 --- a/ui/model/custom_stream_test.go +++ b/ui/model/custom_stream_test.go @@ -13,12 +13,12 @@ import ( tea "charm.land/bubbletea/v2" "github.com/gopxl/beep/v2" - "github.com/bjarneo/cliamp/external/local" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/external/local" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/ui" ) // customStreamTestProvider claims spotify: URIs like the Spotify provider. diff --git a/ui/model/dirs_screen_test.go b/ui/model/dirs_screen_test.go index e24dede23..846b5e6d5 100644 --- a/ui/model/dirs_screen_test.go +++ b/ui/model/dirs_screen_test.go @@ -12,11 +12,11 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/ui" ) // dirSourceTestProvider is a local provider that also implements diff --git a/ui/model/download_directory_test.go b/ui/model/download_directory_test.go index 5ebbf77d3..05c7f5450 100644 --- a/ui/model/download_directory_test.go +++ b/ui/model/download_directory_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestSaveUsesConfiguredDirectory(t *testing.T) { diff --git a/ui/model/empty_state_test.go b/ui/model/empty_state_test.go index 4b0ddc407..b752c93a5 100644 --- a/ui/model/empty_state_test.go +++ b/ui/model/empty_state_test.go @@ -6,8 +6,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestEmptyStatesNameTheNextStep(t *testing.T) { diff --git a/ui/model/favorites.go b/ui/model/favorites.go index 0ca0eac6a..12dbc2072 100644 --- a/ui/model/favorites.go +++ b/ui/model/favorites.go @@ -7,9 +7,9 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // trackFavoriteSyncTimeout limits one provider favorite call. diff --git a/ui/model/favorites_test.go b/ui/model/favorites_test.go index fd45a5fb4..30fffe6f2 100644 --- a/ui/model/favorites_test.go +++ b/ui/model/favorites_test.go @@ -9,11 +9,11 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // fakeTrackFavoriter is a provider.TrackFavoriter that owns tracks whose diff --git a/ui/model/filebrowser.go b/ui/model/filebrowser.go index c9c9bdada..1537bd759 100644 --- a/ui/model/filebrowser.go +++ b/ui/model/filebrowser.go @@ -8,9 +8,9 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/fuzzy" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/internal/fuzzy" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/resolve" ) // fbEntry is a single item in the file browser listing. diff --git a/ui/model/filter_list_test.go b/ui/model/filter_list_test.go index 02179f901..a10ac833c 100644 --- a/ui/model/filter_list_test.go +++ b/ui/model/filter_list_test.go @@ -5,8 +5,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" ) func TestFilterListViewCountAndRawIndex(t *testing.T) { diff --git a/ui/model/find_capable_test.go b/ui/model/find_capable_test.go index d84ac37e8..f922af4ae 100644 --- a/ui/model/find_capable_test.go +++ b/ui/model/find_capable_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // capableProv reports playback only for the tracks whose path is its path. diff --git a/ui/model/full_vis_title_test.go b/ui/model/full_vis_title_test.go index dbec389d4..f178678b8 100644 --- a/ui/model/full_vis_title_test.go +++ b/ui/model/full_vis_title_test.go @@ -6,7 +6,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func fullVisModel(t *testing.T) *Model { diff --git a/ui/model/genre_browser_test.go b/ui/model/genre_browser_test.go index 132fa0638..912da3a2f 100644 --- a/ui/model/genre_browser_test.go +++ b/ui/model/genre_browser_test.go @@ -8,8 +8,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) type genreBrowserProvider struct { diff --git a/ui/model/headless_ipc_test.go b/ui/model/headless_ipc_test.go index 45cebc908..5ea6e67c2 100644 --- a/ui/model/headless_ipc_test.go +++ b/ui/model/headless_ipc_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/external/local" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/external/local" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // The tests in this file drive a headless Model with no WindowSizeMsg. They diff --git a/ui/model/headless_test.go b/ui/model/headless_test.go index d5247328d..9638cdde0 100644 --- a/ui/model/headless_test.go +++ b/ui/model/headless_test.go @@ -14,13 +14,13 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/ui" ) // headlessEngine is a player fake for headless Model tests. It fills the diff --git a/ui/model/init.go b/ui/model/init.go index 04e0b2e79..b347837cc 100644 --- a/ui/model/init.go +++ b/ui/model/init.go @@ -7,15 +7,15 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" ) type openDefaultProviderBrowserMsg struct{} diff --git a/ui/model/inline_overlays.go b/ui/model/inline_overlays.go index a6140fa30..6b3c484e8 100644 --- a/ui/model/inline_overlays.go +++ b/ui/model/inline_overlays.go @@ -7,10 +7,10 @@ import ( "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/lyrics" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/theme" + "github.com/bjarneo/cliamp/v2/lyrics" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/theme" ) // Inline overlays render in the playlist region while the now-playing, diff --git a/ui/model/inline_overlays_nav.go b/ui/model/inline_overlays_nav.go index f3c67a2c4..266bf2981 100644 --- a/ui/model/inline_overlays_nav.go +++ b/ui/model/inline_overlays_nav.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/provider" ) // — provider browser (nav) — diff --git a/ui/model/interaction_test.go b/ui/model/interaction_test.go index f9297ec16..657671d55 100644 --- a/ui/model/interaction_test.go +++ b/ui/model/interaction_test.go @@ -8,9 +8,9 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) type interactionBrowseProvider struct { diff --git a/ui/model/ipc_extended.go b/ui/model/ipc_extended.go index bcfff9e29..7a0fbe70c 100644 --- a/ui/model/ipc_extended.go +++ b/ui/model/ipc_extended.go @@ -9,12 +9,12 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/lyrics" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/resolve" - "github.com/bjarneo/cliamp/tracksave" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/lyrics" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/resolve" + "github.com/bjarneo/cliamp/v2/tracksave" ) // ipcLibraryRequest carries a provider or saved-playlist operation to diff --git a/ui/model/ipc_podcast_test.go b/ui/model/ipc_podcast_test.go index 9948db42a..1a3244bfd 100644 --- a/ui/model/ipc_podcast_test.go +++ b/ui/model/ipc_podcast_test.go @@ -14,8 +14,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" ) const ipcPodcastRSS = `Podcast diff --git a/ui/model/ipc_runtime.go b/ui/model/ipc_runtime.go index be09725f2..fbe0e14b7 100644 --- a/ui/model/ipc_runtime.go +++ b/ui/model/ipc_runtime.go @@ -10,11 +10,11 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" ) const ( diff --git a/ui/model/ipc_runtime_test.go b/ui/model/ipc_runtime_test.go index 5d3600cb9..a2d2ff80a 100644 --- a/ui/model/ipc_runtime_test.go +++ b/ui/model/ipc_runtime_test.go @@ -11,13 +11,13 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" ) // v2Request returns the V2RequestMsg that the TUI dispatcher in main.go sends diff --git a/ui/model/key_drift_test.go b/ui/model/key_drift_test.go index 4f95b448f..ece258e41 100644 --- a/ui/model/key_drift_test.go +++ b/ui/model/key_drift_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // keyCodeNames gives the key name of each tea key code that a handler diff --git a/ui/model/keymap_test.go b/ui/model/keymap_test.go index ba37bffd4..6504c3432 100644 --- a/ui/model/keymap_test.go +++ b/ui/model/keymap_test.go @@ -7,7 +7,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // mainKeyPath lists the functions of the main key path: handleKey without diff --git a/ui/model/keys.go b/ui/model/keys.go index fa5c4d50d..1b2b63e23 100644 --- a/ui/model/keys.go +++ b/ui/model/keys.go @@ -8,9 +8,9 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/tracksave" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/tracksave" ) // quit shuts down the player and signals the TUI to exit. diff --git a/ui/model/keys_dispatch_test.go b/ui/model/keys_dispatch_test.go index e1d642fa9..b1f20ecb2 100644 --- a/ui/model/keys_dispatch_test.go +++ b/ui/model/keys_dispatch_test.go @@ -6,10 +6,10 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/ui" ) // shortcutTestModel registers a provider for every Shift+letter shortcut, diff --git a/ui/model/keys_fullvis_plugin_test.go b/ui/model/keys_fullvis_plugin_test.go index b58714e60..767973ea5 100644 --- a/ui/model/keys_fullvis_plugin_test.go +++ b/ui/model/keys_fullvis_plugin_test.go @@ -7,8 +7,8 @@ import ( "time" tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/plugintrust" - "github.com/bjarneo/cliamp/luaplugin" + "github.com/bjarneo/cliamp/v2/internal/plugintrust" + "github.com/bjarneo/cliamp/v2/luaplugin" ) // newKeyTestPlugin loads a plugin that reports the key it was given. The diff --git a/ui/model/keys_nav.go b/ui/model/keys_nav.go index 02d6b8df2..bb9b7875e 100644 --- a/ui/model/keys_nav.go +++ b/ui/model/keys_nav.go @@ -6,8 +6,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // handleNavBrowserKey processes key presses while the provider browser is open. diff --git a/ui/model/keys_plmgr.go b/ui/model/keys_plmgr.go index af39f0fad..2f9bb710b 100644 --- a/ui/model/keys_plmgr.go +++ b/ui/model/keys_plmgr.go @@ -10,10 +10,10 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // handlePlaylistManagerKey dispatches keys to the active manager screen. diff --git a/ui/model/keys_radio.go b/ui/model/keys_radio.go index c2d05d951..b4c905ca3 100644 --- a/ui/model/keys_radio.go +++ b/ui/model/keys_radio.go @@ -3,9 +3,9 @@ package model import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // maybeLoadCatalogBatch triggers a catalog batch fetch when the cursor is near the diff --git a/ui/model/keys_search.go b/ui/model/keys_search.go index 690523e23..5f1af9bab 100644 --- a/ui/model/keys_search.go +++ b/ui/model/keys_search.go @@ -5,8 +5,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // openProviderSearch opens the active provider's native search overlay if it diff --git a/ui/model/keys_search_overlay.go b/ui/model/keys_search_overlay.go index 24b5cd93f..e8b247ee4 100644 --- a/ui/model/keys_search_overlay.go +++ b/ui/model/keys_search_overlay.go @@ -6,8 +6,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // handleSearchOverlayKey dispatches key presses to the active provider search screen. diff --git a/ui/model/keys_subs.go b/ui/model/keys_subs.go index e811b5e3e..1bfe670b2 100644 --- a/ui/model/keys_subs.go +++ b/ui/model/keys_subs.go @@ -3,9 +3,9 @@ package model import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/fuzzy" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/internal/fuzzy" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // subscriptionProvider returns the first provider that lists subscriptions diff --git a/ui/model/layout.go b/ui/model/layout.go index 213d1afc0..2ccc0d55e 100644 --- a/ui/model/layout.go +++ b/ui/model/layout.go @@ -3,7 +3,7 @@ package model import ( "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/ui" ) type layoutTier int diff --git a/ui/model/layout_test.go b/ui/model/layout_test.go index d7e5b29fa..88807d29d 100644 --- a/ui/model/layout_test.go +++ b/ui/model/layout_test.go @@ -11,10 +11,10 @@ import ( tea "charm.land/bubbletea/v2" "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" ) func newLayoutTestModel(width, height int) Model { diff --git a/ui/model/loaded_playlist_test.go b/ui/model/loaded_playlist_test.go index db9105fd3..da8c1f0b8 100644 --- a/ui/model/loaded_playlist_test.go +++ b/ui/model/loaded_playlist_test.go @@ -9,13 +9,13 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/external/local" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/external/local" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/ui" ) // The queue edits, the playlist manager and the duration backfill save diff --git a/ui/model/loading_spinner_test.go b/ui/model/loading_spinner_test.go index 5bd93c334..e56c266d2 100644 --- a/ui/model/loading_spinner_test.go +++ b/ui/model/loading_spinner_test.go @@ -8,7 +8,7 @@ import ( tea "charm.land/bubbletea/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // loadingSpinnerCases puts the model into each load that shows a spinner. diff --git a/ui/model/local_manager_inline_test.go b/ui/model/local_manager_inline_test.go index 6eb4379dd..845ed84de 100644 --- a/ui/model/local_manager_inline_test.go +++ b/ui/model/local_manager_inline_test.go @@ -5,9 +5,9 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/ui" ) type localInlineFake struct { diff --git a/ui/model/location_consent_test.go b/ui/model/location_consent_test.go index d2d1c4fc8..6f5002aae 100644 --- a/ui/model/location_consent_test.go +++ b/ui/model/location_consent_test.go @@ -5,8 +5,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // locationProvider is a radio-shaped provider: a Countries section whose first diff --git a/ui/model/lyrics.go b/ui/model/lyrics.go index f0870ec64..a32025409 100644 --- a/ui/model/lyrics.go +++ b/ui/model/lyrics.go @@ -7,8 +7,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/lyrics" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/lyrics" + "github.com/bjarneo/cliamp/v2/playlist" ) // trackLyricsSource is a provider that has synced lyrics for its own tracks, diff --git a/ui/model/lyrics_offset_test.go b/ui/model/lyrics_offset_test.go index 7715d77e9..08978c206 100644 --- a/ui/model/lyrics_offset_test.go +++ b/ui/model/lyrics_offset_test.go @@ -6,8 +6,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/lyrics" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/lyrics" + "github.com/bjarneo/cliamp/v2/playlist" ) // A positive offset must advance the position used for highlighting, so `]` diff --git a/ui/model/lyrics_source_test.go b/ui/model/lyrics_source_test.go index 3cc9c9517..f60393f3e 100644 --- a/ui/model/lyrics_source_test.go +++ b/ui/model/lyrics_source_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/lyrics" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/lyrics" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // fakeLyricsSource answers for the tracks whose path starts with prefix, as diff --git a/ui/model/lyrics_test.go b/ui/model/lyrics_test.go index fa551fe75..e1bb3c6ca 100644 --- a/ui/model/lyrics_test.go +++ b/ui/model/lyrics_test.go @@ -6,8 +6,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/lyrics" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/lyrics" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestLyricsSyncable(t *testing.T) { diff --git a/ui/model/metadata.go b/ui/model/metadata.go index a1894db3b..b26437301 100644 --- a/ui/model/metadata.go +++ b/ui/model/metadata.go @@ -8,7 +8,7 @@ import ( "charm.land/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) const metadataPaneMaxRows = 8 diff --git a/ui/model/metadata_test.go b/ui/model/metadata_test.go index 3b6c77b31..650bcdd1c 100644 --- a/ui/model/metadata_test.go +++ b/ui/model/metadata_test.go @@ -11,8 +11,8 @@ import ( tea "charm.land/bubbletea/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) func TestMetadataFields(t *testing.T) { diff --git a/ui/model/model.go b/ui/model/model.go index 7e9d98378..da6e2e56d 100644 --- a/ui/model/model.go +++ b/ui/model/model.go @@ -6,16 +6,16 @@ import ( "sync/atomic" "time" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" ) // ConfigSaver persists top-level config keys with typed values. diff --git a/ui/model/nav_labels.go b/ui/model/nav_labels.go index 225860363..5cf15a1bf 100644 --- a/ui/model/nav_labels.go +++ b/ui/model/nav_labels.go @@ -3,7 +3,7 @@ package model import ( "strings" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/provider" ) // navLabels holds the vocabulary the browse overlay uses for the catalog diff --git a/ui/model/nav_labels_test.go b/ui/model/nav_labels_test.go index be3d82203..357db7915 100644 --- a/ui/model/nav_labels_test.go +++ b/ui/model/nav_labels_test.go @@ -3,7 +3,7 @@ package model import ( "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // labelProv supplies non-music browse vocabulary. diff --git a/ui/model/nav_search_pagination_test.go b/ui/model/nav_search_pagination_test.go index 834995855..e0182a4fa 100644 --- a/ui/model/nav_search_pagination_test.go +++ b/ui/model/nav_search_pagination_test.go @@ -6,8 +6,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) type pagedAlbumBrowseProvider struct { diff --git a/ui/model/navigation_hierarchy_test.go b/ui/model/navigation_hierarchy_test.go index 3a5d33d32..7bd3607b2 100644 --- a/ui/model/navigation_hierarchy_test.go +++ b/ui/model/navigation_hierarchy_test.go @@ -5,8 +5,8 @@ import ( "testing" "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" "github.com/charmbracelet/x/ansi" ) diff --git a/ui/model/notifications.go b/ui/model/notifications.go index 948bd5e23..d3c41e62e 100644 --- a/ui/model/notifications.go +++ b/ui/model/notifications.go @@ -6,12 +6,12 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // playbackNotice is the playback state that the media controls and the diff --git a/ui/model/notifications_test.go b/ui/model/notifications_test.go index 761785c67..6ae338089 100644 --- a/ui/model/notifications_test.go +++ b/ui/model/notifications_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/playlist" ) // positionCountingEngine counts the reads of the engine position. diff --git a/ui/model/notifier_attach_test.go b/ui/model/notifier_attach_test.go index d74ae7528..3af6ca15c 100644 --- a/ui/model/notifier_attach_test.go +++ b/ui/model/notifier_attach_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/playlist" ) type fakeNotifier struct { diff --git a/ui/model/overlay_inline_test.go b/ui/model/overlay_inline_test.go index 4fdd0d2c5..908e82c76 100644 --- a/ui/model/overlay_inline_test.go +++ b/ui/model/overlay_inline_test.go @@ -7,8 +7,8 @@ import ( "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) // newInlineOverlayModel builds a Model with a fake engine, playlist and visualizer diff --git a/ui/model/overlays.go b/ui/model/overlays.go index d4ff6112a..ffd0eb437 100644 --- a/ui/model/overlays.go +++ b/ui/model/overlays.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" ) // openThemePicker re-loads themes from disk (picking up new user files) diff --git a/ui/model/overlays_table_test.go b/ui/model/overlays_table_test.go index 1e1ac561e..5e8ae80b7 100644 --- a/ui/model/overlays_table_test.go +++ b/ui/model/overlays_table_test.go @@ -7,8 +7,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) // overlayOpeners sets the flag that opens each overlay in overlayStack. diff --git a/ui/model/panes.go b/ui/model/panes.go index f01390f19..b8f8825eb 100644 --- a/ui/model/panes.go +++ b/ui/model/panes.go @@ -8,7 +8,7 @@ import ( "time" "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/ui" "github.com/charmbracelet/x/ansi" ) diff --git a/ui/model/paste_test.go b/ui/model/paste_test.go index b2cc8dce8..0d2fc2e52 100644 --- a/ui/model/paste_test.go +++ b/ui/model/paste_test.go @@ -5,8 +5,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func TestHandlePasteRoutesToActiveInput(t *testing.T) { diff --git a/ui/model/pause_test.go b/ui/model/pause_test.go index 63213d7e5..3dc7ae19e 100644 --- a/ui/model/pause_test.go +++ b/ui/model/pause_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestShouldReconnectOnUnpause(t *testing.T) { diff --git a/ui/model/phase0_test.go b/ui/model/phase0_test.go index b597fa0fe..54a8833ed 100644 --- a/ui/model/phase0_test.go +++ b/ui/model/phase0_test.go @@ -7,10 +7,10 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/lyrics" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/lyrics" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/ui" ) func TestProviderSearchTakesPrecedenceOverNavigationBrowser(t *testing.T) { diff --git a/ui/model/picker_filter_test.go b/ui/model/picker_filter_test.go index bff054f14..04a7f1538 100644 --- a/ui/model/picker_filter_test.go +++ b/ui/model/picker_filter_test.go @@ -6,8 +6,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" "github.com/charmbracelet/x/ansi" ) diff --git a/ui/model/pl_picker.go b/ui/model/pl_picker.go index cc9c71391..3d4eee964 100644 --- a/ui/model/pl_picker.go +++ b/ui/model/pl_picker.go @@ -7,8 +7,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func (m *Model) openPlaylistPicker(tracks []playlist.Track, title string) { diff --git a/ui/model/playback.go b/ui/model/playback.go index 38c8cda47..508096f27 100644 --- a/ui/model/playback.go +++ b/ui/model/playback.go @@ -9,9 +9,9 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) const ( diff --git a/ui/model/playback_change_test.go b/ui/model/playback_change_test.go index 0dde03ce6..4c2411362 100644 --- a/ui/model/playback_change_test.go +++ b/ui/model/playback_change_test.go @@ -8,10 +8,10 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // countingReporter counts the scrobbles of each track. diff --git a/ui/model/playback_context_test.go b/ui/model/playback_context_test.go index 1d72e0c9e..cb94ccfda 100644 --- a/ui/model/playback_context_test.go +++ b/ui/model/playback_context_test.go @@ -8,8 +8,8 @@ import ( "time" tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) type savedPlaybackContext struct { diff --git a/ui/model/playback_nowplaying_test.go b/ui/model/playback_nowplaying_test.go index a434e51d1..7f9bf58e6 100644 --- a/ui/model/playback_nowplaying_test.go +++ b/ui/model/playback_nowplaying_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/plugintrust" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/internal/plugintrust" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // nowPlayingProv records ReportNowPlaying calls, which nowPlaying issues diff --git a/ui/model/playback_state.go b/ui/model/playback_state.go index a9199b535..7efd3a9b8 100644 --- a/ui/model/playback_state.go +++ b/ui/model/playback_state.go @@ -1,9 +1,9 @@ package model import ( - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" ) func (m Model) currentPlaybackTrack() (playlist.Track, int) { diff --git a/ui/model/playback_stop_test.go b/ui/model/playback_stop_test.go index 915bfd360..8c5e6b482 100644 --- a/ui/model/playback_stop_test.go +++ b/ui/model/playback_stop_test.go @@ -9,11 +9,11 @@ import ( "time" tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/internal/plugintrust" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/internal/plugintrust" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/playlist" ) // stopSpyPublisher records what plugins publish through p:publish. diff --git a/ui/model/playback_test.go b/ui/model/playback_test.go index 2472ec0ec..0054bb7ff 100644 --- a/ui/model/playback_test.go +++ b/ui/model/playback_test.go @@ -10,11 +10,11 @@ import ( "time" tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) type playbackFakeEngine struct { diff --git a/ui/model/playlist_render_state_test.go b/ui/model/playlist_render_state_test.go index c2289fbd8..099965a4f 100644 --- a/ui/model/playlist_render_state_test.go +++ b/ui/model/playlist_render_state_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestRenderQueueBodyPreservesVisibleQueuePositions(t *testing.T) { diff --git a/ui/model/playlist_rows_test.go b/ui/model/playlist_rows_test.go index 204e4d862..c8a9375e1 100644 --- a/ui/model/playlist_rows_test.go +++ b/ui/model/playlist_rows_test.go @@ -9,7 +9,7 @@ import ( tea "charm.land/bubbletea/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) const shuffleRowsTrackCount = 8 diff --git a/ui/model/plmgr_append.go b/ui/model/plmgr_append.go index eaae7be40..b88c09dfe 100644 --- a/ui/model/plmgr_append.go +++ b/ui/model/plmgr_append.go @@ -3,7 +3,7 @@ package model import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // addTracksToCurrentPlaylist appends tracks to the end of the current playlist diff --git a/ui/model/plmgr_append_test.go b/ui/model/plmgr_append_test.go index 51c61a14a..ddec8e43d 100644 --- a/ui/model/plmgr_append_test.go +++ b/ui/model/plmgr_append_test.go @@ -3,7 +3,7 @@ package model import ( "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func appendTestModel() *Model { diff --git a/ui/model/plugin_controls_test.go b/ui/model/plugin_controls_test.go index c65deae4b..9ef64b025 100644 --- a/ui/model/plugin_controls_test.go +++ b/ui/model/plugin_controls_test.go @@ -5,8 +5,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/playlist" ) // Lua plugins change the volume, the speed and mono through messages. The diff --git a/ui/model/plugin_events.go b/ui/model/plugin_events.go index 0bd835a00..9eb5fcff0 100644 --- a/ui/model/plugin_events.go +++ b/ui/model/plugin_events.go @@ -1,7 +1,7 @@ package model import ( - "github.com/bjarneo/cliamp/luaplugin" + "github.com/bjarneo/cliamp/v2/luaplugin" ) // pluginEmitState is the last player/queue state emitted to plugins. It lets diff --git a/ui/model/plugin_queue.go b/ui/model/plugin_queue.go index f98da95cd..4e4213fd4 100644 --- a/ui/model/plugin_queue.go +++ b/ui/model/plugin_queue.go @@ -3,8 +3,8 @@ package model import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/resolve" ) // PluginQueueMsg is sent by Lua plugins (cliamp.queue.*) to mutate the queue. diff --git a/ui/model/plugin_queue_test.go b/ui/model/plugin_queue_test.go index e32782910..0e9f300b6 100644 --- a/ui/model/plugin_queue_test.go +++ b/ui/model/plugin_queue_test.go @@ -3,7 +3,7 @@ package model import ( "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestPluginQueueAddTrackAppendsAsGiven(t *testing.T) { diff --git a/ui/model/plugin_state.go b/ui/model/plugin_state.go index 4c0f05d1b..e9dc43e0e 100644 --- a/ui/model/plugin_state.go +++ b/ui/model/plugin_state.go @@ -3,8 +3,8 @@ package model import ( "sync" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/playlist" ) // PluginState is the playback state that Lua plugins read. The Model diff --git a/ui/model/plugin_state_test.go b/ui/model/plugin_state_test.go index 1e5a3c2a7..b345b8c8d 100644 --- a/ui/model/plugin_state_test.go +++ b/ui/model/plugin_state_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) // pluginStateTestMsg is a message that Update ignores. It runs the deferred diff --git a/ui/model/podcast_browser_test.go b/ui/model/podcast_browser_test.go index 4275a4d1f..4ab6506bd 100644 --- a/ui/model/podcast_browser_test.go +++ b/ui/model/podcast_browser_test.go @@ -5,9 +5,9 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/external/podcast" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/external/podcast" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func TestPodcastBrowserOnlyOpensCategoryShows(t *testing.T) { diff --git a/ui/model/podcast_progress_test.go b/ui/model/podcast_progress_test.go index e84ee2d83..52817eba4 100644 --- a/ui/model/podcast_progress_test.go +++ b/ui/model/podcast_progress_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // stateProv is a stub provider that keeps listening state locally, the way the diff --git a/ui/model/preload.go b/ui/model/preload.go index 3f86bc869..b6dec3ef5 100644 --- a/ui/model/preload.go +++ b/ui/model/preload.go @@ -5,7 +5,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // streamPreloadLeadTime is how far before the end of a stream we arm the diff --git a/ui/model/preload_stale_test.go b/ui/model/preload_stale_test.go index 8ee8ccd91..ea98ceac9 100644 --- a/ui/model/preload_stale_test.go +++ b/ui/model/preload_stale_test.go @@ -10,10 +10,10 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // armedModel plays a.mp3 one second before its end, with b.mp3 next and diff --git a/ui/model/progressive_tracks_test.go b/ui/model/progressive_tracks_test.go index bd427fbfd..b96b6d27a 100644 --- a/ui/model/progressive_tracks_test.go +++ b/ui/model/progressive_tracks_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" ) var errStubLoad = errors.New("stub load failure") diff --git a/ui/model/provider_catalog_test.go b/ui/model/provider_catalog_test.go index 108e5117b..5b8766b20 100644 --- a/ui/model/provider_catalog_test.go +++ b/ui/model/provider_catalog_test.go @@ -8,8 +8,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) type catalogTestProvider struct { diff --git a/ui/model/provider_escape_test.go b/ui/model/provider_escape_test.go index 10bc78a83..7f6f3b50d 100644 --- a/ui/model/provider_escape_test.go +++ b/ui/model/provider_escape_test.go @@ -5,7 +5,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // Launching with nothing to play opens the provider browser (StartInProvider), diff --git a/ui/model/provider_favorite_test.go b/ui/model/provider_favorite_test.go index aec856558..e6fd88851 100644 --- a/ui/model/provider_favorite_test.go +++ b/ui/model/provider_favorite_test.go @@ -8,8 +8,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) type favoriteAlbumTestProvider struct { diff --git a/ui/model/providers.go b/ui/model/providers.go index 24ac18f91..36431bdb3 100644 --- a/ui/model/providers.go +++ b/ui/model/providers.go @@ -7,11 +7,11 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // radioListenersTTL is how long fetched listener counts stay fresh. A failed diff --git a/ui/model/queue_end_test.go b/ui/model/queue_end_test.go index 217c8b025..776a2f1fb 100644 --- a/ui/model/queue_end_test.go +++ b/ui/model/queue_end_test.go @@ -7,10 +7,10 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" ) // startedPlaybackTrack puts the model in the state it reaches after the engine diff --git a/ui/model/queue_ops.go b/ui/model/queue_ops.go index 3c08dea86..1cab15d8b 100644 --- a/ui/model/queue_ops.go +++ b/ui/model/queue_ops.go @@ -7,7 +7,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // The queue edits in this file follow one rule, whether a key, IPC or a Lua diff --git a/ui/model/queue_ops_test.go b/ui/model/queue_ops_test.go index 0edb73062..a065d9a37 100644 --- a/ui/model/queue_ops_test.go +++ b/ui/model/queue_ops_test.go @@ -10,12 +10,12 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/external/local" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/external/local" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/ui" ) // queueOpState is the part of the Model that a queue edit changes. diff --git a/ui/model/queue_view_test.go b/ui/model/queue_view_test.go index dce1c60c2..b5f484146 100644 --- a/ui/model/queue_view_test.go +++ b/ui/model/queue_view_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func TestClampedScroll(t *testing.T) { diff --git a/ui/model/radio_favorites_test.go b/ui/model/radio_favorites_test.go index df1fbc5ef..1926ec376 100644 --- a/ui/model/radio_favorites_test.go +++ b/ui/model/radio_favorites_test.go @@ -12,11 +12,11 @@ import ( tea "charm.land/bubbletea/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func radioFavoriteTestModel(t *testing.T) (Model, *radio.Provider, []playlist.Track) { diff --git a/ui/model/radio_listeners_test.go b/ui/model/radio_listeners_test.go index 731c69efc..0191844dd 100644 --- a/ui/model/radio_listeners_test.go +++ b/ui/model/radio_listeners_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func channelsListenerTestModel() Model { diff --git a/ui/model/report_queue_test.go b/ui/model/report_queue_test.go index f6bb525ec..71944563c 100644 --- a/ui/model/report_queue_test.go +++ b/ui/model/report_queue_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // waitIdle waits until q has run every report it got. diff --git a/ui/model/resolve_failure_test.go b/ui/model/resolve_failure_test.go index 0ae83abbc..c720b26ae 100644 --- a/ui/model/resolve_failure_test.go +++ b/ui/model/resolve_failure_test.go @@ -6,8 +6,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) // A failed resolve reports its error and clears only the loading flag of its diff --git a/ui/model/resume_checkpoint_test.go b/ui/model/resume_checkpoint_test.go index e8213a2e1..e1c5c080a 100644 --- a/ui/model/resume_checkpoint_test.go +++ b/ui/model/resume_checkpoint_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) func TestResumeCheckpointWaitsForConfirmedPlayback(t *testing.T) { diff --git a/ui/model/resume_test.go b/ui/model/resume_test.go index cab4ee4b0..8afc46c3f 100644 --- a/ui/model/resume_test.go +++ b/ui/model/resume_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestSetInitialTrackSelectsRestoredContextWithoutPlayback(t *testing.T) { diff --git a/ui/model/scroll.go b/ui/model/scroll.go index c6d6392a7..e8cbf3713 100644 --- a/ui/model/scroll.go +++ b/ui/model/scroll.go @@ -1,6 +1,6 @@ package model -import "github.com/bjarneo/cliamp/playlist" +import "github.com/bjarneo/cliamp/v2/playlist" // clampScroll keeps cursor inside [0, count) and adjusts scroll so that // the cursor sits within the visible window of `visible` rows. diff --git a/ui/model/scroll_test.go b/ui/model/scroll_test.go index 3aa8d0524..6e6d36149 100644 --- a/ui/model/scroll_test.go +++ b/ui/model/scroll_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestPlaylistScrollPreservesCursorAndAlbumHeaders(t *testing.T) { diff --git a/ui/model/search.go b/ui/model/search.go index d36b91181..fb5c29a75 100644 --- a/ui/model/search.go +++ b/ui/model/search.go @@ -3,7 +3,7 @@ package model import ( "sort" - "github.com/bjarneo/cliamp/internal/fuzzy" + "github.com/bjarneo/cliamp/v2/internal/fuzzy" ) // updateSearch filters the playlist by the current search query, ranking diff --git a/ui/model/search_mode_test.go b/ui/model/search_mode_test.go index aea68086e..77e0e7e38 100644 --- a/ui/model/search_mode_test.go +++ b/ui/model/search_mode_test.go @@ -7,7 +7,7 @@ import ( "charm.land/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // TestSearchInputsShowModeAndExitKey checks that every search or filter input diff --git a/ui/model/search_overlay_album_test.go b/ui/model/search_overlay_album_test.go index 29ae847c4..9838cf153 100644 --- a/ui/model/search_overlay_album_test.go +++ b/ui/model/search_overlay_album_test.go @@ -7,7 +7,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestCanceledSearchOverlayAlbumResponseIsIgnored(t *testing.T) { diff --git a/ui/model/search_overlay_sections_test.go b/ui/model/search_overlay_sections_test.go index 3f344f678..f091aecbe 100644 --- a/ui/model/search_overlay_sections_test.go +++ b/ui/model/search_overlay_sections_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func albumResult(name string) playlist.Track { diff --git a/ui/model/seek.go b/ui/model/seek.go index cbd660cfa..5764728b2 100644 --- a/ui/model/seek.go +++ b/ui/model/seek.go @@ -5,8 +5,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/luaplugin" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/luaplugin" + "github.com/bjarneo/cliamp/v2/ui" ) // seekDebounceTicks is how many ticks to wait after the last seek keypress diff --git a/ui/model/seek_async_test.go b/ui/model/seek_async_test.go index e7a161614..37f9e9d6b 100644 --- a/ui/model/seek_async_test.go +++ b/ui/model/seek_async_test.go @@ -6,9 +6,9 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" ) // runSeekCmd runs cmd and the commands of any batch it returns, and gives diff --git a/ui/model/seek_test.go b/ui/model/seek_test.go index 1c3ac4714..b4075494d 100644 --- a/ui/model/seek_test.go +++ b/ui/model/seek_test.go @@ -10,9 +10,9 @@ import ( "charm.land/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) func TestSetSeekStepLarge(t *testing.T) { diff --git a/ui/model/settings_focus_test.go b/ui/model/settings_focus_test.go index f4fd43b8d..eeb3f04d7 100644 --- a/ui/model/settings_focus_test.go +++ b/ui/model/settings_focus_test.go @@ -9,7 +9,7 @@ import ( tea "charm.land/bubbletea/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestSettingsFocusCycle(t *testing.T) { diff --git a/ui/model/speed_controls_test.go b/ui/model/speed_controls_test.go index 8c231124e..b1e486aae 100644 --- a/ui/model/speed_controls_test.go +++ b/ui/model/speed_controls_test.go @@ -1,8 +1,8 @@ package model import ( - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/ui" "os" "path/filepath" "strings" diff --git a/ui/model/stale_queue_load_test.go b/ui/model/stale_queue_load_test.go index 766dbbc9c..370ef45ee 100644 --- a/ui/model/stale_queue_load_test.go +++ b/ui/model/stale_queue_load_test.go @@ -9,8 +9,8 @@ import ( "slices" "testing" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) func queuePaths(m Model) []string { diff --git a/ui/model/state.go b/ui/model/state.go index 05c1b6549..4920b26b7 100644 --- a/ui/model/state.go +++ b/ui/model/state.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/lyrics" - "github.com/bjarneo/cliamp/player" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/lyrics" + "github.com/bjarneo/cliamp/v2/player" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // searchState holds state for the playlist search overlay. diff --git a/ui/model/stop_generation_test.go b/ui/model/stop_generation_test.go index c2f9ed7c5..70ae8ca00 100644 --- a/ui/model/stop_generation_test.go +++ b/ui/model/stop_generation_test.go @@ -3,9 +3,9 @@ package model import ( "testing" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" ) // Every path that stops playback must refuse a stream that was still diff --git a/ui/model/stream_seek_keys_test.go b/ui/model/stream_seek_keys_test.go index b87954f3f..8467609bb 100644 --- a/ui/model/stream_seek_keys_test.go +++ b/ui/model/stream_seek_keys_test.go @@ -6,8 +6,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/ui" ) // TestStreamSeekEntryPoints checks that each way to seek a seekable stream diff --git a/ui/model/stream_title_test.go b/ui/model/stream_title_test.go index 7ab2f952a..200105706 100644 --- a/ui/model/stream_title_test.go +++ b/ui/model/stream_title_test.go @@ -3,7 +3,7 @@ package model import ( "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) // TestResolveTrackDisplayStreamTitle covers the ICY override a radio stream diff --git a/ui/model/styles.go b/ui/model/styles.go index e4fcb3259..4df38033d 100644 --- a/ui/model/styles.go +++ b/ui/model/styles.go @@ -3,7 +3,7 @@ package model import ( "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/ui" ) // Model-specific lipgloss styles. They have no initializers: rebuildModelStyles diff --git a/ui/model/styles_test.go b/ui/model/styles_test.go index 4dea2145f..295f2bddd 100644 --- a/ui/model/styles_test.go +++ b/ui/model/styles_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/bjarneo/cliamp/theme" + "github.com/bjarneo/cliamp/v2/theme" ) var truecolorFG = regexp.MustCompile(`\x1b\[38;2;(\d+);(\d+);(\d+)m`) diff --git a/ui/model/subs_overlay_test.go b/ui/model/subs_overlay_test.go index 6423684ec..efa1ce6b4 100644 --- a/ui/model/subs_overlay_test.go +++ b/ui/model/subs_overlay_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // subProv is a stub provider that lists subscriptions and serves their episodes. diff --git a/ui/model/tick.go b/ui/model/tick.go index 5f7535b5b..95b3af969 100644 --- a/ui/model/tick.go +++ b/ui/model/tick.go @@ -7,8 +7,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" ) type tickMsg time.Time diff --git a/ui/model/tick_test.go b/ui/model/tick_test.go index 37a3343ae..e18517ff4 100644 --- a/ui/model/tick_test.go +++ b/ui/model/tick_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/ui" tea "charm.land/bubbletea/v2" ) diff --git a/ui/model/title.go b/ui/model/title.go index 14f9e1859..2d48d0003 100644 --- a/ui/model/title.go +++ b/ui/model/title.go @@ -4,7 +4,7 @@ import ( "strings" "unicode" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) const ( diff --git a/ui/model/title_test.go b/ui/model/title_test.go index a21a0c41e..27ece9b1b 100644 --- a/ui/model/title_test.go +++ b/ui/model/title_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/playlist" ) func TestTerminalTitleValuesForTrack(t *testing.T) { diff --git a/ui/model/update.go b/ui/model/update.go index 049637018..f42b6decd 100644 --- a/ui/model/update.go +++ b/ui/model/update.go @@ -3,8 +3,8 @@ package model import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/internal/playback" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/internal/playback" + "github.com/bjarneo/cliamp/v2/ui" ) // Update handles messages: key presses, ticks, and window resizes. After each diff --git a/ui/model/update_load.go b/ui/model/update_load.go index 0df9c88a1..719962345 100644 --- a/ui/model/update_load.go +++ b/ui/model/update_load.go @@ -5,7 +5,7 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/applog" + "github.com/bjarneo/cliamp/v2/applog" ) // handleYTDLBatch appends a batch of a YouTube radio playlist to the queue diff --git a/ui/model/update_nav.go b/ui/model/update_nav.go index 92231604e..49b442769 100644 --- a/ui/model/update_nav.go +++ b/ui/model/update_nav.go @@ -1,6 +1,6 @@ package model -import "github.com/bjarneo/cliamp/playlist" +import "github.com/bjarneo/cliamp/v2/playlist" // handleNavArtistsLoaded shows the artist list in the nav browser. func (m *Model) handleNavArtistsLoaded(msg navArtistsLoadedMsg) { diff --git a/ui/model/update_playback.go b/ui/model/update_playback.go index f523e79ce..220b67d10 100644 --- a/ui/model/update_playback.go +++ b/ui/model/update_playback.go @@ -8,8 +8,8 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/applog" - "github.com/bjarneo/cliamp/playlist" + "github.com/bjarneo/cliamp/v2/applog" + "github.com/bjarneo/cliamp/v2/playlist" ) func (m *Model) scheduleReconnect(now time.Time) { diff --git a/ui/model/update_provider.go b/ui/model/update_provider.go index aa966579c..e933e6c8d 100644 --- a/ui/model/update_provider.go +++ b/ui/model/update_provider.go @@ -7,9 +7,9 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) // withRetryHint appends the retry remediation to a load error so sticky diff --git a/ui/model/view.go b/ui/model/view.go index 719af3274..7a2f77c1b 100644 --- a/ui/model/view.go +++ b/ui/model/view.go @@ -10,11 +10,11 @@ import ( "charm.land/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/external/radio" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/external/radio" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" + "github.com/bjarneo/cliamp/v2/ui" ) // Marquee for the now-playing title. A name that fits its row is drawn as it diff --git a/ui/model/view_columns.go b/ui/model/view_columns.go index b6136358c..6b7426930 100644 --- a/ui/model/view_columns.go +++ b/ui/model/view_columns.go @@ -8,7 +8,7 @@ import ( "charm.land/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/ui" ) // The two-column body puts the playlist on the left and the focusable playback diff --git a/ui/model/view_columns_test.go b/ui/model/view_columns_test.go index 2f6ddcaf9..3d73ef832 100644 --- a/ui/model/view_columns_test.go +++ b/ui/model/view_columns_test.go @@ -9,7 +9,7 @@ import ( "charm.land/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/provider" ) // newColumnTestModel builds a full-tier model with several providers so the diff --git a/ui/model/view_helpers.go b/ui/model/view_helpers.go index d2f501b32..2f52f7a9f 100644 --- a/ui/model/view_helpers.go +++ b/ui/model/view_helpers.go @@ -9,8 +9,8 @@ import ( "charm.land/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) const restrictedViewSuffix = " [E]" diff --git a/ui/model/view_helpers_test.go b/ui/model/view_helpers_test.go index c0b8e7b91..0b4a9d9a6 100644 --- a/ui/model/view_helpers_test.go +++ b/ui/model/view_helpers_test.go @@ -8,9 +8,9 @@ import ( "charm.land/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func TestRestrictedMarkersAreViewOnly(t *testing.T) { diff --git a/ui/model/view_nav.go b/ui/model/view_nav.go index f008b0ec1..88d439d56 100644 --- a/ui/model/view_nav.go +++ b/ui/model/view_nav.go @@ -3,7 +3,7 @@ package model import ( "strings" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/provider" ) // navSortLabel resolves a sort-type ID to its human label for the active diff --git a/ui/model/view_overlays.go b/ui/model/view_overlays.go index b26ef8a0a..6c704e16f 100644 --- a/ui/model/view_overlays.go +++ b/ui/model/view_overlays.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/bjarneo/cliamp/favorites" - "github.com/bjarneo/cliamp/history" + "github.com/bjarneo/cliamp/v2/favorites" + "github.com/bjarneo/cliamp/v2/history" ) // renderVisPickerList renders the visualizer mode list for the playlist region diff --git a/ui/model/view_state_test.go b/ui/model/view_state_test.go index afb79155e..c494f7679 100644 --- a/ui/model/view_state_test.go +++ b/ui/model/view_state_test.go @@ -8,9 +8,9 @@ import ( "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/theme" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/theme" + "github.com/bjarneo/cliamp/v2/ui" ) func TestMainViewShrinksPlaylistForFooterMessages(t *testing.T) { diff --git a/ui/model/vis_persist_test.go b/ui/model/vis_persist_test.go index 911cab24d..3aee6efc5 100644 --- a/ui/model/vis_persist_test.go +++ b/ui/model/vis_persist_test.go @@ -10,9 +10,9 @@ import ( tea "charm.land/bubbletea/v2" - "github.com/bjarneo/cliamp/config" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/ui" + "github.com/bjarneo/cliamp/v2/config" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/ui" ) // recordingSaver captures config writes so a test can assert what was diff --git a/ui/model/visual_hierarchy_test.go b/ui/model/visual_hierarchy_test.go index 73cc40198..4a216532d 100644 --- a/ui/model/visual_hierarchy_test.go +++ b/ui/model/visual_hierarchy_test.go @@ -7,8 +7,8 @@ import ( "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/provider" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/provider" ) func TestPlaylistStateMarkersStayVisibleWithoutColor(t *testing.T) { diff --git a/ui/model/ytdl_batch.go b/ui/model/ytdl_batch.go index c3af4ab16..ff87d479c 100644 --- a/ui/model/ytdl_batch.go +++ b/ui/model/ytdl_batch.go @@ -4,8 +4,8 @@ import ( "net/url" "strings" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/resolve" tea "charm.land/bubbletea/v2" ) diff --git a/ui/model/ytdl_batch_test.go b/ui/model/ytdl_batch_test.go index 63cfd1898..f9350cb1b 100644 --- a/ui/model/ytdl_batch_test.go +++ b/ui/model/ytdl_batch_test.go @@ -3,9 +3,9 @@ package model import ( "testing" - "github.com/bjarneo/cliamp/ipc" - "github.com/bjarneo/cliamp/playlist" - "github.com/bjarneo/cliamp/resolve" + "github.com/bjarneo/cliamp/v2/ipc" + "github.com/bjarneo/cliamp/v2/playlist" + "github.com/bjarneo/cliamp/v2/resolve" ) func TestInitYTDLBatchTrigger(t *testing.T) { diff --git a/ui/styles.go b/ui/styles.go index 35ac3ae9d..1c68d12f0 100644 --- a/ui/styles.go +++ b/ui/styles.go @@ -8,7 +8,7 @@ import ( "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/theme" + "github.com/bjarneo/cliamp/v2/theme" ) // CLIAMP color palette. With no theme configured these are the standard ANSI diff --git a/ui/styles_test.go b/ui/styles_test.go index 2298aa3f6..eec668ea4 100644 --- a/ui/styles_test.go +++ b/ui/styles_test.go @@ -7,7 +7,7 @@ import ( "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/theme" + "github.com/bjarneo/cliamp/v2/theme" ) func TestContrastingTextColor(t *testing.T) { diff --git a/ui/vis_ethereal_test.go b/ui/vis_ethereal_test.go index 81261756b..a00111f70 100644 --- a/ui/vis_ethereal_test.go +++ b/ui/vis_ethereal_test.go @@ -10,7 +10,7 @@ import ( "charm.land/lipgloss/v2" - "github.com/bjarneo/cliamp/theme" + "github.com/bjarneo/cliamp/v2/theme" ) func TestEtherealFitsPanel(t *testing.T) { diff --git a/ui/vis_yinyang_test.go b/ui/vis_yinyang_test.go index c69b1162a..3d24e3952 100644 --- a/ui/vis_yinyang_test.go +++ b/ui/vis_yinyang_test.go @@ -12,7 +12,7 @@ import ( "charm.land/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/bjarneo/cliamp/theme" + "github.com/bjarneo/cliamp/v2/theme" ) func yinYangAt(rows, cols int) (*yinYangDriver, *Visualizer) { diff --git a/ui/visualizer_golden_test.go b/ui/visualizer_golden_test.go index 86a7816d3..fb578c803 100644 --- a/ui/visualizer_golden_test.go +++ b/ui/visualizer_golden_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/theme" + "github.com/bjarneo/cliamp/v2/theme" ) var updateVisGolden = flag.Bool("update-vis-golden", false, diff --git a/upgrade/upgrade.go b/upgrade/upgrade.go index f1c31b558..e80154c10 100644 --- a/upgrade/upgrade.go +++ b/upgrade/upgrade.go @@ -16,7 +16,7 @@ import ( "strings" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) const repo = "bjarneo/cliamp" diff --git a/upgrade/upgrade_test.go b/upgrade/upgrade_test.go index 77103736e..f3c52f17c 100644 --- a/upgrade/upgrade_test.go +++ b/upgrade/upgrade_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - "github.com/bjarneo/cliamp/internal/httpclient" + "github.com/bjarneo/cliamp/v2/internal/httpclient" ) func testHash(data []byte) string {