From: Sergey M․ <dstftw@gmail.com>
Date: Tue, 26 Aug 2014 13:07:28 +0000 (+0700)
Subject: [empflix] Adapt to malformed config XML
X-Git-Tag: 2014.08.26~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c7bee2a7254d31b7c478c0ac33bf23bdeba1c53c;p=youtube-dl.git

[empflix] Adapt to malformed config XML
---

diff --git a/youtube_dl/extractor/empflix.py b/youtube_dl/extractor/empflix.py
index e6952588fb..1290cd9f70 100644
--- a/youtube_dl/extractor/empflix.py
+++ b/youtube_dl/extractor/empflix.py
@@ -35,14 +35,16 @@ class EmpflixIE(InfoExtractor):
             r'flashvars\.config = escape\("([^"]+)"',
             webpage, 'flashvars.config')
 
-        cfg_xml = self._download_xml(
+        # XML is malformed
+        cfg_xml = self._download_webpage(
             cfg_url, video_id, note='Downloading metadata')
 
         formats = [
             {
-                'url': item.find('videoLink').text,
-                'format_id': item.find('res').text,
-            } for item in cfg_xml.findall('./quality/item')
+                'url': item[1],
+                'format_id': item[0],
+            } for item in re.findall(
+                r'<item>\s*<res>([^>]+)</res>\s*<videoLink>([^<]+)</videoLink>\s*</item>', cfg_xml)
         ]
 
         return {