Skip to content

Allow converting m3u8 audio links to mp3 & fix extraction of owner and audio IDs #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
python273 merged 3 commits into from
Nov 25, 2019
Merged

Allow converting m3u8 audio links to mp3 & fix extraction of owner and audio IDs #315

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9bc5f2
Allow converting m3u8 audio links to mp3
bakatrouble Nov 24, 2019
1b5be04
Fix extraction of owner and audio ids
bakatrouble Nov 24, 2019
5a6434b
Fix the fix extraction of owner and audio ids
bakatrouble Nov 24, 2019
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
9 changes: 6 additions & 3 deletions vk_api/audio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
from .audio_url_decoder import decode_audio_url
from .exceptions import AccessDenied

RE_AUDIO_ID = re.compile(r'audio(-?\d+)_(\d+)')
RE_ALBUM_ID = re.compile(r'act=audio_playlist(-?\d+)_(\d+)')
RE_ACCESS_HASH = re.compile(r'access_hash=(\w+)')
RE_M3U8_TO_MP3 = re.compile(r'/[0-9a-f]+(/audios)?/([0-9a-f]+)/index.m3u8')

TRACKS_PER_USER_PAGE = 50
TRACKS_PER_ALBUM_PAGE = 100
Expand Down Expand Up @@ -222,7 +222,7 @@ def get_audio_by_id(self, owner_id, audio_id):
return decode_audio_url(link, self.user_id)


def scrap_data(html, user_id, filter_root_el=None):
def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True):
""" Парсинг списка аудиозаписей из html страницы """

if filter_root_el is None:
Expand All @@ -241,13 +241,16 @@ def scrap_data(html, user_id, filter_root_el=None):
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()
int(i) for i in audio['data-id'].split('_')
)
link = audio.select_one('.ai_body').input['value']

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

if convert_m3u8_links and 'm3u8' in link:
link = RE_M3U8_TO_MP3.sub(r'\1/\2.mp3', link)
Comment thread
python273 marked this conversation as resolved.

tracks.append({
'id': full_id[1],
'owner_id': full_id[0],
Expand Down