from ..utils import (
ExtractorError,
int_or_none,
+ xpath_element,
xpath_text,
)
'id': '36164052',
'ext': 'mp4',
'title': '데일리 에이프릴 요정들의 시상식!',
- 'thumbnail': 're:^https?://videoimg.afreecatv.com/.*$',
+ 'thumbnail': 're:^https?://(?:video|st)img.afreecatv.com/.*$',
'uploader': 'dailyapril',
'uploader_id': 'dailyapril',
'upload_date': '20160503',
'info_dict': {
'id': '36153164',
'title': "BJ유트루와 함께하는 '팅커벨 메이크업!'",
- 'thumbnail': 're:^https?://videoimg.afreecatv.com/.*$',
+ 'thumbnail': 're:^https?://(?:video|st)img.afreecatv.com/.*$',
'uploader': 'dailyapril',
'uploader_id': 'dailyapril',
},
'upload_date': '20160502',
},
}],
+ }, {
+ 'url': 'http://www.afreecatv.com/player/Player.swf?szType=szBjId=djleegoon&nStationNo=11273158&nBbsNo=13161095&nTitleNo=36327652',
+ 'only_matching': True,
}]
@staticmethod
path='/api/video/get_video_info.php'))
video_xml = self._download_xml(info_url, video_id)
- if xpath_text(video_xml, './track/flag', default='FAIL') != 'SUCCEED':
+ if xpath_element(video_xml, './track/video/file') is None:
raise ExtractorError('Specified AfreecaTV video does not exist',
expected=True)
+
title = xpath_text(video_xml, './track/title', 'title')
uploader = xpath_text(video_xml, './track/nickname', 'uploader')
uploader_id = xpath_text(video_xml, './track/bj_id', 'uploader id')
entries = []
for i, video_file in enumerate(video_xml.findall('./track/video/file')):
- video_key = self.parse_video_key(video_file.get('key'))
+ video_key = self.parse_video_key(video_file.get('key', ''))
+ if not video_key:
+ continue
entries.append({
'id': '%s_%s' % (video_id, video_key.get('part', i + 1)),
'title': title,
info['entries'] = entries
elif len(entries) == 1:
info['url'] = entries[0]['url']
- info['upload_date'] = entries[0]['upload_date']
+ info['upload_date'] = entries[0].get('upload_date')
else:
raise ExtractorError(
'No files found for the specified AfreecaTV video, either'