refactor: wrap bare errors with context in playback package

This commit is contained in:
2026-06-16 10:42:37 +02:00
committed by Milas Holsting
parent 290dc36298
commit ca08af2dbb
4 changed files with 30 additions and 19 deletions

View File

@@ -1,6 +1,7 @@
package handler
import (
"fmt"
"net/http"
"net/url"
"strings"
@@ -22,7 +23,7 @@ func isHLSPlaylistResponse(targetURL string, headers http.Header) bool {
func (h *PlaybackHandler) rewriteHLSPlaylist(body string, playlistURL string, referer string) (string, error) {
baseURL, err := url.Parse(playlistURL)
if err != nil {
return "", err
return "", fmt.Errorf("parse playlist url %q: %w", playlistURL, err)
}
lines := strings.SplitAfter(body, "\n")
@@ -47,7 +48,7 @@ func (h *PlaybackHandler) rewriteHLSPlaylist(body string, playlistURL string, re
rewritten, err = h.proxyPlaylistURI(trimmed, baseURL, referer)
}
if err != nil {
return "", err
return "", fmt.Errorf("rewrite hls playlist line %q: %w", trimmed, err)
}
}
out.WriteString(rewritten)
@@ -76,7 +77,7 @@ func (h *PlaybackHandler) rewriteHLSQuotedURIs(line string, baseURL *url.URL, re
}
proxied, err := h.proxyPlaylistURI(remaining[:end], baseURL, referer)
if err != nil {
return "", err
return "", fmt.Errorf("rewrite quoted hls uri %q: %w", remaining[:end], err)
}
out.WriteString(proxied)
remaining = remaining[end:]
@@ -86,11 +87,11 @@ func (h *PlaybackHandler) rewriteHLSQuotedURIs(line string, baseURL *url.URL, re
func (h *PlaybackHandler) proxyPlaylistURI(rawURI string, baseURL *url.URL, referer string) (string, error) {
target, err := baseURL.Parse(rawURI)
if err != nil {
return "", err
return "", fmt.Errorf("parse hls uri %q: %w", rawURI, err)
}
token, err := h.svc.SignProxyToken(target.String(), referer, "stream")
if err != nil {
return "", err
return "", fmt.Errorf("sign hls proxy token for %q: %w", target.String(), err)
}
params := url.Values{}
params.Set("token", token)

View File

@@ -2,6 +2,7 @@ package handler
import (
"context"
"fmt"
netutil "mal/pkg/net"
"net/http"
)
@@ -9,7 +10,7 @@ import (
func newProxyRequest(ctx context.Context, targetURL string, referer string) (*http.Request, error) {
req, err := http.NewRequestWithContext(ctx, http.MethodGet, targetURL, nil)
if err != nil {
return nil, err
return nil, fmt.Errorf("build proxy request for %q: %w", targetURL, err)
}
if referer != "" {