From: Naglis Jonaitis Date: Thu, 22 Jan 2015 16:35:53 +0000 (+0200) Subject: [videomega] Fix extraction (Closes #4763) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=bb6e38787dcc3593a4d9cb66bcf9f736570e944a;p=youtube-dl [videomega] Fix extraction (Closes #4763) --- diff --git a/youtube_dl/extractor/videomega.py b/youtube_dl/extractor/videomega.py index 9fc64d172..fc6e05fe0 100644 --- a/youtube_dl/extractor/videomega.py +++ b/youtube_dl/extractor/videomega.py @@ -1,12 +1,15 @@ # coding: utf-8 from __future__ import unicode_literals +import re + from .common import InfoExtractor from ..compat import ( compat_urllib_parse, compat_urllib_request, ) from ..utils import ( + ExtractorError, remove_start, ) @@ -35,8 +38,11 @@ class VideoMegaIE(InfoExtractor): req.add_header('Referer', url) webpage = self._download_webpage(req, video_id) - escaped_data = self._search_regex( - r'unescape\("([^"]+)"\)', webpage, 'escaped data') + try: + escaped_data = re.findall(r'unescape\("([^"]+)"\)', webpage)[-1] + except IndexError: + raise ExtractorError('Unable to extract escaped data') + playlist = compat_urllib_parse.unquote(escaped_data) thumbnail = self._search_regex(