diff options
Diffstat (limited to 'youtube_dl/extractor/veoh.py')
| -rw-r--r-- | youtube_dl/extractor/veoh.py | 73 | 
1 files changed, 36 insertions, 37 deletions
| diff --git a/youtube_dl/extractor/veoh.py b/youtube_dl/extractor/veoh.py index 0f5d68738..b20dddc5c 100644 --- a/youtube_dl/extractor/veoh.py +++ b/youtube_dl/extractor/veoh.py @@ -12,47 +12,46 @@ from ..utils import (  class VeohIE(InfoExtractor): -    _VALID_URL = r'https?://(?:www\.)?veoh\.com/(?:watch|iphone/#_Watch)/(?P<id>(?:v|yapi-)[\da-zA-Z]+)' +    _VALID_URL = r'https?://(?:www\.)?veoh\.com/(?:watch|iphone/#_Watch)/(?P<id>(?:v|e|yapi-)[\da-zA-Z]+)' -    _TESTS = [ -        { -            'url': 'http://www.veoh.com/watch/v56314296nk7Zdmz3', -            'md5': '620e68e6a3cff80086df3348426c9ca3', -            'info_dict': { -                'id': '56314296', -                'ext': 'mp4', -                'title': 'Straight Backs Are Stronger', -                'uploader': 'LUMOback', -                'description': 'At LUMOback, we believe straight backs are stronger.  The LUMOback Posture & Movement Sensor:  It gently vibrates when you slouch, inspiring improved posture and mobility.  Use the app to track your data and improve your posture over time. ', -            }, +    _TESTS = [{ +        'url': 'http://www.veoh.com/watch/v56314296nk7Zdmz3', +        'md5': '620e68e6a3cff80086df3348426c9ca3', +        'info_dict': { +            'id': '56314296', +            'ext': 'mp4', +            'title': 'Straight Backs Are Stronger', +            'uploader': 'LUMOback', +            'description': 'At LUMOback, we believe straight backs are stronger.  The LUMOback Posture & Movement Sensor:  It gently vibrates when you slouch, inspiring improved posture and mobility.  Use the app to track your data and improve your posture over time. ',          }, -        { -            'url': 'http://www.veoh.com/watch/v27701988pbTc4wzN?h1=Chile+workers+cover+up+to+avoid+skin+damage', -            'md5': '4a6ff84b87d536a6a71e6aa6c0ad07fa', -            'info_dict': { -                'id': '27701988', -                'ext': 'mp4', -                'title': 'Chile workers cover up to avoid skin damage', -                'description': 'md5:2bd151625a60a32822873efc246ba20d', -                'uploader': 'afp-news', -                'duration': 123, -            }, -            'skip': 'This video has been deleted.', +    }, { +        'url': 'http://www.veoh.com/watch/v27701988pbTc4wzN?h1=Chile+workers+cover+up+to+avoid+skin+damage', +        'md5': '4a6ff84b87d536a6a71e6aa6c0ad07fa', +        'info_dict': { +            'id': '27701988', +            'ext': 'mp4', +            'title': 'Chile workers cover up to avoid skin damage', +            'description': 'md5:2bd151625a60a32822873efc246ba20d', +            'uploader': 'afp-news', +            'duration': 123,          }, -        { -            'url': 'http://www.veoh.com/watch/v69525809F6Nc4frX', -            'md5': '4fde7b9e33577bab2f2f8f260e30e979', -            'note': 'Embedded ooyala video', -            'info_dict': { -                'id': '69525809', -                'ext': 'mp4', -                'title': 'Doctors Alter Plan For Preteen\'s Weight Loss Surgery', -                'description': 'md5:f5a11c51f8fb51d2315bca0937526891', -                'uploader': 'newsy-videos', -            }, -            'skip': 'This video has been deleted.', +        'skip': 'This video has been deleted.', +    }, { +        'url': 'http://www.veoh.com/watch/v69525809F6Nc4frX', +        'md5': '4fde7b9e33577bab2f2f8f260e30e979', +        'note': 'Embedded ooyala video', +        'info_dict': { +            'id': '69525809', +            'ext': 'mp4', +            'title': 'Doctors Alter Plan For Preteen\'s Weight Loss Surgery', +            'description': 'md5:f5a11c51f8fb51d2315bca0937526891', +            'uploader': 'newsy-videos',          }, -    ] +        'skip': 'This video has been deleted.', +    }, { +        'url': 'http://www.veoh.com/watch/e152215AJxZktGS', +        'only_matching': True, +    }]      def _extract_formats(self, source):          formats = [] | 
