X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftlc.py;h=fd145ba429fbc94ec5582b6100660f2897b25f5f;hb=0384932e3d3566835014f8f48edd47d2ccfa4ea9;hp=0a092ea3cf9508390ca2ae051ba3e1791eec6f49;hpb=3d1bb6b4dd472e0232af029f05e0a1c8e3c1e1c9;p=youtube-dl
diff --git a/youtube_dl/extractor/tlc.py b/youtube_dl/extractor/tlc.py
index 0a092ea3c..fd145ba42 100644
--- a/youtube_dl/extractor/tlc.py
+++ b/youtube_dl/extractor/tlc.py
@@ -1,14 +1,19 @@
-# encoding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
+
import re
from .common import InfoExtractor
-from .brightcove import BrightcoveIE
+from .brightcove import BrightcoveLegacyIE
+from ..compat import (
+ compat_parse_qs,
+ compat_urlparse,
+)
class TlcDeIE(InfoExtractor):
IE_NAME = 'tlc.de'
- _VALID_URL = r'http://www\.tlc\.de/sendungen/[^/]+/videos/(?P
[^/?]+)'
+ _VALID_URL = r'https?://(?:www\.)?tlc\.de/(?:[^/]+/)*videos/(?P[^/?#]+)?(?:.*#(?P\d+))?'
_TEST = {
'url': 'http://www.tlc.de/sendungen/breaking-amish/videos/#3235167922001',
@@ -16,27 +21,23 @@ class TlcDeIE(InfoExtractor):
'id': '3235167922001',
'ext': 'mp4',
'title': 'Breaking Amish: Die Welt da drauÃen',
- 'uploader': 'Discovery Networks - Germany',
- 'description': 'Vier Amische und eine Mennonitin wagen in New York'
+ 'description': (
+ 'Vier Amische und eine Mennonitin wagen in New York'
' den Sprung in ein komplett anderes Leben. Begleitet sie auf'
- ' ihrem spannenden Weg.',
+ ' ihrem spannenden Weg.'),
+ 'timestamp': 1396598084,
+ 'upload_date': '20140404',
+ 'uploader_id': '1659832546',
},
}
+ BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1659832546/default_default/index.html?videoId=%s'
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
- title = mobj.group('title')
- webpage = self._download_webpage(url, title)
- iframe_url = self._search_regex(
- '