mirror of
https://github.com/zhaarey/apple-music-alac-atmos-downloader.git
synced 2026-01-15 14:22:53 -03:00
Change logging to structured slog in wv.GetKey
This commit is contained in:
@@ -8,7 +8,7 @@ import (
|
|||||||
|
|
||||||
"github.com/go-resty/resty/v2"
|
"github.com/go-resty/resty/v2"
|
||||||
|
|
||||||
"main/utils/runv3/cdm"
|
wv "main/utils/runv3/cdm"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Key struct {
|
type Key struct {
|
||||||
@@ -27,17 +27,17 @@ func (w *Key) GetKey(ctx context.Context, licenseServerURL string, PSSH string,
|
|||||||
initData, err := base64.StdEncoding.DecodeString(PSSH)
|
initData, err := base64.StdEncoding.DecodeString(PSSH)
|
||||||
var keybt []byte
|
var keybt []byte
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("pssh decode error: %v", err)
|
slog.Error("pssh decode error", slog.Any("err", err))
|
||||||
return "", keybt, err
|
return "", keybt, err
|
||||||
}
|
}
|
||||||
cdm, err := wv.NewDefaultCDM(initData)
|
cdm, err := wv.NewDefaultCDM(initData)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("cdm init error: %v", err)
|
slog.Error("cdm init error", slog.Any("err", err))
|
||||||
return "", keybt, err
|
return "", keybt, err
|
||||||
}
|
}
|
||||||
licenseRequest, err := cdm.GetLicenseRequest()
|
licenseRequest, err := cdm.GetLicenseRequest()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("license request error: %v", err)
|
slog.Error("license request error", slog.Any("err", err))
|
||||||
return "", keybt, err
|
return "", keybt, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -47,13 +47,13 @@ func (w *Key) GetKey(ctx context.Context, licenseServerURL string, PSSH string,
|
|||||||
response, err = w.BeforeRequest(w.ReqCli, ctx, licenseServerURL, licenseRequest)
|
response, err = w.BeforeRequest(w.ReqCli, ctx, licenseServerURL, licenseRequest)
|
||||||
} else {
|
} else {
|
||||||
response, err = w.ReqCli.R().
|
response, err = w.ReqCli.R().
|
||||||
SetContext(ctx).
|
SetContext(ctx).
|
||||||
SetBody(licenseRequest).
|
SetBody(licenseRequest).
|
||||||
Post(licenseServerURL)
|
Post(licenseServerURL)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("license request error: %s", err)
|
slog.Error("license request error", slog.Any("err", err))
|
||||||
return "", keybt, err
|
return "", keybt, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user