Salastil/streamed-tui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Make extractor CLI attach mpv output

Browse Source
This commit is contained in:
Salastil
2025-11-22 20:44:26 -05:00
parent 9df8c33e5e
commit 83417000f9
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/app.go
View File

@@ -471,7 +471,7 @@ func (m Model) runExtractor(st Stream) tea.Cmd {
logcb(fmt.Sprintf("[extractor] Captured %d headers", len(hdrs))) logcb(fmt.Sprintf("[extractor] Captured %d headers", len(hdrs)))
} }
if err := LaunchMPVWithHeaders(m3u8, hdrs, logcb); err != nil { if err := LaunchMPVWithHeaders(m3u8, hdrs, logcb, false); err != nil {
logcb(fmt.Sprintf("[mpv] ❌ %v", err)) logcb(fmt.Sprintf("[mpv] ❌ %v", err))
return debugLogMsg(fmt.Sprintf("MPV error: %v", err)) return debugLogMsg(fmt.Sprintf("MPV error: %v", err))
} }

27
internal/extractor.go
View File

@@ -255,8 +255,10 @@ func lookupHeaderValue(hdrs map[string]string, name string) string {
// LaunchMPVWithHeaders spawns mpv to play the given M3U8 URL using the minimal // LaunchMPVWithHeaders spawns mpv to play the given M3U8 URL using the minimal
// header set required for successful playback (User-Agent, Origin, Referer). // header set required for successful playback (User-Agent, Origin, Referer).
// Logs are streamed via the provided callback. // When attachOutput is true, mpv stays attached to the current terminal and the
func LaunchMPVWithHeaders(m3u8 string, hdrs map[string]string, log func(string)) error { // call blocks until the player exits; otherwise mpv is started quietly so the
// TUI can continue running. Logs are streamed via the provided callback.
func LaunchMPVWithHeaders(m3u8 string, hdrs map[string]string, log func(string), attachOutput bool) error {
if log == nil { if log == nil {
log = func(string) {} log = func(string) {}
} }
@@ -264,7 +266,10 @@ func LaunchMPVWithHeaders(m3u8 string, hdrs map[string]string, log func(string))
return fmt.Errorf("empty m3u8 URL") return fmt.Errorf("empty m3u8 URL")
} }
args := []string{"--no-terminal", "--really-quiet"} args := []string{}
if !attachOutput {
args = append(args, "--no-terminal", "--really-quiet")
}
// Only forward the minimal headers mpv requires to mirror the working // Only forward the minimal headers mpv requires to mirror the working
// curl→mpv handoff: User-Agent, Origin, and Referer. Extra headers // curl→mpv handoff: User-Agent, Origin, and Referer. Extra headers
@@ -279,14 +284,16 @@ func LaunchMPVWithHeaders(m3u8 string, hdrs map[string]string, log func(string))
{lookup: "origin", display: "Origin"}, {lookup: "origin", display: "Origin"},
{lookup: "referer", display: "Referer"}, {lookup: "referer", display: "Referer"},
} }
headerCount := 0
for _, hk := range headerKeys { for _, hk := range headerKeys {
if v := lookupHeaderValue(hdrs, hk.lookup); v != "" { if v := lookupHeaderValue(hdrs, hk.lookup); v != "" {
args = append(args, fmt.Sprintf("--http-header-fields=%s: %s", hk.display, v)) args = append(args, fmt.Sprintf("--http-header-fields=%s: %s", hk.display, v))
headerCount++
} }
} }
args = append(args, m3u8) args = append(args, m3u8)
log(fmt.Sprintf("[mpv] launching with %d headers: %s", len(args)-3, m3u8)) log(fmt.Sprintf("[mpv] launching with %d headers: %s", headerCount, m3u8))
cmd := exec.Command("mpv", args...) cmd := exec.Command("mpv", args...)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
@@ -297,6 +304,16 @@ func LaunchMPVWithHeaders(m3u8 string, hdrs map[string]string, log func(string))
return err return err
} }
if attachOutput {
log("[mpv] started (attached)")
if err := cmd.Wait(); err != nil {
log(fmt.Sprintf("[mpv] exited with error: %v", err))
return err
}
log("[mpv] exited")
return nil
}
log(fmt.Sprintf("[mpv] started (pid %d)", cmd.Process.Pid)) log(fmt.Sprintf("[mpv] started (pid %d)", cmd.Process.Pid))
return nil return nil
} }
@@ -326,7 +343,7 @@ func RunExtractorCLI(embedURL string, debug bool) error {
fmt.Printf("[extractor] captured %d headers\n", len(hdrs)) fmt.Printf("[extractor] captured %d headers\n", len(hdrs))
} }
if err := LaunchMPVWithHeaders(m3u8, hdrs, logger); err != nil { if err := LaunchMPVWithHeaders(m3u8, hdrs, logger, true); err != nil {
fmt.Printf("[mpv] ❌ %v\n", err) fmt.Printf("[mpv] ❌ %v\n", err)
return err return err
} }