Feat: proxy pullKey use url hash

pull/21/head
zijiren233 2 years ago
parent e46965c03e
commit 12ef9a97c0

@ -163,9 +163,7 @@ func (r *Room) initMovie(movie *model.Movie) error {
} }
switch u.Scheme { switch u.Scheme {
case "rtmp": case "rtmp":
if movie.PullKey == "" { movie.PullKey = uuid.NewMD5(uuid.NameSpaceURL, []byte(movie.Url)).String()
movie.PullKey = uuid.New().String()
}
c, err := r.rtmpa.NewChannel(movie.PullKey) c, err := r.rtmpa.NewChannel(movie.PullKey)
if err != nil { if err != nil {
return err return err
@ -188,9 +186,7 @@ func (r *Room) initMovie(movie *model.Movie) error {
} }
}() }()
case "http", "https": case "http", "https":
if movie.PullKey == "" { movie.PullKey = uuid.NewMD5(uuid.NameSpaceURL, []byte(movie.Url)).String()
movie.PullKey = uuid.New().String()
}
c, err := r.rtmpa.NewChannel(movie.PullKey) c, err := r.rtmpa.NewChannel(movie.PullKey)
if err != nil { if err != nil {
return err return err
@ -232,9 +228,7 @@ func (r *Room) initMovie(movie *model.Movie) error {
if u.Scheme != "http" && u.Scheme != "https" { if u.Scheme != "http" && u.Scheme != "https" {
return errors.New("unsupported scheme") return errors.New("unsupported scheme")
} }
if movie.PullKey == "" { movie.PullKey = uuid.NewMD5(uuid.NameSpaceURL, []byte(movie.Url)).String()
movie.PullKey = uuid.New().String()
}
case !movie.Live && !movie.Proxy, movie.Live && !movie.Proxy && !movie.RtmpSource: case !movie.Live && !movie.Proxy, movie.Live && !movie.Proxy && !movie.RtmpSource:
u, err := url.Parse(movie.Url) u, err := url.Parse(movie.Url)
if err != nil { if err != nil {
@ -345,10 +339,7 @@ func (r *Room) DeleteMovieByID(id uint) error {
if err != nil { if err != nil {
return err return err
} }
if m.PullKey != "" { return r.terminateMovie(m)
r.rtmpa.DelChannel(m.PullKey)
}
return nil
} }
func (r *Room) ClearMovies() error { func (r *Room) ClearMovies() error {
@ -358,9 +349,7 @@ func (r *Room) ClearMovies() error {
return err return err
} }
for _, m := range ms { for _, m := range ms {
if m.PullKey != "" { r.terminateMovie(m)
r.rtmpa.DelChannel(m.PullKey)
}
} }
return nil return nil
} }

Loading…
Cancel
Save