Browse Source

check video_play_path and use xpath_text

"This check should take place earlier and should be more general if not video_url:. Same should be done for video_play_path. Also these fields better extracted with xpath_text."

Suggestions by @dstftw
totalwebcasting
oittaa 9 years ago
committed by Sergey M․
parent
commit
e4f49a8753
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      youtube_dl/extractor/crunchyroll.py

+ 4
- 2
youtube_dl/extractor/crunchyroll.py View File

@ -329,8 +329,10 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
streamdata_req, video_id, streamdata_req, video_id,
note='Downloading media info for %s' % video_format) note='Downloading media info for %s' % video_format)
stream_info = streamdata.find('./{default}preload/stream_info') stream_info = streamdata.find('./{default}preload/stream_info')
video_url = stream_info.find('./host').text
video_play_path = stream_info.find('./file').text
video_url = xpath_text(stream_info, './host')
video_play_path = xpath_text(stream_info, './file')
if not video_url or not video_play_path:
continue
metadata = stream_info.find('./metadata') metadata = stream_info.find('./metadata')
format_info = { format_info = {
'format': video_format, 'format': video_format,


Loading…
Cancel
Save