From 1006629f62300c828cd40c7946e82b17c9200272 Mon Sep 17 00:00:00 2001 From: Avi Peretz Date: Wed, 3 Oct 2018 16:31:34 +0300 Subject: [PATCH 1/4] add error message --- youtube_dl/extractor/vk.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py index ef8b9bcb7..680f81fdf 100644 --- a/youtube_dl/extractor/vk.py +++ b/youtube_dl/extractor/vk.py @@ -354,6 +354,9 @@ class VKIE(VKBaseIE): r'This video is no longer available, because it has been deleted.': 'Video %s is no longer available, because it has been deleted.', + + r'is not available in your region.': + 'Video %s is not available in your region.', } for error_re, error_msg in ERRORS.items(): From 8c01f55b1d87b4b6a76b49dc1528b0ef177677d5 Mon Sep 17 00:00:00 2001 From: Avi Peretz Date: Sun, 7 Oct 2018 09:46:36 +0300 Subject: [PATCH 2/4] add only_matching test --- youtube_dl/extractor/vk.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py index 680f81fdf..878ff197e 100644 --- a/youtube_dl/extractor/vk.py +++ b/youtube_dl/extractor/vk.py @@ -293,6 +293,11 @@ 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, + }, + { + # The video Футбол. РФПЛ.14-й тур. Кубань - Локомотив 5:0 38' Сергей Ткачёв is not available in your region. + 'url': 'https://vk.com/video-51812607_171445436', + 'only_matching': True, } ] @@ -500,7 +505,8 @@ class VKUserVideosIE(VKBaseIE): }, { 'url': 'http://new.vk.com/videos205387401', 'only_matching': True, - }] + } + ] def _real_extract(self, url): page_id = self._match_id(url) From f5b28b7716ea11574e0338975c3130e1b3153a47 Mon Sep 17 00:00:00 2001 From: Sergey M Date: Sat, 17 Nov 2018 20:57:20 +0700 Subject: [PATCH 3/4] Update vk.py --- youtube_dl/extractor/vk.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py index 878ff197e..4ecec9af8 100644 --- a/youtube_dl/extractor/vk.py +++ b/youtube_dl/extractor/vk.py @@ -295,11 +295,10 @@ class VKIE(VKBaseIE): 'only_matching': True, }, { - # The video Футбол. РФПЛ.14-й тур. Кубань - Локомотив 5:0 38' Сергей Ткачёв is not available in your region. + # 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) @@ -360,8 +359,8 @@ class VKIE(VKBaseIE): r'This video is no longer available, because it has been deleted.': 'Video %s is no longer available, because it has been deleted.', - r'is not available in your region.': - 'Video %s is not available in your region.', + 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(): From b0e866733f556bda7da1645200c0d117caf7b64e Mon Sep 17 00:00:00 2001 From: Sergey M Date: Sat, 17 Nov 2018 20:58:14 +0700 Subject: [PATCH 4/4] Update vk.py --- youtube_dl/extractor/vk.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py index 4ecec9af8..b52d15ac6 100644 --- a/youtube_dl/extractor/vk.py +++ b/youtube_dl/extractor/vk.py @@ -504,8 +504,7 @@ class VKUserVideosIE(VKBaseIE): }, { 'url': 'http://new.vk.com/videos205387401', 'only_matching': True, - } - ] + }] def _real_extract(self, url): page_id = self._match_id(url)