Fix: url cache is nil

internal/op/current.go

@@ -14,7 +14,7 @@ type current struct {
 }
 
 type Current struct {
-	Movie  *Movie `json:"movie"`
+	Movie  Movie  `json:"movie"`
 	Status Status `json:"status"`
 }
 
@@ -22,7 +22,6 @@ func newCurrent() *current {
 	return &current{
 		current: Current{
 			Status: newStatus(),
-			Movie:  &Movie{},
 		},
 	}
 }
@@ -49,7 +48,7 @@ func (c *current) Current() Current {
 	return c.current
 }
 
-func (c *current) Movie() *Movie {
+func (c *current) Movie() Movie {
 	c.lock.RLock()
 	defer c.lock.RUnlock()
 
@@ -60,11 +59,7 @@ func (c *current) SetMovie(movie *Movie, play bool) {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
-	if movie == nil {
-		c.current.Movie = &Movie{}
-	} else {
-		c.current.Movie = movie
-	}
+	c.current.Movie = *movie
 	c.current.SetSeek(0, 0)
 	c.current.Status.Playing = play
 }
@@ -98,7 +93,6 @@ func (c *Current) Proto() *pb.Current {
 			Playing: c.Status.Playing,
 		},
 	}
-	if c.Movie != nil {
 	current.Movie = &pb.MovieInfo{
 		Id: c.Movie.Movie.ID,
 		Base: &pb.BaseMovieInfo{
@@ -129,7 +123,6 @@ func (c *Current) Proto() *pb.Current {
 			}
 		}
 	}
-	}
 	return current
 }
 

internal/op/movie.go

@@ -24,7 +24,7 @@ import (
 
 type Movie struct {
 	Movie   model.Movie
-	lock    sync.RWMutex
+	lock    *sync.RWMutex
 	channel *rtmps.Channel
 	cache   *BaseCache
 }
@@ -35,6 +35,12 @@ type BaseCache struct {
 	mpd  *refreshcache.RefreshCache[*MPDCache]
 }
 
+func newBaseCache() *BaseCache {
+	return &BaseCache{
+		url: make(map[string]*refreshcache.RefreshCache[string]),
+	}
+}
+
 type MPDCache struct {
 	MPDFile string
 	URLs    []string
@@ -87,14 +93,6 @@ func (b *BaseCache) InitOrLoadMPDCache(refreshFunc func() (*MPDCache, error), ma
 	return b.mpd, nil
 }
 
-func (m *Movie) Clone() *Movie {
-	return &Movie{
-		Movie:   m.Movie,
-		channel: m.channel,
-		cache:   m.cache,
-	}
-}
-
 func (m *Movie) Channel() (*rtmps.Channel, error) {
 	m.lock.Lock()
 	defer m.lock.Unlock()
@@ -102,11 +100,6 @@ func (m *Movie) Channel() (*rtmps.Channel, error) {
 }
 
 func (m *Movie) Cache() *BaseCache {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	if m.cache == nil {
-		m.cache = &BaseCache{}
-	}
 	return m.cache
 }
 
@@ -287,9 +280,7 @@ func (m *Movie) terminate() {
 		m.channel.Close()
 		m.channel = nil
 	}
-	if m.cache != nil {
 	m.cache.Clear()
-	}
 }
 
 func (m *Movie) Update(movie *model.BaseMovie) error {

internal/op/movies.go

@@ -24,6 +24,8 @@ func (m *movies) init() {
 		for _, m2 := range db.GetAllMoviesByRoomID(m.roomID) {
 			m.list.PushBack(&Movie{
 				Movie: *m2,
+				lock:  new(sync.RWMutex),
+				cache: newBaseCache(),
 			})
 		}
 	})
@@ -43,6 +45,8 @@ func (m *movies) AddMovie(mo *model.Movie) error {
 	mo.Position = uint(time.Now().UnixMilli())
 	movie := &Movie{
 		Movie: *mo,
+		lock:  new(sync.RWMutex),
+		cache: newBaseCache(),
 	}
 
 	err := movie.init()
@@ -69,6 +73,8 @@ func (m *movies) AddMovies(mos []*model.Movie) error {
 		mo.Position = uint(time.Now().UnixMilli())
 		movie := &Movie{
 			Movie: *mo,
+			lock:  new(sync.RWMutex),
+			cache: newBaseCache(),
 		}
 
 		err := movie.init()

internal/op/room.go

@@ -177,7 +177,6 @@ func (r *Room) GetMovieByID(id string) (*Movie, error) {
 
 func (r *Room) Current() *Current {
 	c := r.current.Current()
-	c.Movie = c.Movie.Clone()
 	return &c
 }
 

server/handlers/movie.go

@@ -98,7 +98,7 @@ func MovieList(ctx *gin.Context) {
 
 func genCurrent(ctx context.Context, current *op.Current, userID string) (*op.Current, error) {
 	if current.Movie.Movie.Base.VendorInfo.Vendor != "" {
-		return current, parse2VendorMovie(ctx, userID, current.Movie)
+		return current, parse2VendorMovie(ctx, userID, &current.Movie)
 	}
 	return current, nil
 }