Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions vk_api/audio.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
:copyright: (c) 2019 python273
"""

import json
import re
from itertools import islice

from bs4 import BeautifulSoup

from .audio_url_decoder import decode_audio_url
from .exceptions import AccessDenied
from .utils import search_key

RE_AUDIO_ID = re.compile(r'audio(-?\d+)_(\d+)')
RE_ALBUM_ID = re.compile(r'act=audio_playlist(-?\d+)_(\d+)')
Expand Down Expand Up @@ -240,17 +242,23 @@ def scrap_data(html, user_id, filter_root_el=None):
artist = audio.select_one('.ai_artist').text
title = audio.select_one('.ai_title').text
duration = int(audio.select_one('.ai_dur')['data-dur'])
full_id = tuple(
int(i) for i in RE_AUDIO_ID.search(audio['id']).groups()
)
# full_id = tuple(
# int(i) for i in RE_AUDIO_ID.search(audio['id']).groups()
# )

# convert string to python object
audio_data = json.loads(audio["data-audio"])
# find audio & owner id`s
audio_id = search_key(audio_data, "id")
owner_id = search_key(audio_data, "vk_id")
link = audio.select_one('.ai_body').input['value']

if 'audio_api_unavailable' in link:
link = decode_audio_url(link, user_id)

tracks.append({
'id': full_id[1],
'owner_id': full_id[0],
'id': audio_id,
'owner_id': owner_id,
'url': link,

'artist': artist,
Expand Down
11 changes: 11 additions & 0 deletions vk_api/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@
from cookielib import Cookie


def search_key(data, key):
""" Поиск ключа во вложенном списке из разных структур данных"""
for elem in data:
if isinstance(elem, list):
return search_key(elem, key)

elif isinstance(elem, dict):
if key in elem.keys():
return elem[key]


def search_re(reg, string):
""" Поиск по регулярке """
s = reg.search(string)
Expand Down