[vk] Add login feature (Closes #2206)
This commit is contained in:
		
							parent
							
								
									00cf938aa5
								
							
						
					
					
						commit
						9032dc28a6
					
				| @ -6,6 +6,9 @@ import json | ||||
| 
 | ||||
| from .common import InfoExtractor | ||||
| from ..utils import ( | ||||
|     ExtractorError, | ||||
|     compat_urllib_request, | ||||
|     compat_urllib_parse, | ||||
|     compat_str, | ||||
|     unescapeHTML, | ||||
| ) | ||||
| @ -15,30 +18,78 @@ class VKIE(InfoExtractor): | ||||
|     IE_NAME = 'vk.com' | ||||
|     _VALID_URL = r'https?://vk\.com/(?:videos.*?\?.*?z=)?video(?P<id>.*?)(?:\?|%2F|$)' | ||||
| 
 | ||||
|     _TESTS = [{ | ||||
|         'url': 'http://vk.com/videos-77521?z=video-77521_162222515%2Fclub77521', | ||||
|         'file': '162222515.flv', | ||||
|         'md5': '0deae91935c54e00003c2a00646315f0', | ||||
|         'info_dict': { | ||||
|             'title': 'ProtivoGunz - Хуёвая песня', | ||||
|             'uploader': 'Noize MC', | ||||
|     _TESTS = [ | ||||
|         { | ||||
|             'url': 'http://vk.com/videos-77521?z=video-77521_162222515%2Fclub77521', | ||||
|             'md5': '0deae91935c54e00003c2a00646315f0', | ||||
|             'info_dict': { | ||||
|                 'id': '162222515', | ||||
|                 'ext': 'flv', | ||||
|                 'title': 'ProtivoGunz - Хуёвая песня', | ||||
|                 'uploader': 'Noize MC', | ||||
|                 'duration': 195, | ||||
|             }, | ||||
|         }, | ||||
|     }, | ||||
|     { | ||||
|         'url': 'http://vk.com/video4643923_163339118', | ||||
|         'file': '163339118.mp4', | ||||
|         'md5': 'f79bccb5cd182b1f43502ca5685b2b36', | ||||
|         'info_dict': { | ||||
|             'uploader': 'Elvira Dzhonik', | ||||
|             'title': 'Dream Theater - Hollow Years Live at Budokan 720*', | ||||
|         { | ||||
|             'url': 'http://vk.com/video4643923_163339118', | ||||
|             'md5': 'f79bccb5cd182b1f43502ca5685b2b36', | ||||
|             'info_dict': { | ||||
|                 'id': '163339118', | ||||
|                 'ext': 'mp4', | ||||
|                 'uploader': 'Elvira Dzhonik', | ||||
|                 'title': 'Dream Theater - Hollow Years Live at Budokan 720*', | ||||
|                 'duration': 558, | ||||
|             } | ||||
|         }, | ||||
|         { | ||||
|             'url': 'http://vk.com/video-8871596_164049491', | ||||
|             'md5': 'a590bcaf3d543576c9bd162812387666', | ||||
|             'note': 'Only available for registered users', | ||||
|             'info_dict': { | ||||
|                 'id': '164049491', | ||||
|                 'ext': 'mp4', | ||||
|                 'uploader': 'Триллеры', | ||||
|                 'title': '► Бойцовский клуб / Fight Club 1999 [HD 720]\u00a0', | ||||
|                 'duration': 8352, | ||||
|             }, | ||||
|             'skip': 'Requires vk account credentials', | ||||
|         } | ||||
|     }] | ||||
|     ] | ||||
| 
 | ||||
|     def _login(self): | ||||
|         (username, password) = self._get_login_info() | ||||
|         if username is None: | ||||
|             return | ||||
| 
 | ||||
|         login_form = { | ||||
|             'act': 'login', | ||||
|             'role': 'al_frame', | ||||
|             'expire': '1', | ||||
|             'email': username, | ||||
|             'pass': password, | ||||
|         } | ||||
| 
 | ||||
|         request = compat_urllib_request.Request('https://login.vk.com/?act=login', | ||||
|             compat_urllib_parse.urlencode(login_form).encode('utf-8')) | ||||
|         login_page = self._download_webpage(request, None, note='Logging in as %s' % username) | ||||
| 
 | ||||
|         if re.search(r'onLoginFailed', login_page): | ||||
|             raise ExtractorError('Unable to login, incorrect username and/or password', expected=True) | ||||
| 
 | ||||
|     def _real_initialize(self): | ||||
|         self._login() | ||||
| 
 | ||||
|     def _real_extract(self, url): | ||||
|         mobj = re.match(self._VALID_URL, url) | ||||
|         video_id = mobj.group('id') | ||||
| 
 | ||||
|         info_url = 'http://vk.com/al_video.php?act=show&al=1&video=%s' % video_id | ||||
|         info_page = self._download_webpage(info_url, video_id) | ||||
| 
 | ||||
|         if re.search(r'<!>Please log in or <', info_page): | ||||
|             raise ExtractorError('This video is only available for registered users, ' | ||||
|                 'use --username and --password options to provide account credentials.', expected=True) | ||||
| 
 | ||||
|         m_yt = re.search(r'src="(http://www.youtube.com/.*?)"', info_page) | ||||
|         if m_yt is not None: | ||||
|             self.to_screen(u'Youtube video detected') | ||||
| @ -60,4 +111,5 @@ class VKIE(InfoExtractor): | ||||
|             'title': unescapeHTML(data['md_title']), | ||||
|             'thumbnail': data.get('jpg'), | ||||
|             'uploader': data.get('md_author'), | ||||
|             'duration': data.get('duration') | ||||
|         } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user