mirror of
https://github.com/navidrome/navidrome.git
synced 2026-08-01 07:21:17 +00:00
refactor(transcoding): rename token methods to CreateTranscodeParams and ParseTranscodeParams for clarity
Signed-off-by: Deluan <deluan@navidrome.org>
This commit is contained in:
parent
0d727444ea
commit
a4d97e0265
@ -19,8 +19,8 @@ const (
|
||||
// TranscodeDecision is the core service interface for making transcoding decisions
|
||||
type TranscodeDecision interface {
|
||||
MakeDecision(ctx context.Context, mf *model.MediaFile, clientInfo *ClientInfo) (*Decision, error)
|
||||
CreateToken(decision *Decision) (string, error)
|
||||
ParseToken(token string) (*TranscodeParams, error)
|
||||
CreateTranscodeParams(decision *Decision) (string, error)
|
||||
ParseTranscodeParams(token string) (*TranscodeParams, error)
|
||||
}
|
||||
|
||||
// ClientInfo represents client playback capabilities.
|
||||
@ -464,7 +464,7 @@ func applyIntLimitation(comparison string, values []string, current int, setter
|
||||
return adjustNone
|
||||
}
|
||||
|
||||
func (s *transcodeDecisionService) CreateToken(decision *Decision) (string, error) {
|
||||
func (s *transcodeDecisionService) CreateTranscodeParams(decision *Decision) (string, error) {
|
||||
exp := time.Now().Add(transcodeTokenTTL)
|
||||
claims := map[string]any{
|
||||
"mid": decision.MediaID,
|
||||
@ -480,7 +480,7 @@ func (s *transcodeDecisionService) CreateToken(decision *Decision) (string, erro
|
||||
return auth.CreateExpiringPublicToken(exp, claims)
|
||||
}
|
||||
|
||||
func (s *transcodeDecisionService) ParseToken(token string) (*TranscodeParams, error) {
|
||||
func (s *transcodeDecisionService) ParseTranscodeParams(token string) (*TranscodeParams, error) {
|
||||
claims, err := auth.Validate(token)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@ -617,11 +617,11 @@ var _ = Describe("TranscodeDecision", func() {
|
||||
MediaID: "media-123",
|
||||
CanDirectPlay: true,
|
||||
}
|
||||
token, err := svc.CreateToken(decision)
|
||||
token, err := svc.CreateTranscodeParams(decision)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(token).ToNot(BeEmpty())
|
||||
|
||||
params, err := svc.ParseToken(token)
|
||||
params, err := svc.ParseTranscodeParams(token)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(params.MediaID).To(Equal("media-123"))
|
||||
Expect(params.DirectPlay).To(BeTrue())
|
||||
@ -637,10 +637,10 @@ var _ = Describe("TranscodeDecision", func() {
|
||||
TargetBitrate: 256, // kbps
|
||||
TargetChannels: 2,
|
||||
}
|
||||
token, err := svc.CreateToken(decision)
|
||||
token, err := svc.CreateTranscodeParams(decision)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
|
||||
params, err := svc.ParseToken(token)
|
||||
params, err := svc.ParseTranscodeParams(token)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(params.MediaID).To(Equal("media-456"))
|
||||
Expect(params.DirectPlay).To(BeFalse())
|
||||
@ -650,7 +650,7 @@ var _ = Describe("TranscodeDecision", func() {
|
||||
})
|
||||
|
||||
It("rejects an invalid token", func() {
|
||||
_, err := svc.ParseToken("invalid-token")
|
||||
_, err := svc.ParseTranscodeParams("invalid-token")
|
||||
Expect(err).To(HaveOccurred())
|
||||
})
|
||||
})
|
||||
|
||||
@ -237,8 +237,8 @@ func (api *Router) GetTranscodeDecision(w http.ResponseWriter, r *http.Request)
|
||||
return nil, newError(responses.ErrorGeneric, "failed to make transcode decision: %v", err)
|
||||
}
|
||||
|
||||
// Create token
|
||||
transcodeParams, err := api.transcodeDecision.CreateToken(decision)
|
||||
// Create transcode params token
|
||||
transcodeParams, err := api.transcodeDecision.CreateTranscodeParams(decision)
|
||||
if err != nil {
|
||||
return nil, newError(responses.ErrorGeneric, "failed to create transcode token: %v", err)
|
||||
}
|
||||
@ -306,7 +306,7 @@ func (api *Router) GetTranscodeStream(w http.ResponseWriter, r *http.Request) (*
|
||||
}
|
||||
|
||||
// Parse and validate the token
|
||||
params, err := api.transcodeDecision.ParseToken(transcodeParams)
|
||||
params, err := api.transcodeDecision.ParseTranscodeParams(transcodeParams)
|
||||
if err != nil {
|
||||
log.Debug(ctx, "Failed to parse transcode token", err)
|
||||
return nil, newError(responses.ErrorDataNotFound, "invalid or expired transcodeParams token")
|
||||
|
||||
@ -256,11 +256,11 @@ func (m *mockTranscodeDecision) MakeDecision(_ context.Context, _ *model.MediaFi
|
||||
return &core.Decision{}, nil
|
||||
}
|
||||
|
||||
func (m *mockTranscodeDecision) CreateToken(_ *core.Decision) (string, error) {
|
||||
func (m *mockTranscodeDecision) CreateTranscodeParams(_ *core.Decision) (string, error) {
|
||||
return m.token, m.tokenErr
|
||||
}
|
||||
|
||||
func (m *mockTranscodeDecision) ParseToken(_ string) (*core.TranscodeParams, error) {
|
||||
func (m *mockTranscodeDecision) ParseTranscodeParams(_ string) (*core.TranscodeParams, error) {
|
||||
if m.parseErr != nil {
|
||||
return nil, m.parseErr
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user