projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[drtv] Improve extraction (closes #19039)
[youtube-dl]
/
youtube_dl
/
extractor
/
vk.py
diff --git
a/youtube_dl/extractor/vk.py
b/youtube_dl/extractor/vk.py
index d4838b3e5f59410c7e3db3b99823261d51350925..b52d15ac6f0709dce8a60c2f42d690b49a56d391 100644
(file)
--- a/
youtube_dl/extractor/vk.py
+++ b/
youtube_dl/extractor/vk.py
@@
-17,9
+17,11
@@
from ..utils import (
int_or_none,
orderedSet,
remove_start,
int_or_none,
orderedSet,
remove_start,
+ str_or_none,
str_to_int,
unescapeHTML,
unified_timestamp,
str_to_int,
unescapeHTML,
unified_timestamp,
+ url_or_none,
urlencode_postdata,
)
from .dailymotion import DailymotionIE
urlencode_postdata,
)
from .dailymotion import DailymotionIE
@@
-32,7
+34,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
@@
-99,16
+101,16
@@
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).*',
'title': 'ProtivoGunz - Хуёвая песня',
'uploader': 're:(?:Noize MC|Alexander Ilyashenko).*',
+ 'uploader_id': '-77521',
'duration': 195,
'duration': 195,
- 'timestamp': 13290
6066
0,
+ 'timestamp': 13290
4988
0,
'upload_date': '20120212',
'upload_date': '20120212',
- 'view_count': int,
},
},
{
},
},
{
@@
-117,12
+119,12
@@
class VKIE(VKBaseIE):
'info_dict': {
'id': '165548505',
'ext': 'mp4',
'info_dict': {
'id': '165548505',
'ext': 'mp4',
- 'uploader': 'Tom Cruise',
'title': 'No name',
'title': 'No name',
+ 'uploader': 'Tom Cruise',
+ 'uploader_id': '205387401',
'duration': 9,
'duration': 9,
- 'timestamp': 1374374880,
- 'upload_date': '20130721',
- 'view_count': int,
+ 'timestamp': 1374364108,
+ 'upload_date': '20130720',
}
},
{
}
},
{
@@
-206,10
+208,10
@@
class VKIE(VKBaseIE):
'id': 'V3K4mi0SYkc',
'ext': 'webm',
'title': "DSWD Awards 'Children's Joy Foundation, Inc.' Certificate of Registration and License to Operate",
'id': 'V3K4mi0SYkc',
'ext': 'webm',
'title': "DSWD Awards 'Children's Joy Foundation, Inc.' Certificate of Registration and License to Operate",
- 'description': 'md5:
d9903938abdc74c738af77f527ca0596
',
- 'duration': 17
8
,
+ 'description': 'md5:
bf9c26cfa4acdfb146362682edd3827a
',
+ 'duration': 17
9
,
'upload_date': '20130116',
'upload_date': '20130116',
- 'uploader': "Children's Joy Foundation",
+ 'uploader': "Children's Joy Foundation
Inc.
",
'uploader_id': 'thecjf',
'view_count': int,
},
'uploader_id': 'thecjf',
'view_count': int,
},
@@
-221,6
+223,7
@@
class VKIE(VKBaseIE):
'id': 'k3lz2cmXyRuJQSjGHUv',
'ext': 'mp4',
'title': 'md5:d52606645c20b0ddbb21655adaa4f56f',
'id': 'k3lz2cmXyRuJQSjGHUv',
'ext': 'mp4',
'title': 'md5:d52606645c20b0ddbb21655adaa4f56f',
+ # TODO: fix test by fixing dailymotion description extraction
'description': 'md5:c651358f03c56f1150b555c26d90a0fd',
'uploader': 'AniLibria.Tv',
'upload_date': '20160914',
'description': 'md5:c651358f03c56f1150b555c26d90a0fd',
'uploader': 'AniLibria.Tv',
'upload_date': '20160914',
@@
-240,9
+243,12
@@
class VKIE(VKBaseIE):
'ext': 'mp4',
'title': 'S-Dance, репетиции к The way show',
'uploader': 'THE WAY SHOW | 17 апреля',
'ext': 'mp4',
'title': 'S-Dance, репетиции к The way show',
'uploader': 'THE WAY SHOW | 17 апреля',
- 'timestamp': 1454870100,
+ 'uploader_id': '-110305615',
+ 'timestamp': 1454859345,
'upload_date': '20160207',
'upload_date': '20160207',
- 'view_count': int,
+ },
+ 'params': {
+ 'skip_download': True,
},
},
{
},
},
{
@@
-287,15
+293,19
@@
class VKIE(VKBaseIE):
# This video is no longer available, because its author has been blocked.
'url': 'https://vk.com/video-10639516_456240611',
'only_matching': True,
# This video is no longer available, because its author has been blocked.
'url': 'https://vk.com/video-10639516_456240611',
'only_matching': True,
- }
- ]
+ },
+ {
+ # The video is not available in your region.
+ 'url': 'https://vk.com/video-51812607_171445436',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('videoid')
if video_id:
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('videoid')
if video_id:
- info_url = 'https://vk.com/al_video.php?act=show
&al=1&module=video&video=%s' %
video_id
+ info_url = 'https://vk.com/al_video.php?act=show
_inline&al=1&video=' +
video_id
# Some videos (removed?) can only be downloaded with list id specified
list_id = mobj.group('list_id')
if list_id:
# Some videos (removed?) can only be downloaded with list id specified
list_id = mobj.group('list_id')
if list_id:
@@
-318,9
+328,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, '
@@
-340,6
+355,12
@@
class VKIE(VKBaseIE):
r'<!>This video is no longer available, because its author has been blocked.':
'Video %s is no longer available, because its author has been blocked.',
r'<!>This video is no longer available, because its author has been blocked.':
'Video %s is no longer available, because its author has been blocked.',
+
+ r'<!>This video is no longer available, because it has been deleted.':
+ 'Video %s is no longer available, because it has been deleted.',
+
+ r'<!>The video .+? is not available in your region.':
+ 'Video %s is not available in your region.',
}
for error_re, error_msg in ERRORS.items():
}
for error_re, error_msg in ERRORS.items():
@@
-388,7
+409,8
@@
class VKIE(VKBaseIE):
if not data:
data = self._parse_json(
self._search_regex(
if not data:
data = self._parse_json(
self._search_regex(
- r'<!json>\s*({.+?})\s*<!>', info_page, 'json', default='{}'),
+ [r'<!json>\s*({.+?})\s*<!>', r'<!json>\s*({.+})'],
+ info_page, 'json', default='{}'),
video_id)
if data:
data = data['player']['params'][0]
video_id)
if data:
data = data['player']['params'][0]
@@
-410,7
+432,7
@@
class VKIE(VKBaseIE):
timestamp = unified_timestamp(self._html_search_regex(
r'class=["\']mv_info_date[^>]+>([^<]+)(?:<|from)', info_page,
timestamp = unified_timestamp(self._html_search_regex(
r'class=["\']mv_info_date[^>]+>([^<]+)(?:<|from)', info_page,
- 'upload date',
fatal=False
))
+ 'upload date',
default=None)) or int_or_none(data.get('date'
))
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,.]+)',
@@
-418,7
+440,8
@@
class VKIE(VKBaseIE):
formats = []
for format_id, format_url in data.items():
formats = []
for format_id, format_url in data.items():
- if not isinstance(format_url, compat_str) or not format_url.startswith(('http', '//', 'rtmp')):
+ format_url = url_or_none(format_url)
+ if not format_url or not format_url.startswith(('http', '//', 'rtmp')):
continue
if (format_id.startswith(('url', 'cache')) or
format_id in ('extra_data', 'live_mp4', 'postlive_mp4')):
continue
if (format_id.startswith(('url', 'cache')) or
format_id in ('extra_data', 'live_mp4', 'postlive_mp4')):
@@
-447,9
+470,12
@@
class VKIE(VKBaseIE):
'title': title,
'thumbnail': data.get('jpg'),
'uploader': data.get('md_author'),
'title': title,
'thumbnail': data.get('jpg'),
'uploader': data.get('md_author'),
+ 'uploader_id': str_or_none(data.get('author_id')),
'duration': data.get('duration'),
'timestamp': timestamp,
'view_count': view_count,
'duration': data.get('duration'),
'timestamp': timestamp,
'view_count': view_count,
+ 'like_count': int_or_none(data.get('liked')),
+ 'dislike_count': int_or_none(data.get('nolikes')),
'is_live': is_live,
}
'is_live': is_live,
}