diff options
author | remitamine <remitamine@gmail.com> | 2015-12-22 16:10:04 +0100 |
---|---|---|
committer | remitamine <remitamine@gmail.com> | 2015-12-22 16:10:04 +0100 |
commit | 31d9ea4a3e641acfee8852c9324bd414047fce9e (patch) | |
tree | 8a38761602b9882cfa38dfc9349ef966e0aabde4 /youtube_dl/extractor/xstream.py | |
parent | 2db5806991145ee293c964ecd85623c093d2e429 (diff) | |
parent | 3b68efdc6ae109a840ff5f15f0e28910c2463b3f (diff) | |
download | youtube-dl-31d9ea4a3e641acfee8852c9324bd414047fce9e.tar.xz |
Merge pull request #7322 from remitamine/vgtv
[vgtv] extract videos from FTV, Aftenposten, Aftonbladet using VGTVIE
Diffstat (limited to 'youtube_dl/extractor/xstream.py')
-rw-r--r-- | youtube_dl/extractor/xstream.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/youtube_dl/extractor/xstream.py b/youtube_dl/extractor/xstream.py index 71584c291..76c91bd92 100644 --- a/youtube_dl/extractor/xstream.py +++ b/youtube_dl/extractor/xstream.py @@ -42,11 +42,7 @@ class XstreamIE(InfoExtractor): 'only_matching': True, }] - def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - partner_id = mobj.group('partner_id') - video_id = mobj.group('id') - + def _extract_video_info(self, partner_id, video_id): data = self._download_xml( 'http://frontend.xstream.dk/%s/feed/video/?platform=web&id=%s' % (partner_id, video_id), @@ -97,6 +93,7 @@ class XstreamIE(InfoExtractor): formats.append({ 'url': link.get('href'), 'format_id': link.get('rel'), + 'preference': 1, }) thumbnails = [{ @@ -113,3 +110,10 @@ class XstreamIE(InfoExtractor): 'formats': formats, 'thumbnails': thumbnails, } + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + partner_id = mobj.group('partner_id') + video_id = mobj.group('id') + + return self._extract_video_info(partner_id, video_id) |