From 6f90d098c5e52bf16c779d0ab638fb88dff837c3 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 13 Feb 2014 16:32:42 +0100 Subject: [PATCH] [ecapist] modernize and fix id property --- youtube_dl/extractor/escapist.py | 60 +++++++++++++++----------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/youtube_dl/extractor/escapist.py b/youtube_dl/extractor/escapist.py index b1242f6bc..272dfe1f6 100644 --- a/youtube_dl/extractor/escapist.py +++ b/youtube_dl/extractor/escapist.py @@ -1,9 +1,9 @@ -import json +from __future__ import unicode_literals + import re from .common import InfoExtractor from ..utils import ( - compat_str, compat_urllib_parse, ExtractorError, @@ -11,70 +11,68 @@ from ..utils import ( class EscapistIE(InfoExtractor): - _VALID_URL = r'^https?://?(www\.)?escapistmagazine\.com/videos/view/(?P[^/]+)/(?P[^/?]+)[/?]?.*$' + _VALID_URL = r'^https?://?(www\.)?escapistmagazine\.com/videos/view/(?P[^/]+)/(?P[0-9]+)-' _TEST = { - u'url': u'http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate', - u'file': u'6618-Breaking-Down-Baldurs-Gate.mp4', - u'md5': u'ab3a706c681efca53f0a35f1415cf0d1', - u'info_dict': { - u"description": u"Baldur's Gate: Original, Modded or Enhanced Edition? I'll break down what you can expect from the new Baldur's Gate: Enhanced Edition.", - u"uploader": u"the-escapist-presents", - u"title": u"Breaking Down Baldur's Gate" + 'url': 'http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate', + 'md5': 'ab3a706c681efca53f0a35f1415cf0d1', + 'info_dict': { + 'id': '6618', + 'ext': 'mp4', + 'description': "Baldur's Gate: Original, Modded or Enhanced Edition? I'll break down what you can expect from the new Baldur's Gate: Enhanced Edition.", + 'uploader': 'the-escapist-presents', + 'title': "Breaking Down Baldur's Gate", } } def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) showName = mobj.group('showname') - videoId = mobj.group('episode') + video_id = mobj.group('id') - self.report_extraction(videoId) - webpage = self._download_webpage(url, videoId) + self.report_extraction(video_id) + webpage = self._download_webpage(url, video_id) videoDesc = self._html_search_regex( r'