From ce31b43797e79e775facb6d15ce8b5a25bacfbc4 Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Jacquier Date: Sat, 27 Apr 2019 20:57:27 +0200 Subject: [PATCH] fixup! Support m3u8 Signed-off-by: Pierre-Emmanuel Jacquier --- pkg/routes/routes.go | 2 +- pkg/routes/xtream.go | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkg/routes/routes.go b/pkg/routes/routes.go index da9c94a..939513a 100644 --- a/pkg/routes/routes.go +++ b/pkg/routes/routes.go @@ -56,7 +56,7 @@ func Routes(proxyConfig *config.ProxyConfig, r *gin.RouterGroup, newM3U []byte) r.POST("/player_api.php", p.appAuthenticate, p.xtreamPlayerAPI) r.GET("/xmltv.php", p.authenticate, p.xtreamXMLTV) r.GET(fmt.Sprintf("/%s/%s/:id", proxyConfig.User, proxyConfig.Password), p.xtreamStream) - r.GET(fmt.Sprintf("/live/%s/%s/:id", proxyConfig.User, proxyConfig.Password), p.xtreamStream) + r.GET(fmt.Sprintf("/live/%s/%s/:id", proxyConfig.User, proxyConfig.Password), p.xtreamStreamLive) r.GET(fmt.Sprintf("/movie/%s/%s/:id", proxyConfig.User, proxyConfig.Password), p.xtreamStreamMovie) r.GET(fmt.Sprintf("/series/%s/%s/:id", proxyConfig.User, proxyConfig.Password), p.xtreamStreamSeries) diff --git a/pkg/routes/xtream.go b/pkg/routes/xtream.go index f798b48..0695b3d 100644 --- a/pkg/routes/xtream.go +++ b/pkg/routes/xtream.go @@ -110,6 +110,17 @@ func (p *proxy) xtreamStream(c *gin.Context) { stream(c, rpURL) } +func (p *proxy) xtreamStreamLive(c *gin.Context) { + id := c.Param("id") + rpURL, err := url.Parse(fmt.Sprintf("%s/live/%s/%s/%s", p.XtreamBaseURL, p.XtreamUser, p.XtreamPassword, id)) + if err != nil { + c.AbortWithError(http.StatusInternalServerError, err) + return + } + + stream(c, rpURL) +} + func (p *proxy) xtreamStreamMovie(c *gin.Context) { id := c.Param("id") rpURL, err := url.Parse(fmt.Sprintf("%s/movie/%s/%s/%s", p.XtreamBaseURL, p.XtreamUser, p.XtreamPassword, id))