From baf38305cb3a55cc2c56ac8119aea65388844bff Mon Sep 17 00:00:00 2001 From: uvjustin <46082645+uvjustin@users.noreply.github.com> Date: Mon, 7 Dec 2020 22:18:27 +0800 Subject: [PATCH] Remove use of named groups in regexp (#7921) --- src/components/ha-hls-player.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/components/ha-hls-player.ts b/src/components/ha-hls-player.ts index 109219a99a..777684d187 100644 --- a/src/components/ha-hls-player.ts +++ b/src/components/ha-hls-player.ts @@ -127,7 +127,7 @@ class HaHLSPlayer extends LitElement { // Parse playlist assuming it is a master playlist. Match group 1 is whether hevc, match group 2 is regular playlist url // See https://tools.ietf.org/html/rfc8216 for HLS spec details - const playlistRegexp = /#EXT-X-STREAM-INF:.*?(?:CODECS=".*?(?hev1|hvc1)?\..*?".*?)?(?:\n|\r\n)(?.+)/g; + const playlistRegexp = /#EXT-X-STREAM-INF:.*?(?:CODECS=".*?(hev1|hvc1)?\..*?".*?)?(?:\n|\r\n)(.+)/g; const match = playlistRegexp.exec(masterPlaylist); const matchTwice = playlistRegexp.exec(masterPlaylist); @@ -136,17 +136,13 @@ class HaHLSPlayer extends LitElement { let playlist_url: string; if (match !== null && matchTwice === null) { // Only send the regular playlist url if we match exactly once - playlist_url = new URL(match.groups!.streamUrl, this.url).href; + playlist_url = new URL(match[2], this.url).href; } else { playlist_url = this.url; } // If codec is HEVC and ExoPlayer is supported, use ExoPlayer. - if ( - this._useExoPlayer && - match !== null && - match.groups!.isHevc !== undefined - ) { + if (this._useExoPlayer && match !== null && match[1] !== undefined) { this._renderHLSExoPlayer(playlist_url); } else if (hls.isSupported()) { this._renderHLSPolyfill(videoEl, hls, playlist_url);