aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/empflix.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/youtube_dl/extractor/empflix.py b/youtube_dl/extractor/empflix.py
index 3c2289e57..1c498d8c8 100644
--- a/youtube_dl/extractor/empflix.py
+++ b/youtube_dl/extractor/empflix.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
import re
from .common import InfoExtractor
+from ..utils import fix_xml_ampersands
class EmpflixIE(InfoExtractor):
@@ -35,20 +36,17 @@ class EmpflixIE(InfoExtractor):
r'flashvars\.config = escape\("([^"]+)"',
webpage, 'flashvars.config')
- # XML is malformed
- cfg_xml = self._download_webpage(
- cfg_url, video_id, note='Downloading metadata')
+ cfg_xml = self._download_xml(
+ cfg_url, video_id, note='Downloading metadata',
+ transform_source=fix_xml_ampersands)
formats = [
{
- 'url': item[1],
- 'format_id': item[0],
- } for item in re.findall(
- r'<item>\s*<res>([^>]+)</res>\s*<videoLink>([^<]+)</videoLink>\s*</item>', cfg_xml)
+ 'url': item.find('videoLink').text,
+ 'format_id': item.find('res').text,
+ } for item in cfg_xml.findall('./quality/item')
]
-
- thumbnail = self._html_search_regex(
- r'<startThumb>([^<]+)</startThumb>', cfg_xml, 'thumbnail', fatal=False)
+ thumbnail = cfg_xml.find('./startThumb').text
return {
'id': video_id,