From: Jaime Marquínez Ferrándiz Date: Wed, 22 Jan 2014 10:06:03 +0000 (+0100) Subject: [cspan] Make ‘www’ optional and improve the regex for extracting the id (fixes #2194) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=407ae733ab24dbe4fdbd5b996aef6438f16834a2;p=youtube-dl [cspan] Make ‘www’ optional and improve the regex for extracting the id (fixes #2194) --- diff --git a/youtube_dl/extractor/cspan.py b/youtube_dl/extractor/cspan.py index a2cbd4d8d..521bbdee0 100644 --- a/youtube_dl/extractor/cspan.py +++ b/youtube_dl/extractor/cspan.py @@ -10,7 +10,7 @@ from ..utils import ( class CSpanIE(InfoExtractor): - _VALID_URL = r'http://www\.c-spanvideo\.org/program/(.*)' + _VALID_URL = r'http://(?:www\.)?c-spanvideo\.org/program/(?P.*)' IE_DESC = 'C-SPAN' _TEST = { 'url': 'http://www.c-spanvideo.org/program/HolderonV', @@ -24,9 +24,9 @@ class CSpanIE(InfoExtractor): def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) - prog_name = mobj.group(1) + prog_name = mobj.group('name') webpage = self._download_webpage(url, prog_name) - video_id = self._search_regex(r'programid=(.*?)&', webpage, 'video id') + video_id = self._search_regex(r'prog(?:ram)?id=(.*?)&', webpage, 'video id') title = self._html_search_regex( r'\n\s*]*>(.*?)', webpage, 'title')