[videolecturesnet] Improve playlist extraction

This commit is contained in:
Sergey M․ 2015-10-01 22:44:51 +06:00
parent 0c996b9f48
commit fb97809e64

View file

@ -3,8 +3,14 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_urlparse from ..compat import (
from ..utils import parse_duration compat_HTTPError,
compat_urlparse,
)
from ..utils import (
ExtractorError,
parse_duration,
)
class VideoLecturesNetIE(InfoExtractor): class VideoLecturesNetIE(InfoExtractor):
@ -28,10 +34,12 @@ class VideoLecturesNetIE(InfoExtractor):
video_id = self._match_id(url) video_id = self._match_id(url)
smil_url = 'http://videolectures.net/%s/video/1/smil.xml' % video_id smil_url = 'http://videolectures.net/%s/video/1/smil.xml' % video_id
smil = self._download_smil(smil_url, video_id, fatal=False)
try:
smil = self._download_smil(smil_url, video_id)
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 404:
# Probably a playlist # Probably a playlist
if smil is False:
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
entries = [ entries = [
self.url_result(compat_urlparse.urljoin(url, video_url), 'VideoLecturesNet') self.url_result(compat_urlparse.urljoin(url, video_url), 'VideoLecturesNet')