Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use xpath_text

pull/9395/head
Peter Rowlands 2016-05-06 01:24:02 +09:00
parent 57cf9b7f06
commit 833b644fff
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
youtube_dl/extractor/afreecatv.py
View File

@ -9,6 +9,7 @@ from ..compat import (
from ..utils import (
ExtractorError,
int_or_none,
xpath_text,
)
@ -41,25 +42,24 @@ class AfreecaTVIE(InfoExtractor):
path='/api/video/get_video_info.php'))
video_xml = self._download_xml(info_url, video_id)
track = video_xml.find('track')
if track.find('flag').text != 'SUCCEED':
if xpath_text(video_xml, './track/flag', default='FAIL') != 'SUCCEED':
raise ExtractorError('Specified AfreecaTV video does not exist',
expected=True)
title = track.find('title').text
uploader = track.find('nickname').text
uploader_id = track.find('bj_id').text
duration = int_or_none(track.find('duration').text)
thumbnail = track.find('titleImage').text
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')
duration = int_or_none(xpath_text(video_xml, './track/duration',
'duration'))
thumbnail = xpath_text(video_xml, './track/titleImage', 'thumbnail')
entries = []
for video in track.findall('video'):
for video_file in video.findall('file'):
entries.append({
'id': video_file.get('key'),
'title': title,
'duration': int_or_none(video_file.get('duration')),
'formats': [{'url': video_file.text}]
})
for video_file in video_xml.findall('./track/video/file'):
entries.append({
'id': video_file.get('key'),
'title': title,
'duration': int_or_none(video_file.get('duration')),
'formats': [{'url': video_file.text}]
})
info = {
'id': video_id,