aiden
/
synctv
mirror of https://github.com/synctv-org/synctv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: no need check live proxy is not enabled

Browse Source
pull/216/head v0.6.8
zijiren233 2 years ago
parent d9301e4e63
commit 59e017c21e
1 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File

57
server/handlers/movie.go
Unescape Escape View File

@ -846,12 +846,19 @@ func JoinLive(ctx *gin.Context) {
ctx.AbortWithStatusJSON(http.StatusNotFound, model.NewApiErrorResp(err)) ctx.AbortWithStatusJSON(http.StatusNotFound, model.NewApiErrorResp(err))
return return
} }
if m.Movie.MovieBase.RtmpSource && !conf.Conf.Server.Rtmp.Enable { if !m.Movie.MovieBase.Live {
log.Error("join live error: rtmp is not enabled") log.Error("join hls live error: live is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live is not enabled"))
return
}
if m.Movie.MovieBase.RtmpSource {
if !conf.Conf.Server.Rtmp.Enable {
log.Error("join hls live error: rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled")) ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled"))
return return
} else if m.Movie.MovieBase.Live && !settings.LiveProxy.Get() { }
log.Error("join live error: live proxy is not enabled") } else if !settings.LiveProxy.Get() {
log.Error("join hls live error: live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled")) ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled"))
return return
} }
@ -905,17 +912,19 @@ func JoinFlvLive(ctx *gin.Context) {
room := ctx.MustGet("room").(*op.RoomEntry).Value() room := ctx.MustGet("room").(*op.RoomEntry).Value()
movieId := strings.TrimSuffix(strings.Trim(ctx.Param("movieId"), "/"), ".flv") movieId := strings.TrimSuffix(strings.Trim(ctx.Param("movieId"), "/"), ".flv")
m, err := room.GetMovieByID(movieId) m, err := room.GetMovieByID(movieId)
if err != nil { if !m.Movie.MovieBase.Live {
log.Errorf("join flv live error: %v", err) log.Error("join hls live error: live is not enabled")
ctx.AbortWithStatusJSON(http.StatusNotFound, model.NewApiErrorResp(err)) ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live is not enabled"))
return return
} }
if m.Movie.MovieBase.RtmpSource && !conf.Conf.Server.Rtmp.Enable { if m.Movie.MovieBase.RtmpSource {
log.Error("join flv live error: rtmp is not enabled") if !conf.Conf.Server.Rtmp.Enable {
log.Error("join hls live error: rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled")) ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled"))
return return
} else if m.Movie.MovieBase.Live && !settings.LiveProxy.Get() { }
log.Error("join flv live error: live proxy is not enabled") } else if !settings.LiveProxy.Get() {
log.Error("join hls live error: live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled")) ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled"))
return return
} }
@ -954,11 +963,18 @@ func JoinHlsLive(ctx *gin.Context) {
ctx.AbortWithStatusJSON(http.StatusNotFound, model.NewApiErrorResp(err)) ctx.AbortWithStatusJSON(http.StatusNotFound, model.NewApiErrorResp(err))
return return
} }
if m.Movie.MovieBase.RtmpSource && !conf.Conf.Server.Rtmp.Enable { if !m.Movie.MovieBase.Live {
log.Error("join hls live error: live is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live is not enabled"))
return
}
if m.Movie.MovieBase.RtmpSource {
if !conf.Conf.Server.Rtmp.Enable {
log.Error("join hls live error: rtmp is not enabled") log.Error("join hls live error: rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled")) ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled"))
return return
} else if m.Movie.MovieBase.Live && !settings.LiveProxy.Get() { }
} else if !settings.LiveProxy.Get() {
log.Error("join hls live error: live proxy is not enabled") log.Error("join hls live error: live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled")) ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled"))
return return
@ -1004,12 +1020,19 @@ func ServeHlsLive(ctx *gin.Context) {
ctx.AbortWithStatusJSON(http.StatusNotFound, model.NewApiErrorResp(err)) ctx.AbortWithStatusJSON(http.StatusNotFound, model.NewApiErrorResp(err))
return return
} }
if m.Movie.MovieBase.RtmpSource && !conf.Conf.Server.Rtmp.Enable { if !m.Movie.MovieBase.Live {
log.Error("serve hls live error: rtmp is not enabled") log.Error("join hls live error: live is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live is not enabled"))
return
}
if m.Movie.MovieBase.RtmpSource {
if !conf.Conf.Server.Rtmp.Enable {
log.Error("join hls live error: rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled")) ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled"))
return return
} else if m.Movie.MovieBase.Live && !settings.LiveProxy.Get() { }
log.Error("serve hls live error: live proxy is not enabled") } else if !settings.LiveProxy.Get() {
log.Error("join hls live error: live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled")) ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled"))
return return
} }

Write Preview
Loading…
Cancel
Save