projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'jtwaleson/master'
[youtube-dl]
/
youtube_dl
/
extractor
/
videofyme.py
diff --git
a/youtube_dl/extractor/videofyme.py
b/youtube_dl/extractor/videofyme.py
index 94f64ffa5aaba21ec4ca4470d6034352acbf411e..d69fe1e778c5e13eef89537ae7b87090b3dd55df 100644
(file)
--- a/
youtube_dl/extractor/videofyme.py
+++ b/
youtube_dl/extractor/videofyme.py
@@
-1,5
+1,4
@@
import re
import re
-import xml.etree.ElementTree
from .common import InfoExtractor
from ..utils import (
from .common import InfoExtractor
from ..utils import (
@@
-7,13
+6,14
@@
from ..utils import (
determine_ext,
)
determine_ext,
)
+
class VideofyMeIE(InfoExtractor):
class VideofyMeIE(InfoExtractor):
- _VALID_URL = r'https?://(www
.videofy.me/.+?|p.videofy
.me/v)/(?P<id>\d+)(&|#|$)'
+ _VALID_URL = r'https?://(www
\.videofy\.me/.+?|p\.videofy\
.me/v)/(?P<id>\d+)(&|#|$)'
IE_NAME = u'videofy.me'
_TEST = {
u'url': u'http://www.videofy.me/thisisvideofyme/1100701',
IE_NAME = u'videofy.me'
_TEST = {
u'url': u'http://www.videofy.me/thisisvideofyme/1100701',
- u'file':
u'1100701.mp4',
+ u'file': u'1100701.mp4',
u'md5': u'c77d700bdc16ae2e9f3c26019bd96143',
u'info_dict': {
u'title': u'This is VideofyMe',
u'md5': u'c77d700bdc16ae2e9f3c26019bd96143',
u'info_dict': {
u'title': u'This is VideofyMe',
@@
-21,18
+21,17
@@
class VideofyMeIE(InfoExtractor):
u'uploader': u'VideofyMe',
u'uploader_id': u'thisisvideofyme',
},
u'uploader': u'VideofyMe',
u'uploader_id': u'thisisvideofyme',
},
-
+
}
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
}
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
- config
_xml = self._download_webpage
('http://sunshine.videofy.me/?videoId=%s' % video_id,
+ config
= self._download_xml
('http://sunshine.videofy.me/?videoId=%s' % video_id,
video_id)
video_id)
- config = xml.etree.ElementTree.fromstring(config_xml.encode('utf-8'))
video = config.find('video')
sources = video.find('sources')
video = config.find('video')
sources = video.find('sources')
- url_node = next(node for node in [find_xpath_attr(sources, 'source', 'id', 'HQ %s' % key)
+ url_node = next(node for node in [find_xpath_attr(sources, 'source', 'id', 'HQ %s' % key)
for key in ['on', 'av', 'off']] if node is not None)
video_url = url_node.find('url').text
for key in ['on', 'av', 'off']] if node is not None)
video_url = url_node.find('url').text