fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[zdf] Modernize and PEP 8

This commit is contained in:
Sergey M․ 2015-10-19 01:48:05 +06:00
parent 334b5c3b72
commit 7b091c370c
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
youtube_dl/extractor/zdf.py
View File

@ -9,6 +9,7 @@ from ..utils import (
int_or_none, int_or_none,
unified_strdate, unified_strdate,
OnDemandPagedList, OnDemandPagedList,
xpath_text,
) )
@ -19,13 +20,11 @@ def extract_from_xml_url(ie, video_id, xml_url):
errnote='Failed to download video info') errnote='Failed to download video info')
title = doc.find('.//information/title').text title = doc.find('.//information/title').text
description = doc.find('.//information/detail').text description = xpath_text(doc, './/information/detail', 'description')
duration = int(doc.find('.//details/lengthSec').text) duration = int_or_none(xpath_text(doc, './/details/lengthSec', 'duration'))
uploader_node = doc.find('.//details/originChannelTitle') uploader = xpath_text(doc, './/details/originChannelTitle', 'uploader')
uploader = None if uploader_node is None else uploader_node.text uploader_id = xpath_text(doc, './/details/originChannelId', 'uploader id')
uploader_id_node = doc.find('.//details/originChannelId') upload_date = unified_strdate(xpath_text(doc, './/details/airtime', 'upload date'))
uploader_id = None if uploader_id_node is None else uploader_id_node.text
upload_date = unified_strdate(doc.find('.//details/airtime').text)
def xml_to_format(fnode): def xml_to_format(fnode):
video_url = fnode.find('url').text video_url = fnode.find('url').text
@ -40,15 +39,14 @@ def extract_from_xml_url(ie, video_id, xml_url):
ext = format_m.group('container') ext = format_m.group('container')
proto = format_m.group('proto').lower() proto = format_m.group('proto').lower()
quality = fnode.find('./quality').text quality = xpath_text(fnode, './quality', 'quality')
abr = int(fnode.find('./audioBitrate').text) // 1000 abr = int_or_none(xpath_text(fnode, './audioBitrate', 'abr'), 1000)
vbr_node = fnode.find('./videoBitrate') vbr = int_or_none(xpath_text(fnode, './videoBitrate', 'vbr'), 1000)
vbr = None if vbr_node is None else int(vbr_node.text) // 1000
width_node = fnode.find('./width') width = int_or_none(xpath_text(fnode, './width', 'width'))
width = None if width_node is None else int_or_none(width_node.text) height = int_or_none(xpath_text(fnode, './height', 'height'))
height_node = fnode.find('./height')
height = None if height_node is None else int_or_none(height_node.text) filesize = int_or_none(xpath_text(fnode, './filesize', 'filesize'))
format_note = '' format_note = ''
if not format_note: if not format_note:
@ -64,16 +62,21 @@ def extract_from_xml_url(ie, video_id, xml_url):
'vbr': vbr, 'vbr': vbr,
'width': width, 'width': width,
'height': height, 'height': height,
'filesize': int_or_none(fnode.find('./filesize').text), 'filesize': filesize,
'format_note': format_note, 'format_note': format_note,
'protocol': proto, 'protocol': proto,
'_available': is_available, '_available': is_available,
} }
def xml_to_thumbnails(fnode): def xml_to_thumbnails(fnode):
thumbnails = list() thumbnails = []
for node in fnode: for node in fnode:
thumbnail = {'url': node.text} thumbnail_url = node.text
if not thumbnail_url:
continue
thumbnail = {
'url': thumbnail_url,
}
if 'key' in node.attrib: if 'key' in node.attrib:
m = re.match('^([0-9]+)x([0-9]+)$', node.attrib['key']) m = re.match('^([0-9]+)x([0-9]+)$', node.attrib['key'])
if m: if m:
@ -82,9 +85,7 @@ def extract_from_xml_url(ie, video_id, xml_url):
thumbnails.append(thumbnail) thumbnails.append(thumbnail)
return thumbnails return thumbnails
thumbnails = xml_to_thumbnails(doc.findall('.//teaserimages/teaserimage'))
thumbnail_nodes = doc.findall('.//teaserimages/teaserimage')
thumbnails = xml_to_thumbnails(thumbnail_nodes)
format_nodes = doc.findall('.//formitaeten/formitaet') format_nodes = doc.findall('.//formitaeten/formitaet')
formats = list(filter( formats = list(filter(