fix refactor bug (hr3lxphr6j#773)

ddwinhzy · Jul 19, 2024 · 71ca3a9 · 71ca3a9
1 parent 210b9d9
commit 71ca3a9
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 29 deletions.
diff --git a/src/live/error.go b/src/live/error.go
@@ -8,4 +8,5 @@ var (
 	ErrRoomNotExist     = errors.New("room not exists")
 	ErrRoomUrlIncorrect = errors.New("room url incorrect")
 	ErrInternalError    = errors.New("internal error")
+	ErrNotImplemented   = errors.New("not implemented")
 )
diff --git a/src/live/internal/base_live.go b/src/live/internal/base_live.go
@@ -52,7 +52,12 @@ func (a *BaseLive) SetLastStartTime(time time.Time) {
 	a.LastStartTime = time
 }
 
+// TODO: remove this method
+func (a *BaseLive) GetStreamUrls() ([]*url.URL, error) {
+	return nil, live.ErrNotImplemented
+}
+
 // TODO: remove this method
 func (a *BaseLive) GetStreamInfos() ([]*live.StreamUrlInfo, error) {
-	return nil, fmt.Errorf("GetStreamInfos() is not implemented")
+	return nil, live.ErrNotImplemented
 }
diff --git a/src/live/lives.go b/src/live/lives.go
@@ -113,17 +113,14 @@ type Live interface {
 	GetLiveId() ID
 	GetRawUrl() string
 	GetInfo() (*Info, error)
+	// Deprecated: GetStreamUrls is deprecated, using GetStreamInfos instead
+	GetStreamUrls() ([]*url.URL, error)
 	GetStreamInfos() ([]*StreamUrlInfo, error)
 	GetPlatformCNName() string
 	GetLastStartTime() time.Time
 	SetLastStartTime(time.Time)
 }
 
-type HasGetStreamUrls interface {
-	// Deprecated: GetStreamUrls is deprecated, using GetStreamInfos instead
-	GetStreamUrls() ([]*url.URL, error)
-}
-
 type WrappedLive struct {
 	Live
 	cache gcache.Cache

diff --git a/src/live/mock/mock.go b/src/live/mock/mock.go
diff --git a/src/recorders/recorder.go b/src/recorders/recorder.go
@@ -103,32 +103,16 @@ func NewRecorder(ctx context.Context, live live.Live) (Recorder, error) {
 	}, nil
 }
 
-func getStreamInfosForDeprecatedImpl(l live.HasGetStreamUrls) ([]*live.StreamUrlInfo, error) {
-	urls, err := l.GetStreamUrls()
-	if err != nil {
-		return nil, err
-	}
-	infos := make([]*live.StreamUrlInfo, 0, len(urls))
-	for _, u := range urls {
-		infos = append(infos, &live.StreamUrlInfo{
-			Url:                  u,
-			Name:                 "",
-			Description:          "",
-			Resolution:           0,
-			Vbitrate:             0,
-			HeadersForDownloader: make(map[string]string),
-		})
-	}
-	return infos, nil
-}
-
 func (r *recorder) tryRecord(ctx context.Context) {
 	var streamInfos []*live.StreamUrlInfo
 	var err error
-	if l, ok := r.Live.(live.HasGetStreamUrls); ok {
-		streamInfos, err = getStreamInfosForDeprecatedImpl(l)
-	} else {
-		streamInfos, err = r.Live.GetStreamInfos()
+	if streamInfos, err = r.Live.GetStreamInfos(); err == live.ErrNotImplemented {
+		var urls []*url.URL
+		if urls, err = r.Live.GetStreamUrls(); err == live.ErrNotImplemented {
+			panic("GetStreamInfos and GetStreamUrls are not implemented for " + r.Live.GetPlatformCNName())
+		} else if err == nil {
+			streamInfos = utils.GenUrlInfos(urls, make(map[string]string))
+		}
 	}
 	if err != nil || len(streamInfos) == 0 {
 		r.getLogger().WithError(err).Warn("failed to get stream url, will retry after 5s...")