fix: movie subpath

main v0.9.7
zijiren233 2 weeks ago
parent 68fd1d91b8
commit b4740d5eb4

@ -35,10 +35,10 @@ func (c *current) Current() model.Current {
return c.current
}
func (c *current) SubPath() string {
func (c *current) CurrentMovie() model.CurrentMovie {
c.lock.RLock()
defer c.lock.RUnlock()
return c.current.Movie.SubPath
return c.current.Movie
}
func (c *current) SetMovie(movie model.CurrentMovie, play bool) {

@ -35,7 +35,7 @@ type Movie struct {
}
func (m *Movie) SubPath() string {
return m.room.CurrentSubPath()
return m.room.SubPath(m.ID)
}
func (m *Movie) ExpireID(ctx context.Context) (uint64, error) {

@ -478,12 +478,12 @@ func (r *Room) SetCurrentMovie(movieID string, subPath string, play bool) error
return m.ClearCache()
}
func (r *Room) CurrentSubPath() string {
fmt.Println("CurrentSubPath", r.current)
fmt.Println("CurrentSubPath", r.current)
fmt.Println("CurrentSubPath", r.current)
fmt.Println("CurrentSubPath", r.current)
return r.current.SubPath()
func (r *Room) SubPath(id string) string {
m := r.current.CurrentMovie()
if m.ID == id {
return m.SubPath
}
return ""
}
func (r *Room) SwapMoviePositions(id1, id2 string) error {

Loading…
Cancel
Save