youtube-dl

commit 61224dbcdd46052b264e422cc45da907fb06fd42
parent c3afc93a69fbfbe7712278f7ad03d0369ac9f885
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Wed, 25 Dec 2013 15:33:09 +0100

[zdf] Make width extraction more robust

Diffstat:
M
youtube_dl/extractor/zdf.py
 | 
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py
@@ -1,10 +1,10 @@
 # coding: utf-8
 
-import operator
 import re
 
 from .common import InfoExtractor
 from ..utils import (
+    int_or_none,
     unified_strdate,
 )
 
@@ -67,7 +67,7 @@ class ZDFIE(InfoExtractor):
             ''', format_id)
 
             ext = format_m.group('container')
-            proto = format_m.group('proto')
+            proto = format_m.group('proto').lower()
 
             quality = fnode.find('./quality').text
             abr = int(fnode.find('./audioBitrate').text) // 1000
@@ -85,11 +85,11 @@ class ZDFIE(InfoExtractor):
                 'vcodec': format_m.group('vcodec'),
                 'abr': abr,
                 'vbr': vbr,
-                'width': int(fnode.find('./width').text),
-                'height': int(fnode.find('./height').text),
-                'filesize': int(fnode.find('./filesize').text),
+                'width': int_or_none(fnode.find('./width').text),
+                'height': int_or_none(fnode.find('./height').text),
+                'filesize': int_or_none(fnode.find('./filesize').text),
                 'format_note': format_note,
-                'protocol': format_m.group('proto').lower(),
+                'protocol': proto,
                 '_available': is_available,
             }