diff --git a/backend/__debug_bin2026651329 b/backend/__debug_bin601502269 similarity index 83% rename from backend/__debug_bin2026651329 rename to backend/__debug_bin601502269 index a16257a..51d415e 100755 Binary files a/backend/__debug_bin2026651329 and b/backend/__debug_bin601502269 differ diff --git a/backend/modules/medias/service.go b/backend/modules/medias/service.go index b7ebc3b..49eb5ba 100644 --- a/backend/modules/medias/service.go +++ b/backend/modules/medias/service.go @@ -272,22 +272,26 @@ func (svc *Service) GetM3U8(ctx context.Context, tenantId int64, types pg.MediaT if !ok { return nil, errors.New("Invalid media playlist") } - media.Segments = lo.Filter(media.Segments, func(seg *m3u8.MediaSegment, _ int) bool { - return seg != nil - }) if !bought { duration := 0 - for i, seg := range media.Segments { - duration += int(seg.Duration) - if duration >= 55 { - media.Segments = media.Segments[:i] - break + media.Segments = lo.Map(media.Segments, func(seg *m3u8.MediaSegment, _ int) *m3u8.MediaSegment { + if seg == nil { + return nil } - } + + duration += int(seg.Duration) + if duration <= 55 { + return seg + } + return nil + }) } for _, seg := range media.Segments { + if seg == nil { + continue + } // remove seg.URI ext, only keep the name name, ext := path.SplitNameExt(seg.URI) nameId, err := cast.ToInt64E(name) diff --git a/frontend/src/views/PlayView.vue b/frontend/src/views/PlayView.vue index 9128f6c..fbb05ff 100644 --- a/frontend/src/views/PlayView.vue +++ b/frontend/src/views/PlayView.vue @@ -1,12 +1,10 @@ @@ -146,7 +140,8 @@ const formatTime = (time) => { } #video { - width: 100%; aspect-ratio: 4 / 3; + width: 100%; + object-fit: fill; } \ No newline at end of file