X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Flaola1tv.py;h=b459559b0349bcae6c8d658c2fb120c2cb81d37e;hb=05a976cd99ef2a0eb0b301cd4f98e1aec927968c;hp=1354214061dfc742fe1654f280109478bcdf57dc;hpb=3037b91e05e68a4ab3420cbbdb23cfb0739011d3;p=youtube-dl diff --git a/youtube_dl/extractor/laola1tv.py b/youtube_dl/extractor/laola1tv.py index 135421406..b459559b0 100644 --- a/youtube_dl/extractor/laola1tv.py +++ b/youtube_dl/extractor/laola1tv.py @@ -27,8 +27,6 @@ class Laola1TvIE(InfoExtractor): } } - _BROKEN = True # Not really - extractor works fine, but f4m downloader does not support live streams yet. - def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) video_id = mobj.group('id') @@ -47,7 +45,7 @@ class Laola1TvIE(InfoExtractor): flashvars = dict((m[0], m[1]) for m in flashvars_m) partner_id = self._search_regex( - 'partnerid\s*:\s*"([^"]+)"', iframe, 'partner id') + r'partnerid\s*:\s*"([^"]+)"', iframe, 'partner id') xml_url = ('http://www.laola1.tv/server/hd_video.php?' + 'play=%s&partner=%s&portal=%s&v5ident=&lang=%s' % ( @@ -57,11 +55,7 @@ class Laola1TvIE(InfoExtractor): title = xpath_text(hd_doc, './/video/title', fatal=True) flash_url = xpath_text(hd_doc, './/video/url', fatal=True) uploader = xpath_text(hd_doc, './/video/meta_organistation') - is_live = xpath_text(hd_doc, './/video/islive') == 'true' - if is_live: - raise ExtractorError( - 'Live streams are not supported by the f4m downloader.') categories = xpath_text(hd_doc, './/video/meta_sports') if categories: