From 963623ceb6a59f8ae8db080cac38dca451d11deb Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Mon, 21 May 2018 17:03:53 -0400 Subject: [PATCH] [picarto] Extract token from url --- youtube_dl/extractor/picarto.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/picarto.py b/youtube_dl/extractor/picarto.py index abb0fe462..60639691a 100644 --- a/youtube_dl/extractor/picarto.py +++ b/youtube_dl/extractor/picarto.py @@ -15,7 +15,7 @@ from ..utils import ( class PicartoIE(InfoExtractor): - _VALID_URL = r'https?://(?:www.)?picarto\.tv/(?P[a-zA-Z0-9]+)' + _VALID_URL = r'https?://(?:www.)?picarto\.tv/(?P[a-zA-Z0-9]+)(?:/(?P[a-zA-Z0-9]+))?' _TEST = { 'url': 'https://picarto.tv/Setz', 'info_dict': { @@ -60,12 +60,13 @@ class PicartoIE(InfoExtractor): def get_event(key): return try_get(player, lambda x: x['event'][key], compat_str) or '' + token = self._VALID_URL_RE.match(url).group('token') or 'public' params = { - 'token': player.get('token') or '', 'ticket': get_event('ticket'), 'con': int(time.time() * 1000), 'type': get_event('ticket'), 'scope': get_event('scope'), + 'token': token, } prefered_edge = cdn_data.get('preferedEdge')