diff --git a/CHANGELOG.md b/CHANGELOG.md index 35256da..573c98c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,5 +2,8 @@ ## [Unreleased] +## [0.0.4] - 2021-01-16 +* actualized Vimeo and VK + ## [0.0.3] - 2021-01-15 * actualized Twitter diff --git a/setup.py b/setup.py index 9128504..f748175 100644 --- a/setup.py +++ b/setup.py @@ -7,8 +7,8 @@ with open('README.md') as fh: long_description = fh.read() -setup(name='socid_extractor', - version='0.0.3', +setup(name='socid-extractor', + version='0.0.4', description='Extract accounts\' identifiers from personal pages on various platforms', long_description=long_description, long_description_content_type="text/markdown", diff --git a/socid_extractor/schemes.py b/socid_extractor/schemes.py index 7afaecf..5a9ac4a 100644 --- a/socid_extractor/schemes.py +++ b/socid_extractor/schemes.py @@ -112,9 +112,17 @@ } }, 'VK user profile': { - 'flags': ['var vk =', 'change_current_info'], + 'flags': ['Profile.init({', 'change_current_info'], 'regex': r'Profile\.init\({"user_id":(?P\d+).*?(,"loc":"(?P.*?)")?,"back":"(?P.*?)"' }, + 'VK closed user profile': { + 'flags': ['var vk =', 'page_current_info'], + 'regex': r'

(?P.*?)

' + }, + 'VK blocked user profile': { + 'flags': ['window.vk = {', '/images/deactivated_50.png'], + 'regex': r'

(?P.+?)

' + }, 'Gravatar': { 'flags': ['gravatar.com\\/avatar', 'thumbnailUrl'], 'regex': r'^(.+?)$', diff --git a/tests/test_e2e.py b/tests/test_e2e.py index 4ba5d52..7455be6 100755 --- a/tests/test_e2e.py +++ b/tests/test_e2e.py @@ -21,6 +21,19 @@ def test_vk_user_profile_no_username(): assert info.get('fullname') in ('Юля Заболотная', 'Yulya Zabolotnaya') +def test_vk_closed_user_profile(): + info = extract(parse('https://vk.com/alex')[0]) + + assert info.get('fullname') in ('Александр Чудаев') + + +def test_vk_blocked_user_profile(): + headers = {'User-Agent': 'Curl'} + info = extract(parse('https://vk.com/alexaimephotography', headers=headers)[0]) + + assert info.get('fullname') in ('Alex Aimé') + + def test_yandex_disk(): info = extract(parse('https://yadi.sk/d/xRJFp3s2QWYv8')[0])