Compare commits
4 Commits
2013.11.25
...
rtmp_test
Author | SHA1 | Date | |
---|---|---|---|
00b350d209 | |||
d8ec4959c8 | |||
d31209a144 | |||
529a2e2cc3 |
@ -3,6 +3,9 @@ python:
|
|||||||
- "2.6"
|
- "2.6"
|
||||||
- "2.7"
|
- "2.7"
|
||||||
- "3.3"
|
- "3.3"
|
||||||
|
before_install:
|
||||||
|
- sudo apt-get update -qq
|
||||||
|
- sudo apt-get install -qq rtmpdump
|
||||||
script: nosetests test --verbose
|
script: nosetests test --verbose
|
||||||
notifications:
|
notifications:
|
||||||
email:
|
email:
|
||||||
|
@ -126,7 +126,7 @@ class YoutubeDL(object):
|
|||||||
noplaylist: Download single video instead of a playlist if in doubt.
|
noplaylist: Download single video instead of a playlist if in doubt.
|
||||||
age_limit: An integer representing the user's age in years.
|
age_limit: An integer representing the user's age in years.
|
||||||
Unsuitable videos for the given age are skipped.
|
Unsuitable videos for the given age are skipped.
|
||||||
downloadarchive: File name of a file where all downloads are recorded.
|
download_archive: File name of a file where all downloads are recorded.
|
||||||
Videos already present in the file are not downloaded
|
Videos already present in the file are not downloaded
|
||||||
again.
|
again.
|
||||||
cookiefile: File name where cookies should be read from and dumped to.
|
cookiefile: File name where cookies should be read from and dumped to.
|
||||||
@ -837,7 +837,7 @@ class YoutubeDL(object):
|
|||||||
def _make_archive_id(self, info_dict):
|
def _make_archive_id(self, info_dict):
|
||||||
# Future-proof against any change in case
|
# Future-proof against any change in case
|
||||||
# and backwards compatibility with prior versions
|
# and backwards compatibility with prior versions
|
||||||
extractor = info_dict.get('extractor')
|
extractor = info_dict.get('extractor_key')
|
||||||
if extractor is None:
|
if extractor is None:
|
||||||
if 'id' in info_dict:
|
if 'id' in info_dict:
|
||||||
extractor = info_dict.get('ie_key') # key in a playlist
|
extractor = info_dict.get('ie_key') # key in a playlist
|
||||||
|
@ -12,27 +12,21 @@ class CinemassacreIE(InfoExtractor):
|
|||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
u'url': u'http://cinemassacre.com/2012/11/10/avgn-the-movie-trailer/',
|
u'url': u'http://cinemassacre.com/2012/11/10/avgn-the-movie-trailer/',
|
||||||
u'file': u'19911.flv',
|
u'file': u'19911.flv',
|
||||||
|
u'md5': u'f9bb7ede54d1229c9846e197b4737e06',
|
||||||
u'info_dict': {
|
u'info_dict': {
|
||||||
u'upload_date': u'20121110',
|
u'upload_date': u'20121110',
|
||||||
u'title': u'“Angry Video Game Nerd: The Movie” – Trailer',
|
u'title': u'“Angry Video Game Nerd: The Movie” – Trailer',
|
||||||
u'description': u'md5:fb87405fcb42a331742a0dce2708560b',
|
u'description': u'md5:fb87405fcb42a331742a0dce2708560b',
|
||||||
},
|
}
|
||||||
u'params': {
|
|
||||||
# rtmp download
|
|
||||||
u'skip_download': True,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
u'url': u'http://cinemassacre.com/2013/10/02/the-mummys-hand-1940',
|
u'url': u'http://cinemassacre.com/2013/10/02/the-mummys-hand-1940',
|
||||||
u'file': u'521be8ef82b16.flv',
|
u'file': u'521be8ef82b16.flv',
|
||||||
|
u'md5': u'9509ee44dcaa7c1068604817c19a9e50',
|
||||||
u'info_dict': {
|
u'info_dict': {
|
||||||
u'upload_date': u'20131002',
|
u'upload_date': u'20131002',
|
||||||
u'title': u'The Mummy’s Hand (1940)',
|
u'title': u'The Mummy’s Hand (1940)',
|
||||||
},
|
}
|
||||||
u'params': {
|
|
||||||
# rtmp download
|
|
||||||
u'skip_download': True,
|
|
||||||
},
|
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
|
@ -9,12 +9,10 @@ class VideoPremiumIE(InfoExtractor):
|
|||||||
_TEST = {
|
_TEST = {
|
||||||
u'url': u'http://videopremium.tv/4w7oadjsf156',
|
u'url': u'http://videopremium.tv/4w7oadjsf156',
|
||||||
u'file': u'4w7oadjsf156.f4v',
|
u'file': u'4w7oadjsf156.f4v',
|
||||||
|
u'md5': u'e51e4a266aab7531c6ac06f4ffee3b0d',
|
||||||
u'info_dict': {
|
u'info_dict': {
|
||||||
u"title": u"youtube-dl_test_video____a_________-BaW_jenozKc.mp4.mp4"
|
u"title": u"youtube-dl_test_video____a_________-BaW_jenozKc.mp4.mp4"
|
||||||
},
|
}
|
||||||
u'params': {
|
|
||||||
u'skip_download': True,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
|
Reference in New Issue
Block a user