From 7e2cf6581b2a730b275318c773c5e51707826ea1 Mon Sep 17 00:00:00 2001 From: bastimeyer Date: Fri, 16 Dec 2016 15:54:02 +0100 Subject: [PATCH] Change streamlink version check regexp. Resolves #371 --- src/app/services/StreamingService.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/services/StreamingService.js b/src/app/services/StreamingService.js index ce11321926..e658686df3 100644 --- a/src/app/services/StreamingService.js +++ b/src/app/services/StreamingService.js @@ -41,7 +41,7 @@ const { "stream-reload-interval": streamReloadInterval } = varsConfig; const modelName = "stream"; -const reVersion = /^(livestreamer|streamlink)(?:\.exe|-script\.py)? (\d+\.\d+.\d+)(?:.*)$/; +const reVersion = /^(streamlink|livestreamer)(?:\.exe|-script\.py)? (\d+\.\d+.\d+)(?:$|\s.*)/; const reReplace = /^\[(?:cli|plugin\.\w+)]\[\S+]\s+/; const reUnable = /^error: Unable to open URL: /; const reNoStreams = /^error: No streams found on this URL: /; @@ -360,6 +360,7 @@ export default Service.extend( ChannelSettingsMixin, { let match = reVersion.exec( line ); if ( match ) { let [ , name, version ] = match; + name.toLowerCase(); resolve({ name, version }); } else { reject( new Error( "Invalid version check output" ) );