aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/condenast.py
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-09-23 17:48:39 +0100
committerSergey M․ <dstftw@gmail.com>2015-09-25 05:11:38 +0600
commit882fc9052e310b5ac6675488bba767c43ca2185e (patch)
tree3725733d288dc290892692014d85440603bfdd23 /youtube_dl/extractor/condenast.py
parent9b166fc1f8039fe3f3632c40848ce590ade9f3fa (diff)
downloadyoutube-dl-882fc9052e310b5ac6675488bba767c43ca2185e.zip
youtube-dl-882fc9052e310b5ac6675488bba767c43ca2185e.tar.gz
youtube-dl-882fc9052e310b5ac6675488bba767c43ca2185e.tar.bz2
[condenast] fix extraction and add support for other sites
Diffstat (limited to 'youtube_dl/extractor/condenast.py')
-rw-r--r--youtube_dl/extractor/condenast.py25
1 files changed, 18 insertions, 7 deletions
diff --git a/youtube_dl/extractor/condenast.py b/youtube_dl/extractor/condenast.py
index 3db4db4..22c66da 100644
--- a/youtube_dl/extractor/condenast.py
+++ b/youtube_dl/extractor/condenast.py
@@ -2,7 +2,6 @@
from __future__ import unicode_literals
import re
-import json
from .common import InfoExtractor
from ..compat import (
@@ -24,13 +23,25 @@ class CondeNastIE(InfoExtractor):
# The keys are the supported sites and the values are the name to be shown
# to the user and in the extractor description.
_SITES = {
- 'wired': 'WIRED',
+ 'allure': 'Allure',
+ 'architecturaldigest': 'Architectural Digest',
+ 'arstechnica': 'Ars Technica',
+ 'bonappetit': 'Bon Appetit',
+ 'brides': 'Brides',
+ 'cnevids': 'Condé Nast',
+ 'cntraveler': 'Condé Nast Traveler',
+ 'details': 'Details',
+ 'epicurious': 'Epicurious',
+ 'glamour': 'Glamour',
+ 'golfdigest': 'Golf Digest',
'gq': 'GQ',
+ 'newyorker': 'The New Yorker',
+ 'self': 'SELF',
+ 'teenvogue': 'Teen Vogue',
+ 'vanityfair': 'Vanity Fair',
'vogue': 'Vogue',
- 'glamour': 'Glamour',
+ 'wired': 'WIRED',
'wmagazine': 'W Magazine',
- 'vanityfair': 'Vanity Fair',
- 'cnevids': 'Condé Nast',
}
_VALID_URL = r'http://(video|www|player)\.(?P<site>%s)\.com/(?P<type>watch|series|video|embed)/(?P<id>[^/?#]+)' % '|'.join(_SITES.keys())
@@ -86,8 +97,8 @@ class CondeNastIE(InfoExtractor):
info_url = base_info_url + data
info_page = self._download_webpage(info_url, video_id,
'Downloading video info')
- video_info = self._search_regex(r'var video = ({.+?});', info_page, 'video info')
- video_info = json.loads(video_info)
+ video_info = self._search_regex(r'var\s*video\s*=\s*({.+?});', info_page, 'video info')
+ video_info = self._parse_json(video_info, video_id)
formats = [{
'format_id': '%s-%s' % (fdata['type'].split('/')[-1], fdata['quality']),