diff options
| author | Filippo Valsorda <filippo.valsorda@gmail.com> | 2013-03-29 15:59:13 +0100 |
|---|---|---|
| committer | Filippo Valsorda <filippo.valsorda@gmail.com> | 2013-03-29 15:59:13 +0100 |
| commit | 7decf8951cd500acc6ed7c9ad049996957e26d73 (patch) | |
| tree | ffd06563cd7c495f75eea0605f91729c74e40f05 | |
| parent | 1f46c152628bdd6b97212ced758b9f83063b5820 (diff) | |
| download | youtube-dl-7decf8951cd500acc6ed7c9ad049996957e26d73.tar.xz | |
fix FunnyOrDieIE, MyVideoIE, TEDIE
| -rwxr-xr-x | youtube_dl/InfoExtractors.py | 8 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 83cb32196..b3c3dbb43 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -2305,7 +2305,7 @@ class MyVideoIE(InfoExtractor): webpage = self._download_webpage(webpage_url, video_id) self.report_extraction(video_id) - mobj = re.search(r'<link rel=\'image_src\' href=\'(http://is[0-9].myvideo\.de/de/movie[0-9]+/[a-f0-9]+)/thumbs/.*?\.jpg\' />', + mobj = re.search(r'<link rel=\'image_src\' href=\'(http://is[0-9].myvideo\.de/de/movie[0-9]+/[a-f0-9]+)/thumbs/.*?\.jpg\'', webpage) if mobj is None: self._downloader.report_error(u'unable to extract media URL') @@ -3604,10 +3604,10 @@ class FunnyOrDieIE(InfoExtractor): self._downloader.report_error(u'unable to find video information') video_url = unescapeHTML(m.group('url')) - m = re.search(r"class='player_page_h1'>\s+<a.*?>(?P<title>.*?)</a>", webpage) + m = re.search(r"<h1 class='player_page_h1'.*?>(?P<title>.*?)</h1>", webpage, flags=re.DOTALL) if not m: self._downloader.trouble(u'Cannot find video title') - title = unescapeHTML(m.group('title')) + title = clean_html(m.group('title')) m = re.search(r'<meta property="og:description" content="(?P<desc>.*?)"', webpage) if m: @@ -4051,7 +4051,7 @@ class TEDIE(InfoExtractor): videoName=m.group('name') webpage=self._download_webpage(url, video_id, 'Downloading \"%s\" page' % videoName) # If the url includes the language we get the title translated - title_RE=r'<h1><span id="altHeadline" >(?P<title>.*)</span></h1>' + title_RE=r'<span id="altHeadline" >(?P<title>.*)</span>' title=re.search(title_RE, webpage).group('title') info_RE=r'''<script\ type="text/javascript">var\ talkDetails\ =(.*?) "id":(?P<videoID>[\d]+).*? diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 49af7d7c0..d366c4173 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -311,7 +311,7 @@ def clean_html(html): html = re.sub('<.*?>', '', html) # Replace html entities html = unescapeHTML(html) - return html + return html.strip() def sanitize_open(filename, open_mode): |