)
from ..utils import (
ExtractorError,
+ int_or_none,
+ sanitized_Request,
)
for header, value in headers.items():
url_or_request.add_header(header, value)
else:
- url_or_request = compat_urllib_request.Request(url_or_request, headers=headers)
+ url_or_request = sanitized_Request(url_or_request, headers=headers)
response = super(UdemyIE, self)._download_json(url_or_request, video_id, note)
self._handle_error(response)
def _login(self):
(username, password) = self._get_login_info()
if username is None:
- raise ExtractorError(
- 'Udemy account is required, use --username and --password options to provide account credentials.',
- expected=True)
+ self.raise_login_required('Udemy account is required')
login_popup = self._download_webpage(
self._LOGIN_URL, None, 'Downloading login popup')
- if login_popup == '<div class="run-command close-popup redirect" data-url="https://www.udemy.com/"></div>':
+ def is_logged(webpage):
+ return any(p in webpage for p in ['href="https://www.udemy.com/user/logout/', '>Logout<'])
+
+ # already logged in
+ if is_logged(login_popup):
return
login_form = self._form_hidden_inputs('login-form', login_popup)
'password': password.encode('utf-8'),
})
- request = compat_urllib_request.Request(
+ request = sanitized_Request(
self._LOGIN_URL, compat_urllib_parse.urlencode(login_form).encode('utf-8'))
request.add_header('Referer', self._ORIGIN_URL)
request.add_header('Origin', self._ORIGIN_URL)
response = self._download_webpage(
request, None, 'Logging in as %s' % username)
- if all(logout_pattern not in response
- for logout_pattern in ['href="https://www.udemy.com/user/logout/', '>Logout<']):
+ if not is_logged(response):
error = self._html_search_regex(
r'(?s)<div[^>]+class="form-errors[^"]*">(.+?)</div>',
response, 'error message', default=None)
video_id = asset['id']
thumbnail = asset.get('thumbnailUrl') or asset.get('thumbnail_url')
- duration = asset['data']['duration']
+ duration = int_or_none(asset.get('data', {}).get('duration'))
download_url = asset.get('downloadUrl') or asset.get('download_url')
video = download_url.get('Video') or download_url.get('video')
video_480p = download_url.get('Video480p') or download_url.get('video_480p')
- formats = [
- {
- 'url': video_480p[0],
- 'format_id': '360p',
- },
- {
- 'url': video[0],
- 'format_id': '720p',
- },
- ]
+ formats = [{
+ 'url': video_480p[0],
+ 'format_id': 'download-360p',
+ }, {
+ 'url': video[0],
+ 'format_id': 'download-720p',
+ }]
+
+ # Some videos also contain formats in asset['data']['outputs'] (e.g.
+ # https://www.udemy.com/ios9-swift/learn/#/lecture/3383208)
+ outputs = asset.get('data', {}).get('outputs')
+ if isinstance(outputs, dict):
+ for format_id, f in outputs.items():
+ video_url = f.get('url')
+ if video_url:
+ formats.append({
+ 'url': video_url,
+ 'format_id': '%sp' % (f.get('labe1l') or format_id),
+ 'width': int_or_none(f.get('width')),
+ 'height': int_or_none(f.get('height')),
+ 'vbr': int_or_none(f.get('video_bitrate_in_kbps')),
+ 'vcodec': f.get('video_codec'),
+ 'fps': int_or_none(f.get('frame_rate')),
+ 'abr': int_or_none(f.get('audio_bitrate_in_kbps')),
+ 'acodec': f.get('audio_codec'),
+ 'asr': int_or_none(f.get('audio_sample_rate')),
+ 'tbr': int_or_none(f.get('total_bitrate_in_kbps')),
+ 'filesize': int_or_none(f.get('file_size_in_bytes')),
+ })
+
+ self._sort_formats(formats)
title = lecture['title']
- description = lecture['description']
+ description = lecture.get('description')
return {
'id': video_id,