Merge remote-tracking branch 'olebowle/ard'

This commit is contained in:
Philipp Hagemeister 2014-10-27 01:36:50 +01:00
commit f24a5a2faa

View File

@ -4,6 +4,7 @@
import re
from .common import InfoExtractor
from .generic import GenericIE
from ..utils import (
determine_ext,
ExtractorError,
@ -12,6 +13,7 @@
parse_duration,
unified_strdate,
xpath_text,
parse_xml,
)
@ -54,6 +56,11 @@ def _real_extract(self, url):
if '>Der gewünschte Beitrag ist nicht mehr verfügbar.<' in webpage:
raise ExtractorError('Video %s is no longer available' % video_id, expected=True)
if re.search(r'[\?&]rss($|[=&])', url):
doc = parse_xml(webpage)
if doc.tag == 'rss':
return GenericIE()._extract_rss(url, video_id, doc)
title = self._html_search_regex(
[r'<h1(?:\s+class="boxTopHeadline")?>(.*?)</h1>',
r'<meta name="dcterms.title" content="(.*?)"/>',