8 Commits

Author SHA1 Message Date
b65edb4cce yes 2026-06-15 17:18:47 +02:00
db26a40415 fix qobuz interpreter artist urls 2026-06-10 12:34:37 +02:00
fa39582849 fix tidal playlist metadata and retries 2026-05-21 23:03:27 +02:00
lb-a
3bc965db77 Merge branch 'feat/verbose' 2026-05-07 23:56:42 +02:00
lb-a
3909ba5113 feat: implement second level of verbosity 2026-05-07 18:45:36 +02:00
lb-a
04cc56040b feat: add log hooks 2026-05-07 18:45:05 +02:00
lb-a
ef741434cb feat: ad verbose package 2026-05-07 18:42:24 +02:00
ef72aad14e Merge branch 'fix/qobuz-mobile-fallback-eof' 2026-05-05 21:51:19 +02:00
14 changed files with 466 additions and 74 deletions

View File

@@ -24,7 +24,7 @@ type globalOptions struct {
codec string codec string
noProgress bool noProgress bool
noSSLVerify bool noSSLVerify bool
verbose bool verbose int
command string command string
commandArgs []string commandArgs []string
} }
@@ -52,7 +52,13 @@ func parseGlobalArgs(args []string) (globalOptions, error) {
case arg == "--no-ssl-verify": case arg == "--no-ssl-verify":
opts.noSSLVerify = true opts.noSSLVerify = true
case arg == "-v" || arg == "--verbose": case arg == "-v" || arg == "--verbose":
opts.verbose = true if opts.verbose < 2 {
opts.verbose++
}
case arg == "-vv":
if opts.verbose < 2 {
opts.verbose = 2
}
case arg == "-f" || arg == "--folder": case arg == "-f" || arg == "--folder":
if i+1 >= len(args) { if i+1 >= len(args) {
return globalOptions{}, fmt.Errorf("%s requires a value", arg) return globalOptions{}, fmt.Errorf("%s requires a value", arg)

View File

@@ -14,6 +14,7 @@ import (
"streamrip-go/internal/app" "streamrip-go/internal/app"
"streamrip-go/internal/config" "streamrip-go/internal/config"
"streamrip-go/internal/provider" "streamrip-go/internal/provider"
"streamrip-go/internal/verbose"
_ "modernc.org/sqlite" _ "modernc.org/sqlite"
) )
@@ -49,8 +50,11 @@ func main() {
os.Exit(1) os.Exit(1)
} }
applyGlobalConfigOverrides(cfg, gopts) applyGlobalConfigOverrides(cfg, gopts)
if gopts.verbose { verbose.SetLevel(gopts.verbose)
fmt.Fprintln(os.Stderr, "verbose mode enabled") if gopts.verbose >= 2 {
fmt.Fprintln(os.Stderr, "verbose mode enabled (level 2: downloads + http)")
} else if gopts.verbose >= 1 {
fmt.Fprintln(os.Stderr, "verbose mode enabled (level 1: downloads)")
} }
os.Args = append([]string{os.Args[0], gopts.command}, gopts.commandArgs...) os.Args = append([]string{os.Args[0], gopts.command}, gopts.commandArgs...)

View File

@@ -227,7 +227,7 @@ func TestParseGlobalArgsAllOfficialFlags(t *testing.T) {
if !opts.noDB || !opts.qualitySet || opts.quality != 3 || !opts.codecSet || opts.codec != "VORBIS" { if !opts.noDB || !opts.qualitySet || opts.quality != 3 || !opts.codecSet || opts.codec != "VORBIS" {
t.Fatalf("unexpected quality/codec/db opts: %+v", opts) t.Fatalf("unexpected quality/codec/db opts: %+v", opts)
} }
if !opts.noProgress || !opts.noSSLVerify || !opts.verbose { if !opts.noProgress || !opts.noSSLVerify || opts.verbose != 1 {
t.Fatalf("unexpected boolean opts: %+v", opts) t.Fatalf("unexpected boolean opts: %+v", opts)
} }
if opts.command != "search" { if opts.command != "search" {

View File

@@ -26,6 +26,7 @@ import (
soundcloudprovider "streamrip-go/internal/provider/soundcloud" soundcloudprovider "streamrip-go/internal/provider/soundcloud"
tidalprovider "streamrip-go/internal/provider/tidal" tidalprovider "streamrip-go/internal/provider/tidal"
"streamrip-go/internal/store" "streamrip-go/internal/store"
"streamrip-go/internal/verbose"
) )
type Main struct { type Main struct {
@@ -114,7 +115,7 @@ func New(cfg *config.Config) (*Main, error) {
"soundcloud": soundcloudprovider.New(cfg), "soundcloud": soundcloudprovider.New(cfg),
} }
return &Main{ m := &Main{
Config: cfg, Config: cfg,
Providers: providers, Providers: providers,
Store: db, Store: db,
@@ -122,7 +123,9 @@ func New(cfg *config.Config) (*Main, error) {
Tagger: tag.New(), Tagger: tag.New(),
Pending: []media.Pending{}, Pending: []media.Pending{},
Media: []media.Media{}, Media: []media.Media{},
}, nil }
verbose.SetSink(func(msg string) { m.DL.Logf("%s", msg) })
return m, nil
} }
// downloaderMaxConnsPerHost picks the per-host idle connection cap for the // downloaderMaxConnsPerHost picks the per-host idle connection cap for the
@@ -137,6 +140,7 @@ func downloaderMaxConnsPerHost(maxConnections int) int {
} }
func (m *Main) Close() error { func (m *Main) Close() error {
verbose.SetSink(nil)
m.DL.Close() m.DL.Close()
artwork.CleanupTempDirs() artwork.CleanupTempDirs()
for _, p := range m.Providers { for _, p := range m.Providers {
@@ -1285,11 +1289,12 @@ func buildTagMetadata(trackMeta map[string]any, title, source, trackID string, o
if discTotal == 0 { if discTotal == 0 {
discTotal = jsonutil.IntFromAny(trackMeta["numberOfVolumes"]) discTotal = jsonutil.IntFromAny(trackMeta["numberOfVolumes"])
} }
if discTotal == 0 && opts.albumDiscTotal > 0 { if !opts.forPlaylist && discTotal == 0 && opts.albumDiscTotal > 0 {
discTotal = opts.albumDiscTotal discTotal = opts.albumDiscTotal
} }
if opts.forPlaylist { if opts.forPlaylist {
discTotal = 1 discNumber = 0
discTotal = 0
} }
if !opts.forPlaylist && discNumber == 0 { if !opts.forPlaylist && discNumber == 0 {
discNumber = 1 discNumber = 1
@@ -1347,6 +1352,7 @@ func buildTagMetadata(trackMeta map[string]any, title, source, trackID string, o
Album: album, Album: album,
Artist: artist, Artist: artist,
AlbumArtist: albumArtist, AlbumArtist: albumArtist,
OmitDiscTags: opts.forPlaylist,
TrackNumber: trackNumber, TrackNumber: trackNumber,
DiscNumber: discNumber, DiscNumber: discNumber,
TrackTotal: trackTotal, TrackTotal: trackTotal,

View File

@@ -490,6 +490,46 @@ func TestBuildTagMetadataUsesAlbumArtistOverride(t *testing.T) {
} }
} }
func TestBuildTagMetadataPlaylistOmitsDiscTags(t *testing.T) {
meta := map[string]any{
"title": "One Step Too Far",
"track_number": float64(15),
"media_number": float64(2),
"numberOfVolumes": float64(2),
"numberOfTracks": float64(18),
"performer": map[string]any{"name": "Faithless"},
"artist": map[string]any{"name": "Faithless"},
"release_date": "2005-01-01",
"release_date_original": "2005-01-01",
"album": map[string]any{
"id": "23324600",
"title": "Greatest Hits (Deluxe)",
"artist": map[string]any{"name": "Faithless"},
},
}
playlistCfg := config.DefaultConfigData().Metadata
applyPlaylistMetadataOverrides(meta, playlistCfg, "Road Trip", 3)
tags := buildTagMetadata(meta, "One Step Too Far", "tidal", "23324615", ripTrackOptions{forPlaylist: true, playlistName: "Road Trip", playlistPos: 3, total: 20})
if tags.Album != "Road Trip" {
t.Fatalf("album = %q, want Road Trip", tags.Album)
}
if tags.TrackNumber != 3 {
t.Fatalf("track number = %d, want 3", tags.TrackNumber)
}
if tags.TrackTotal != 20 {
t.Fatalf("track total = %d, want 20", tags.TrackTotal)
}
if tags.DiscNumber != 0 {
t.Fatalf("disc number = %d, want 0", tags.DiscNumber)
}
if tags.DiscTotal != 0 {
t.Fatalf("disc total = %d, want 0", tags.DiscTotal)
}
if !tags.OmitDiscTags {
t.Fatalf("omit disc tags = %v, want true", tags.OmitDiscTags)
}
}
func TestTrackOutputPathFallsBackToDisc1(t *testing.T) { func TestTrackOutputPathFallsBackToDisc1(t *testing.T) {
tmp := t.TempDir() tmp := t.TempDir()
d := config.DefaultConfigData() d := config.DefaultConfigData()

View File

@@ -14,6 +14,7 @@ type Metadata struct {
Album string Album string
Artist string Artist string
AlbumArtist string AlbumArtist string
OmitDiscTags bool
TrackNumber int TrackNumber int
DiscNumber int DiscNumber int
TrackTotal int TrackTotal int
@@ -101,6 +102,14 @@ func buildFFmpegArgs(inputPath, outputPath string, meta Metadata, coverPath, ext
} }
args = append(args, "-metadata", k+"="+v) args = append(args, "-metadata", k+"="+v)
} }
if meta.OmitDiscTags {
args = append(args,
"-metadata", "disc=",
"-metadata", "disk=",
"-metadata", "disctotal=",
"-metadata", "totaldiscs=",
)
}
args = append(args, outputPath) args = append(args, outputPath)
return args return args

View File

@@ -96,6 +96,28 @@ func TestBuildFFmpegArgsSkipsCoverForUnsupportedContainer(t *testing.T) {
} }
} }
func TestBuildFFmpegArgsClearsDiscTagsWhenRequested(t *testing.T) {
args := buildFFmpegArgs("in.flac", "out.flac", Metadata{Title: "x", OmitDiscTags: true}, "", "flac")
want := map[string]bool{
"disc=": false,
"disk=": false,
"disctotal=": false,
"totaldiscs=": false,
}
for i := 0; i < len(args)-1; i++ {
if args[i] == "-metadata" {
if _, ok := want[args[i+1]]; ok {
want[args[i+1]] = true
}
}
}
for tag, found := range want {
if !found {
t.Fatalf("missing clear tag %q in args: %v", tag, args)
}
}
}
func TestTaggedTempPathPreservesExtension(t *testing.T) { func TestTaggedTempPathPreservesExtension(t *testing.T) {
if got := taggedTempPath("/tmp/song.flac"); got != "/tmp/song.tmp.flac" { if got := taggedTempPath("/tmp/song.flac"); got != "/tmp/song.tmp.flac" {
t.Fatalf("taggedTempPath(flac)=%q", got) t.Fatalf("taggedTempPath(flac)=%q", got)

View File

@@ -20,6 +20,7 @@ import (
"golang.org/x/term" "golang.org/x/term"
"streamrip-go/internal/netutil" "streamrip-go/internal/netutil"
"streamrip-go/internal/verbose"
"golang.org/x/crypto/blowfish" "golang.org/x/crypto/blowfish"
) )
@@ -67,6 +68,7 @@ func (d *Downloader) FileVideo(ctx context.Context, sourceURL, outputPath string
} }
func (d *Downloader) FileDeezerEncrypted(ctx context.Context, sourceURL, outputPath, trackID string) error { func (d *Downloader) FileDeezerEncrypted(ctx context.Context, sourceURL, outputPath, trackID string) error {
logDownloadStart(sourceURL, outputPath)
if err := os.MkdirAll(filepath.Dir(outputPath), 0o755); err != nil { if err := os.MkdirAll(filepath.Dir(outputPath), 0o755); err != nil {
return err return err
} }
@@ -181,6 +183,7 @@ func (d *Downloader) FileDeezerEncrypted(ctx context.Context, sourceURL, outputP
} }
func (d *Downloader) file(ctx context.Context, sourceURL, outputPath string, allowProgress bool, includeVideo bool) error { func (d *Downloader) file(ctx context.Context, sourceURL, outputPath string, allowProgress bool, includeVideo bool) error {
logDownloadStart(sourceURL, outputPath)
if err := os.MkdirAll(filepath.Dir(outputPath), 0o755); err != nil { if err := os.MkdirAll(filepath.Dir(outputPath), 0o755); err != nil {
return err return err
} }
@@ -319,6 +322,16 @@ func (d *Downloader) Logf(format string, args ...any) {
fmt.Print(msg) fmt.Print(msg)
} }
// logDownloadStart emits the source URL and destination filename when the
// user passed -v or higher. The transport-level logger covers the same
// requests at -vv, but this line gives a friendlier per-track summary.
func logDownloadStart(sourceURL, outputPath string) {
if !verbose.Enabled(verbose.V) {
return
}
verbose.Printf(verbose.V, "download %s -> %s\n", sourceURL, filepath.Base(outputPath))
}
func shortenName(name string, max int) string { func shortenName(name string, max int) string {
if max <= 0 { if max <= 0 {
return name return name

View File

@@ -3,7 +3,10 @@ package netutil
import ( import (
"crypto/tls" "crypto/tls"
"net/http" "net/http"
"net/url"
"time" "time"
"streamrip-go/internal/verbose"
) )
const defaultMaxConnsPerHost = 16 const defaultMaxConnsPerHost = 16
@@ -40,6 +43,63 @@ func NewHTTPClient(timeout time.Duration, verifySSL bool, maxConnsPerHost int) *
return &http.Client{ return &http.Client{
Timeout: timeout, Timeout: timeout,
Transport: transport, Transport: &loggingTransport{base: transport},
} }
} }
// loggingTransport emits one verbose line per HTTP request when verbose
// level >= VV. The check is per-call so toggling the level at runtime
// affects subsequent requests without rebuilding clients.
type loggingTransport struct {
base http.RoundTripper
}
func (t *loggingTransport) RoundTrip(req *http.Request) (*http.Response, error) {
if !verbose.Enabled(verbose.VV) {
return t.base.RoundTrip(req)
}
start := time.Now()
resp, err := t.base.RoundTrip(req)
elapsed := time.Since(start).Round(time.Millisecond)
target := redactURL(req.URL)
if err != nil {
verbose.Printf(verbose.VV, "http %s %s -> error %v (%s)\n", req.Method, target, err, elapsed)
return resp, err
}
verbose.Printf(verbose.VV, "http %s %s -> %d (%s)\n", req.Method, target, resp.StatusCode, elapsed)
return resp, err
}
// redactURL hides values for query parameters that commonly carry
// credentials so -vv output is safe to paste in an issue.
func redactURL(u *url.URL) string {
if u == nil {
return ""
}
if u.RawQuery == "" {
return u.String()
}
q := u.Query()
redacted := false
for k := range q {
if isSensitiveParam(k) {
q.Set(k, "REDACTED")
redacted = true
}
}
if !redacted {
return u.String()
}
cp := *u
cp.RawQuery = q.Encode()
return cp.String()
}
func isSensitiveParam(name string) bool {
switch name {
case "user_auth_token", "api_token", "access_token", "refresh_token",
"request_sig", "signature", "password", "secret", "token", "code", "auth", "key":
return true
}
return false
}

View File

@@ -22,12 +22,13 @@ import (
) )
const ( const (
baseURL = "https://api.tidalhifi.com/v1" baseURL = "https://api.tidalhifi.com/v1"
lyricsAPIv1 = "https://api.tidal.com/v1" lyricsAPIv1 = "https://api.tidal.com/v1"
openAPIV2 = "https://openapi.tidal.com/v2" openAPIV2 = "https://openapi.tidal.com/v2"
authURL = "https://auth.tidal.com/v1/oauth2" authURL = "https://auth.tidal.com/v1/oauth2"
clientID = "fX2JxdmntZWK0ixT" clientID = "fX2JxdmntZWK0ixT"
clientSec = "1Nm5AfDAjxrgJFJbKNWLeAyKGVGmINuXPPLHVXAvxAg=" clientSec = "1Nm5AfDAjxrgJFJbKNWLeAyKGVGmINuXPPLHVXAvxAg="
tidalRequestAttempts = 3
) )
var qualityMap = map[int]string{ var qualityMap = map[int]string{
@@ -843,11 +844,111 @@ func resolvePlaylistURL(baseRaw, refRaw string) string {
return baseURL.ResolveReference(refURL).String() return baseURL.ResolveReference(refURL).String()
} }
func (c *Client) apiRequest(ctx context.Context, path string, params url.Values, base string) (map[string]any, int, error) { func shouldRetryStatus(status int) bool {
if err := c.limiter.Wait(ctx); err != nil { return status == http.StatusTooManyRequests || status >= http.StatusInternalServerError
return nil, 0, err }
}
func retryDelay(retryAfter string, attempt int) time.Duration {
retryAfter = strings.TrimSpace(retryAfter)
if retryAfter != "" {
if seconds, err := strconv.Atoi(retryAfter); err == nil && seconds >= 0 {
return time.Duration(seconds) * time.Second
}
if when, err := http.ParseTime(retryAfter); err == nil {
if delay := time.Until(when); delay > 0 {
return delay
}
return 0
}
}
return time.Duration(attempt+1) * 500 * time.Millisecond
}
func waitRetry(ctx context.Context, delay time.Duration) error {
if delay <= 0 {
return nil
}
timer := time.NewTimer(delay)
defer timer.Stop()
select {
case <-ctx.Done():
return ctx.Err()
case <-timer.C:
return nil
}
}
func parseAPIResponseBody(body []byte, status int) (map[string]any, error) {
out := map[string]any{}
if len(body) == 0 {
return out, nil
}
if err := json.Unmarshal(body, &out); err != nil {
if status < http.StatusOK || status >= http.StatusMultipleChoices {
if raw := strings.TrimSpace(string(body)); raw != "" {
out["raw"] = raw
}
return out, nil
}
return nil, err
}
return out, nil
}
func readAPIResponse(resp *http.Response) (map[string]any, int, string, error) {
defer func() { _ = resp.Body.Close() }()
body, err := io.ReadAll(resp.Body)
if err != nil {
return nil, resp.StatusCode, resp.Header.Get("Retry-After"), err
}
parsed, err := parseAPIResponseBody(body, resp.StatusCode)
return parsed, resp.StatusCode, resp.Header.Get("Retry-After"), err
}
func (c *Client) doJSONWithRetry(ctx context.Context, newRequest func() (*http.Request, error)) (map[string]any, int, error) {
var lastStatus int
for attempt := 0; attempt < tidalRequestAttempts; attempt++ {
if err := c.limiter.Wait(ctx); err != nil {
return nil, 0, err
}
req, err := newRequest()
if err != nil {
return nil, 0, err
}
resp, err := c.http.Do(req)
if err != nil {
if attempt+1 < tidalRequestAttempts {
if waitErr := waitRetry(ctx, retryDelay("", attempt)); waitErr != nil {
return nil, 0, waitErr
}
continue
}
return nil, 0, err
}
parsed, status, retryAfter, err := readAPIResponse(resp)
lastStatus = status
if err != nil {
if attempt+1 < tidalRequestAttempts {
if waitErr := waitRetry(ctx, retryDelay(retryAfter, attempt)); waitErr != nil {
return nil, 0, waitErr
}
continue
}
return nil, status, err
}
if shouldRetryStatus(status) && attempt+1 < tidalRequestAttempts {
if waitErr := waitRetry(ctx, retryDelay(retryAfter, attempt)); waitErr != nil {
return nil, 0, waitErr
}
continue
}
return parsed, status, nil
}
return map[string]any{}, lastStatus, nil
}
func (c *Client) apiRequest(ctx context.Context, path string, params url.Values, base string) (map[string]any, int, error) {
if params == nil { if params == nil {
params = url.Values{} params = url.Values{}
} }
@@ -863,65 +964,31 @@ func (c *Client) apiRequest(ctx context.Context, path string, params url.Values,
reqURL += "?" + params.Encode() reqURL += "?" + params.Encode()
} }
req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL, nil) return c.doJSONWithRetry(ctx, func() (*http.Request, error) {
if err != nil { req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL, nil)
return nil, 0, err if err != nil {
} return nil, err
req.Header.Set("Authorization", "Bearer "+c.cfg.Session.Tidal.AccessToken)
req.Header.Set("User-Agent", "streamrip-go/0.1")
resp, err := c.http.Do(req)
if err != nil {
return nil, 0, err
}
defer func() { _ = resp.Body.Close() }()
body, err := io.ReadAll(resp.Body)
if err != nil {
return nil, resp.StatusCode, err
}
parsed := map[string]any{}
if len(body) > 0 {
if err = json.Unmarshal(body, &parsed); err != nil {
return nil, resp.StatusCode, err
} }
} req.Header.Set("Authorization", "Bearer "+c.cfg.Session.Tidal.AccessToken)
req.Header.Set("User-Agent", "streamrip-go/0.1")
return parsed, resp.StatusCode, nil return req, nil
})
} }
func (c *Client) apiPost(ctx context.Context, endpoint string, form url.Values, basicAuth bool) (map[string]any, int, error) { func (c *Client) apiPost(ctx context.Context, endpoint string, form url.Values, basicAuth bool) (map[string]any, int, error) {
if err := c.limiter.Wait(ctx); err != nil { return c.doJSONWithRetry(ctx, func() (*http.Request, error) {
return nil, 0, err req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewBufferString(form.Encode()))
} if err != nil {
return nil, err
req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewBufferString(form.Encode()))
if err != nil {
return nil, 0, err
}
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
req.Header.Set("User-Agent", "streamrip-go/0.1")
if basicAuth {
auth := base64.StdEncoding.EncodeToString([]byte(clientID + ":" + clientSec))
req.Header.Set("Authorization", "Basic "+auth)
}
resp, err := c.http.Do(req)
if err != nil {
return nil, 0, err
}
defer func() { _ = resp.Body.Close() }()
body, err := io.ReadAll(resp.Body)
if err != nil {
return nil, resp.StatusCode, err
}
out := map[string]any{}
if len(body) > 0 {
if err = json.Unmarshal(body, &out); err != nil {
return nil, resp.StatusCode, err
} }
} req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
return out, resp.StatusCode, nil req.Header.Set("User-Agent", "streamrip-go/0.1")
if basicAuth {
auth := base64.StdEncoding.EncodeToString([]byte(clientID + ":" + clientSec))
req.Header.Set("Authorization", "Basic "+auth)
}
return req, nil
})
} }
func stringify(v any) string { func stringify(v any) string {

View File

@@ -6,6 +6,7 @@ import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"net/url"
"reflect" "reflect"
"strconv" "strconv"
"testing" "testing"
@@ -238,6 +239,83 @@ func TestGetMetadataTrackIgnoresLyricsEndpointFailure(t *testing.T) {
} }
} }
func TestAPIRequestRetriesTooManyRequests(t *testing.T) {
calls := 0
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/v1/tracks/42" {
w.WriteHeader(http.StatusNotFound)
return
}
calls++
if calls == 1 {
w.Header().Set("Retry-After", "0")
w.WriteHeader(http.StatusTooManyRequests)
_, _ = w.Write([]byte("slow down"))
return
}
_ = json.NewEncoder(w).Encode(map[string]any{"id": 42, "title": "Song"})
}))
defer ts.Close()
cfgData := config.DefaultConfigData()
cfgData.Downloads.RequestsPerMinute = 0
cfgData.Tidal.AccessToken = "token"
cfgData.Tidal.CountryCode = "US"
c := New(&config.Config{File: cfgData, Session: cfgData})
c.baseURL = ts.URL + "/v1"
resp, status, err := c.apiRequest(context.Background(), "tracks/42", nil, c.baseURL)
if err != nil {
t.Fatalf("apiRequest() err = %v", err)
}
if status != http.StatusOK {
t.Fatalf("status = %d, want %d", status, http.StatusOK)
}
if calls != 2 {
t.Fatalf("calls = %d, want 2", calls)
}
if stringify(resp["title"]) != "Song" {
t.Fatalf("title = %q, want Song", stringify(resp["title"]))
}
}
func TestAPIPostRetriesTooManyRequests(t *testing.T) {
calls := 0
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/token" {
w.WriteHeader(http.StatusNotFound)
return
}
calls++
if calls == 1 {
w.Header().Set("Retry-After", "0")
w.WriteHeader(http.StatusTooManyRequests)
_, _ = w.Write([]byte("slow down"))
return
}
_ = json.NewEncoder(w).Encode(map[string]any{"access_token": "fresh-token"})
}))
defer ts.Close()
cfgData := config.DefaultConfigData()
cfgData.Downloads.RequestsPerMinute = 0
c := New(&config.Config{File: cfgData, Session: cfgData})
resp, status, err := c.apiPost(context.Background(), ts.URL+"/token", url.Values{"grant_type": []string{"refresh_token"}}, false)
if err != nil {
t.Fatalf("apiPost() err = %v", err)
}
if status != http.StatusOK {
t.Fatalf("status = %d, want %d", status, http.StatusOK)
}
if calls != 2 {
t.Fatalf("calls = %d, want 2", calls)
}
if stringify(resp["access_token"]) != "fresh-token" {
t.Fatalf("access_token = %q, want fresh-token", stringify(resp["access_token"]))
}
}
func TestGetDownloadablePrefersAtmosWhenEnabled(t *testing.T) { func TestGetDownloadablePrefersAtmosWhenEnabled(t *testing.T) {
var calls []string var calls []string
allImmersive := true allImmersive := true

View File

@@ -69,6 +69,9 @@ func parseQobuz(raw string, parts []string) *ParsedURL {
} }
mediaType := parts[0] mediaType := parts[0]
if mediaType == "interpreter" {
mediaType = "artist"
}
if !isSupportedMedia(mediaType) { if !isSupportedMedia(mediaType) {
return nil return nil
} }

View File

@@ -27,6 +27,22 @@ func TestQobuzAlbumURL(t *testing.T) {
} }
} }
func TestQobuzInterpreterURLParsesAsArtist(t *testing.T) {
inputs := []string{
"https://www.qobuz.com/us-en/interpreter/odezenne/739874",
"https://play.qobuz.com/artist/739874",
}
for _, input := range inputs {
result := Parse(input)
if result == nil {
t.Fatalf("expected parsed url for %q", input)
}
if result.Source != "qobuz" || result.MediaType != "artist" || result.ID != "739874" {
t.Fatalf("unexpected parse result for %q: %+v", input, result)
}
}
}
func TestTidalTrackURL(t *testing.T) { func TestTidalTrackURL(t *testing.T) {
inputs := []string{ inputs := []string{
"https://tidal.com/browse/track/3083287", "https://tidal.com/browse/track/3083287",

View File

@@ -0,0 +1,68 @@
// Package verbose provides a process-wide verbosity level and a pluggable
// log sink so verbose output integrates with the downloader's progress bars.
//
// Level meaning:
//
// 0 (Off) - no extra output
// 1 (V) - log per-track CDN URLs from the downloader
// 2 (VV) - additionally log every outbound HTTP request via the
// netutil-wrapped transport (covers all provider API calls
// and downloads)
package verbose
import (
"fmt"
"os"
"sync/atomic"
)
const (
Off byte = 0
V byte = 1
VV byte = 2
)
var (
level atomic.Uint32
sink atomic.Pointer[func(string)]
)
// SetLevel clamps and stores the verbosity level. Pass 0 to disable.
func SetLevel(l int) {
if l < 0 {
l = 0
}
if l > int(VV) {
l = int(VV)
}
level.Store(uint32(l))
}
func Level() byte { return byte(level.Load()) }
func Enabled(l byte) bool { return Level() >= l }
// SetSink installs a writer for verbose output. Use this to route logs
// through the downloader so they don't tear progress bars. Pass nil to
// fall back to stderr.
func SetSink(fn func(string)) {
if fn == nil {
sink.Store(nil)
return
}
sink.Store(&fn)
}
// Printf emits a line at the given level if verbosity is enabled. The
// caller is responsible for including a trailing newline.
func Printf(l byte, format string, args ...any) {
if !Enabled(l) {
return
}
msg := fmt.Sprintf(format, args...)
if p := sink.Load(); p != nil {
(*p)(msg)
return
}
_, _ = fmt.Fprint(os.Stderr, msg)
}