Merge branch 'master' of https://github.com/rg3/youtube-dl into bilibili

[youtube-dl] / youtube_dl / extractor / bilibili.py

diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py
index e00efb6eb0a1e4671f900e1e9bb4b0da144609aa..1c3644587f6f49e73f9bd26fcb187d09c60c3e91 100644 (file)
--- a/youtube_dl/extractor/bilibili.py
+++ b/youtube_dl/extractor/bilibili.py
@@ -3,9 +3,11 @@ from __future__ import unicode_literals
 
 import re
 import json
-import xml.etree.ElementTree as ET
 
 from .common import InfoExtractor
+from ..compat import (
+    compat_etree_fromstring,
+)
 from ..utils import (
     int_or_none,
     unescapeHTML,
@@ -68,22 +70,23 @@ class BiliBiliIE(InfoExtractor):
         except ValueError:
             pass
 
-        doc = ET.fromstring(page)
-        durls = doc.findall('./durl')
+        doc = compat_etree_fromstring(page)
 
         entries = []
 
-        for durl in durls:
-            formats = []
-            backup_url = durl.find('./backup_url')
-            if backup_url is not None:
-                formats.append({'url': backup_url.find('./url').text})
+        for durl in doc.findall('./durl'):
             size = durl.find('./filesize|./size')
-            formats.append({
+            formats = [{
                 'url': durl.find('./url').text,
                 'filesize': int_or_none(size.text) if size else None,
                 'ext': 'flv',
-            })
+            }]
+            backup_urls = durl.find('./backup_url')
+            if backup_urls is not None:
+                for backup_url in backup_urls.findall('./url'):
+                    formats.append({'url': backup_url.text})
+            formats.reverse()
+
             entries.append({
                 'id': '%s_part%s' % (cid, durl.find('./order').text),
                 'title': title,