Skip to content

fix: add /v2 to module path so 'go install' works for v2.x tags #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yunaremaia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add /v2 to module path so 'go install' works for v2.x tags #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion cmd/history.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cmd/history_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 6 additions & 6 deletions cmd/playlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions cmd/playlist_enrich_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmd/playlist_ops_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/protocol_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cmd/radio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 6 additions & 6 deletions cmd/radio_globe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
8 changes: 4 additions & 4 deletions cmd/radio_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
20 changes: 10 additions & 10 deletions cmd/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cmd/setup_roundtrip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/setup_save_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 16 additions & 16 deletions commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs_providers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions external/audiobookshelf/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions external/audiobookshelf/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions external/audiobookshelf/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions external/audiobookshelf/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions external/bandcamp/probe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions external/bandcamp/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions external/bandcamp/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion external/emby/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions external/emby/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions external/emby/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion external/jellyfin/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions external/jellyfin/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
Loading