X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fbild.py;h=b8dfbd42b429beb8f530076b1efdee571ec4d855;hb=HEAD;hp=3a822a5c0afd695766ffa21c168cecec2d1eca78;hpb=ce519b747e1e404f6d15ae68e1b1607a27beff1c;p=youtube-dl

diff --git a/youtube_dl/extractor/bild.py b/youtube_dl/extractor/bild.py
index 3a822a5c0..b8dfbd42b 100644
--- a/youtube_dl/extractor/bild.py
+++ b/youtube_dl/extractor/bild.py
@@ -1,46 +1,40 @@
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-
-
-class BildIE(InfoExtractor):
-    IE_NAME = 'bild'
-    _TEST = {
-        'url': 'http://www.bild.de/video/clip/apple-ipad-air/das-koennen-die-neuen-ipads-38184146.bild.html',
-        'info_dict': {
-            'id': '38184146',
-            'title': 'BILD hat sie getestet',
-            'thumbnail': 'http://bilder.bild.de/fotos/stand-das-koennen-die-neuen-ipads-38184138/Bild/1.bild.jpg',
-            'duration': 196,
-        }
-    }
-    
-    #http://www.bild.de/video/clip/apple-ipad-air/das-koennen-die-neuen-ipads-38184146.bild.html
-    _VALID_URL = r'http?://(?:www\.)?bild\.de/(?:[^/]+/)+(?P<display_id>[^/]+)-(?P<id>\d+)(?:,auto=true)?\.bild\.html'
-    
-    def _real_extract(self, url):
-        m = re.match(self._VALID_URL, url)
-        video_id = m.group('id')
-        
-        #webpage = self._download_webpage(url, video_id)
-        
-        xml_url = url.split(".bild.html")[0]+",view=xml.bild.xml"
-        
-        doc = self._download_xml(xml_url, video_id)
-        
-        video_url = doc.attrib['src']
-        title = doc.attrib['ueberschrift']
-        description = doc.attrib['text']
-        thumbnail = doc.attrib['img']
-        duration = int(doc.attrib['duration'])/1000
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'url': video_url,
-            'thumbnail': thumbnail,
-            'duration': duration,
-        }
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+from ..utils import (
+    int_or_none,
+    unescapeHTML,
+)
+
+
+class BildIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?bild\.de/(?:[^/]+/)+(?P<display_id>[^/]+)-(?P<id>\d+)(?:,auto=true)?\.bild\.html'
+    IE_DESC = 'Bild.de'
+    _TEST = {
+        'url': 'http://www.bild.de/video/clip/apple-ipad-air/das-koennen-die-neuen-ipads-38184146.bild.html',
+        'md5': 'dd495cbd99f2413502a1713a1156ac8a',
+        'info_dict': {
+            'id': '38184146',
+            'ext': 'mp4',
+            'title': 'Das können die  neuen iPads',
+            'description': 'md5:a4058c4fa2a804ab59c00d7244bbf62f',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 196,
+        }
+    }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        video_data = self._download_json(
+            url.split('.bild.html')[0] + ',view=json.bild.html', video_id)
+
+        return {
+            'id': video_id,
+            'title': unescapeHTML(video_data['title']).strip(),
+            'description': unescapeHTML(video_data.get('description')),
+            'url': video_data['clipList'][0]['srces'][0]['src'],
+            'thumbnail': video_data.get('poster'),
+            'duration': int_or_none(video_data.get('durationSec')),
+        }