[redtube] Add support for embed URLs
This commit is contained in:
		
							parent
							
								
									37e7a71c6c
								
							
						
					
					
						commit
						5021ca6c13
					
				@ -10,8 +10,8 @@ from ..utils import (
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class RedTubeIE(InfoExtractor):
 | 
					class RedTubeIE(InfoExtractor):
 | 
				
			||||||
    _VALID_URL = r'https?://(?:www\.)?redtube\.com/(?P<id>[0-9]+)'
 | 
					    _VALID_URL = r'https?://(?:(?:www\.)?redtube\.com/|embed\.redtube\.com/\?.*?\bid=)(?P<id>[0-9]+)'
 | 
				
			||||||
    _TEST = {
 | 
					    _TESTS = [{
 | 
				
			||||||
        'url': 'http://www.redtube.com/66418',
 | 
					        'url': 'http://www.redtube.com/66418',
 | 
				
			||||||
        'md5': '7b8c22b5e7098a3e1c09709df1126d2d',
 | 
					        'md5': '7b8c22b5e7098a3e1c09709df1126d2d',
 | 
				
			||||||
        'info_dict': {
 | 
					        'info_dict': {
 | 
				
			||||||
@ -23,11 +23,15 @@ class RedTubeIE(InfoExtractor):
 | 
				
			|||||||
            'view_count': int,
 | 
					            'view_count': int,
 | 
				
			||||||
            'age_limit': 18,
 | 
					            'age_limit': 18,
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }, {
 | 
				
			||||||
 | 
					        'url': 'http://embed.redtube.com/?bgcolor=000000&id=1443286',
 | 
				
			||||||
 | 
					        'only_matching': True,
 | 
				
			||||||
 | 
					    }]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _real_extract(self, url):
 | 
					    def _real_extract(self, url):
 | 
				
			||||||
        video_id = self._match_id(url)
 | 
					        video_id = self._match_id(url)
 | 
				
			||||||
        webpage = self._download_webpage(url, video_id)
 | 
					        webpage = self._download_webpage(
 | 
				
			||||||
 | 
					            'http://www.redtube.com/%s' % video_id, video_id)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if any(s in webpage for s in ['video-deleted-info', '>This video has been removed']):
 | 
					        if any(s in webpage for s in ['video-deleted-info', '>This video has been removed']):
 | 
				
			||||||
            raise ExtractorError('Video %s has been removed' % video_id, expected=True)
 | 
					            raise ExtractorError('Video %s has been removed' % video_id, expected=True)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user