melosh/mal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: consolidate proxy handlers and simplify ranking/watchlist

Browse Source
This commit is contained in:
mkelvers
2026-04-20 01:26:16 +02:00
parent 82820f04d3
commit be5824ab5f
3 changed files with 93 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
internal/features/playback/handler.go
View File

@@ -5,6 +5,7 @@ import (
"database/sql"
"encoding/json"
"errors"
"fmt"
"io"
"log"
"net/http"
@@ -184,72 +185,48 @@ func convertSegments(segments []SkipSegment) []templates.SkipSegment {
return result
}
func (h *Handler) HandleProxyStream(w http.ResponseWriter, r *http.Request) {
func (h *Handler) HandleProxy(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
mode := normalizeMode(r.URL.Query().Get("mode"))
if mode == "" {
mode = "dub"
}
token := strings.TrimSpace(r.URL.Query().Get("token"))
if token == "" {
http.Error(w, "missing playback token", http.StatusBadRequest)
return
}
targetURL, referer, err := h.svc.resolveProxyToken(r.Context(), token, proxyScopeStream)
scope := proxyScope(strings.TrimPrefix(r.URL.Path, "/watch/proxy/"))
scopeLabel := map[proxyScope]string{
proxyScopeStream: "stream",
proxyScopeSegment: "segment",
proxyScopeSubtitle: "subtitle",
}[scope]
if scopeLabel == "" {
http.Error(w, "invalid proxy scope", http.StatusBadRequest)
return
}
targetURL, referer, err := h.svc.resolveProxyToken(r.Context(), token, scope)
if err != nil {
http.Error(w, "invalid stream token", http.StatusBadRequest)
http.Error(w, fmt.Sprintf("invalid %s token", scopeLabel), http.StatusBadRequest)
return
}
h.proxyUpstream(w, r, targetURL, referer)
}
func (h *Handler) HandleProxyStream(w http.ResponseWriter, r *http.Request) {
h.HandleProxy(w, r)
}
func (h *Handler) HandleProxySegment(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
token := strings.TrimSpace(r.URL.Query().Get("token"))
if token == "" {
http.Error(w, "missing segment token", http.StatusBadRequest)
return
}
targetURL, referer, err := h.svc.resolveProxyToken(r.Context(), token, proxyScopeSegment)
if err != nil {
http.Error(w, "invalid segment token", http.StatusBadRequest)
return
}
h.proxyUpstream(w, r, targetURL, referer)
h.HandleProxy(w, r)
}
func (h *Handler) HandleProxySubtitle(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
token := strings.TrimSpace(r.URL.Query().Get("token"))
if token == "" {
http.Error(w, "missing subtitle token", http.StatusBadRequest)
return
}
targetURL, referer, err := h.svc.resolveProxyToken(r.Context(), token, proxyScopeSubtitle)
if err != nil {
http.Error(w, "invalid subtitle token", http.StatusBadRequest)
return
}
h.proxyUpstream(w, r, targetURL, referer)
h.HandleProxy(w, r)
}
func (h *Handler) HandleSaveProgress(w http.ResponseWriter, r *http.Request) {