projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mfs] Modernize
[youtube-dl]
/
youtube_dl
/
extractor
/
empflix.py
diff --git
a/youtube_dl/extractor/empflix.py
b/youtube_dl/extractor/empflix.py
index 3c2289e5710d78b9f934ee2e578d9539d3cc267a..1c498d8c8fa0cc95a2963a19384201a42ec2fa4b 100644
(file)
--- 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
import re
from .common import InfoExtractor
+from ..utils import fix_xml_ampersands
class EmpflixIE(InfoExtractor):
class EmpflixIE(InfoExtractor):
@@
-35,20
+36,17
@@
class EmpflixIE(InfoExtractor):
r'flashvars\.config = escape\("([^"]+)"',
webpage, 'flashvars.config')
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 = [
{
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,
return {
'id': video_id,