diff options
| author | Ismael Mejia <iemejia@gmail.com> | 2013-08-23 01:47:10 +0200 |
|---|---|---|
| committer | Ismael Mejia <iemejia@gmail.com> | 2013-08-23 01:47:10 +0200 |
| commit | bd2dee6c67b837bdebdd28d10d9586129021330e (patch) | |
| tree | dd4d015fa68451cf8892534c41c3d4cd18f59405 /youtube_dl | |
| parent | 18b4e04f1c663e0ea695f6501b860f85af9d7ca1 (diff) | |
| parent | 74e6672beb23ca372a06431ad17a9d79cda6382e (diff) | |
| download | youtube-dl-bd2dee6c67b837bdebdd28d10d9586129021330e.tar.xz | |
Merge branch 'master' into subtitles_rework
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/videofyme.py | 7 | ||||
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 2 | ||||
| -rw-r--r-- | youtube_dl/version.py | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/youtube_dl/extractor/videofyme.py b/youtube_dl/extractor/videofyme.py index 04106672b..94f64ffa5 100644 --- a/youtube_dl/extractor/videofyme.py +++ b/youtube_dl/extractor/videofyme.py @@ -14,7 +14,7 @@ class VideofyMeIE(InfoExtractor): _TEST = { u'url': u'http://www.videofy.me/thisisvideofyme/1100701', u'file': u'1100701.mp4', - u'md5': u'2046dd5758541d630bfa93e741e2fd79', + u'md5': u'c77d700bdc16ae2e9f3c26019bd96143', u'info_dict': { u'title': u'This is VideofyMe', u'description': None, @@ -32,9 +32,8 @@ class VideofyMeIE(InfoExtractor): config = xml.etree.ElementTree.fromstring(config_xml.encode('utf-8')) video = config.find('video') sources = video.find('sources') - url_node = find_xpath_attr(sources, 'source', 'id', 'HQ on') - if url_node is None: - url_node = find_xpath_attr(sources, 'source', 'id', 'HQ off') + 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 return {'id': video_id, diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index f6ffb86c3..571c73889 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -372,7 +372,7 @@ class YoutubeIE(YoutubeSubtitlesIE): elif len(s) == 83: return s[81:64:-1] + s[82] + s[63:52:-1] + s[45] + s[51:45:-1] + s[1] + s[44:1:-1] + s[0] elif len(s) == 82: - return s[36] + s[79:67:-1] + s[81] + s[66:40:-1] + s[33] + s[39:36:-1] + s[40] + s[35] + s[0] + s[67] + s[32:0:-1] + s[34] + return s[1:19] + s[0] + s[20:68] + s[19] + s[69:82] elif len(s) == 81: return s[56] + s[79:56:-1] + s[41] + s[55:41:-1] + s[80] + s[40:34:-1] + s[0] + s[33:29:-1] + s[34] + s[28:9:-1] + s[29] + s[8:0:-1] + s[9] elif len(s) == 79: diff --git a/youtube_dl/version.py b/youtube_dl/version.py index 58e26bc49..3536e923f 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,2 +1,2 @@ -__version__ = '2013.08.21' +__version__ = '2013.08.22' |