projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unnecessary assignment parenthesis
[youtube-dl]
/
youtube_dl
/
extractor
/
vk.py
diff --git
a/youtube_dl/extractor/vk.py
b/youtube_dl/extractor/vk.py
index 105e172d539d4376e4534df31266c489f3d62518..29002b35fc08469c0d39a73cdec2c812869c1c21 100644
(file)
--- a/
youtube_dl/extractor/vk.py
+++ b/
youtube_dl/extractor/vk.py
@@
-32,7
+32,7
@@
class VKBaseIE(InfoExtractor):
_NETRC_MACHINE = 'vk'
def _login(self):
_NETRC_MACHINE = 'vk'
def _login(self):
-
(username, password)
= self._get_login_info()
+
username, password
= self._get_login_info()
if username is None:
return
if username is None:
return
@@
-67,7
+67,7
@@
class VKBaseIE(InfoExtractor):
login_page = self._download_webpage(
'https://login.vk.com/?act=login', None,
login_page = self._download_webpage(
'https://login.vk.com/?act=login', None,
- note='Logging in
as %s' % username
,
+ note='Logging in
'
,
data=urlencode_postdata(login_form))
if re.search(r'onLoginFailed', login_page):
data=urlencode_postdata(login_form))
if re.search(r'onLoginFailed', login_page):
@@
-99,10
+99,10
@@
class VKIE(VKBaseIE):
_TESTS = [
{
'url': 'http://vk.com/videos-77521?z=video-77521_162222515%2Fclub77521',
_TESTS = [
{
'url': 'http://vk.com/videos-77521?z=video-77521_162222515%2Fclub77521',
- 'md5': '
0deae91935c54e00003c2a00646315f0
',
+ 'md5': '
7babad3b85ea2e91948005b1b8b0cb84
',
'info_dict': {
'id': '162222515',
'info_dict': {
'id': '162222515',
- 'ext': '
flv
',
+ 'ext': '
mp4
',
'title': 'ProtivoGunz - Хуёвая песня',
'uploader': 're:(?:Noize MC|Alexander Ilyashenko).*',
'duration': 195,
'title': 'ProtivoGunz - Хуёвая песня',
'uploader': 're:(?:Noize MC|Alexander Ilyashenko).*',
'duration': 195,
@@
-318,9
+318,14
@@
class VKIE(VKBaseIE):
'You are trying to log in from an unusual location. You should confirm ownership at vk.com to log in with this IP.',
expected=True)
'You are trying to log in from an unusual location. You should confirm ownership at vk.com to log in with this IP.',
expected=True)
+ ERROR_COPYRIGHT = 'Video %s has been removed from public access due to rightholder complaint.'
+
ERRORS = {
r'>Видеозапись .*? была изъята из публичного доступа в связи с обращением правообладателя.<':
ERRORS = {
r'>Видеозапись .*? была изъята из публичного доступа в связи с обращением правообладателя.<':
- 'Video %s has been removed from public access due to rightholder complaint.',
+ ERROR_COPYRIGHT,
+
+ r'>The video .*? was removed from public access by request of the copyright holder.<':
+ ERROR_COPYRIGHT,
r'<!>Please log in or <':
'Video %s is only available for registered users, '
r'<!>Please log in or <':
'Video %s is only available for registered users, '
@@
-414,7
+419,7
@@
class VKIE(VKBaseIE):
view_count = str_to_int(self._search_regex(
r'class=["\']mv_views_count[^>]+>\s*([\d,.]+)',
view_count = str_to_int(self._search_regex(
r'class=["\']mv_views_count[^>]+>\s*([\d,.]+)',
- info_page, 'view count',
fatal=Fals
e))
+ info_page, 'view count',
default=Non
e))
formats = []
for format_id, format_url in data.items():
formats = []
for format_id, format_url in data.items():