From abc60bc7f5cff8ba4429e70343209181017b8b23 Mon Sep 17 00:00:00 2001
From: Adrian <20292956+qwertyadrian@users.noreply.github.com>
Date: Thu, 13 Feb 2020 22:45:36 +0300
Subject: [PATCH 01/16] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20VkAudio=20=D0=B2=20=D1=81=D0=BE=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B2=D0=B5=D1=81=D1=82=D0=B2=D0=B8=D0=B8=20=D1=81=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=D0=BC?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=20=D1=81=D1=82=D0=BE=D1=80=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D0=92=D0=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 77 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 0a69d26e..c8739aaf 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -7,6 +7,8 @@
 """
 
 import re
+import json
+import time
 from itertools import islice
 
 from bs4 import BeautifulSoup
@@ -18,6 +20,7 @@
 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')
+RPS_DELAY = 1.5
 
 TRACKS_PER_USER_PAGE = 50
 TRACKS_PER_ALBUM_PAGE = 100
@@ -119,7 +122,8 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
             tracks = scrap_data(
                 response.text,
                 self.user_id,
-                filter_root_el={'class_': 'audioPlaylist__list'} if album_id else None
+                filter_root_el={'class_': 'audioPlaylist__list'} if album_id else None,
+                http=self._vk.http
             )
 
             if not tracks:
@@ -216,7 +220,8 @@ def search_user(self, owner_id=None, q=''):
         tracks = scrap_data(
             response.text,
             self.user_id,
-            filter_root_el={'class_': 'AudioSerp__foundOwned'}
+            filter_root_el={'class_': 'AudioSerp__found'},
+            http=self._vk.http
         )
 
         return [track for track in tracks if track['owner_id'] == owner_id]
@@ -247,7 +252,7 @@ def search_iter(self, q, offset=0):
                 }
             )
 
-            tracks = scrap_data(response.text, self.user_id)
+            tracks = scrap_data(response.text, self.user_id, http=self._vk.http)
 
             if not tracks:
                 break
@@ -288,13 +293,14 @@ def get_post_audio(self, owner_id, post_id):
         tracks = scrap_data(
             response.text,
             self.user_id,
-            filter_root_el={'class': 'audios_list'}
+            filter_root_el={'class': 'audios_list'},
+            http=self._vk.http
         )
 
         return tracks
 
 
-def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True):
+def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True, http=None):
     """ Парсинг списка аудиозаписей из html страницы """
 
     if filter_root_el is None:
@@ -302,6 +308,9 @@ def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True):
 
     soup = BeautifulSoup(html, 'html.parser')
     tracks = []
+    ids = []
+
+    last_request = 0.0
 
     root_el = soup.find(**filter_root_el)
 
@@ -312,29 +321,49 @@ def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True):
         if 'audio_item_disabled' in audio['class']:
             continue
 
-        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 audio['data-id'].split('_')
+        data_audio = json.loads(audio['data-audio'])
+        data_audio[13] = re.sub('(/+)', '/', data_audio[13].strip('/')).split('/')[-2:]
+
+        full_id = (
+            str(data_audio[1]), str(data_audio[0]), data_audio[13][0], data_audio[13][1]
         )
-        link = audio.select_one('.ai_body').input['value']
+        ids.append(full_id)
 
-        if 'audio_api_unavailable' in link:
-            link = decode_audio_url(link, user_id)
+    for ids_group in [ids[i:i + 10] for i in range(0, len(ids), 10)]:
+        delay = RPS_DELAY - (time.time() - last_request)
 
-        if convert_m3u8_links and 'm3u8' in link:
-            link = RE_M3U8_TO_MP3.sub(r'\1/\2.mp3', link)
+        if delay > 0:
+            time.sleep(delay)
 
-        tracks.append({
-            'id': full_id[1],
-            'owner_id': full_id[0],
-            'url': link,
-
-            'artist': artist,
-            'title': title,
-            'duration': duration,
-        })
+        result = http.post(
+            'https://m.vk.com/audio',
+            data={'act': 'reload_audio', 'ids': ','.join(['_'.join(i) for i in ids_group])}
+        ).json()
+
+        last_request = time.time()
+        if result['data']:
+            data_audio = result['data'][0]
+            for audio in data_audio:
+                artist = BeautifulSoup(audio[4], 'html.parser').text
+                title = BeautifulSoup(audio[3].strip(), 'html.parser').text
+                duration = audio[5]
+                link = audio[2]
+
+                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)
+
+                tracks.append({
+                    'id': audio[0],
+                    'owner_id': audio[1],
+                    'url': link,
+
+                    'artist': artist,
+                    'title': title,
+                    'duration': duration,
+                })
 
     return tracks
 

From 0e30675c1674d138729ff13c97dbfef895954f90 Mon Sep 17 00:00:00 2001
From: qwertyadrian <20292956+qwertyadrian@users.noreply.github.com>
Date: Mon, 17 Feb 2020 16:55:57 +0300
Subject: [PATCH 02/16] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D0=B8=D1=82=D1=83=D0=B0=D1=86=D0=B8=D0=B8?=
 =?UTF-8?q?,=20=D0=BA=D0=BE=D0=B3=D0=B4=D0=B0=20data=5Faudio[13]=20=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=B5=D1=82=206=20=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=82=D0=BE=D0=B2,=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=BE=203?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index c8739aaf..eb4b6c6e 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -322,7 +322,11 @@ def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True, http
             continue
 
         data_audio = json.loads(audio['data-audio'])
-        data_audio[13] = re.sub('(/+)', '/', data_audio[13].strip('/')).split('/')[-2:]
+        data_audio[13] = re.sub('(/+)', '/', data_audio[13].strip('/')).split('/')
+        if len(data_audio[13]) == 6:
+            data_audio[13] = [data_audio[13][2], data_audio[13][4]]
+        else:
+            data_audio[13] = data_audio[13][-2:]
 
         full_id = (
             str(data_audio[1]), str(data_audio[0]), data_audio[13][0], data_audio[13][1]

From 7b9bbe45bf08213ce218bb8c8170f0181ecc26e2 Mon Sep 17 00:00:00 2001
From: qwertyadrian <20292956+qwertyadrian@users.noreply.github.com>
Date: Mon, 17 Feb 2020 23:10:16 +0300
Subject: [PATCH 03/16] =?UTF-8?q?=D0=92=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B7?=
 =?UTF-8?q?=D1=8B=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B9=20scrap=5Fd?=
 =?UTF-8?q?ata=20=D0=B8=D0=B7=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20VkA?=
 =?UTF-8?q?udio=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D0=B5=D1=82=D1=81?=
 =?UTF-8?q?=D1=8F=20=D0=B0=D1=80=D0=B3=D1=83=D0=BC=D0=B5=D0=BD=D1=82=20VkA?=
 =?UTF-8?q?udio.convert=5Fm3u8=5Flinks=20=D0=92=D0=BE=D1=81=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20VkAudio.get=5Faudio=5Fby=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index eb4b6c6e..aa24d29c 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -123,6 +123,7 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
                 response.text,
                 self.user_id,
                 filter_root_el={'class_': 'audioPlaylist__list'} if album_id else None,
+                convert_m3u8_links=self.convert_m3u8_links,
                 http=self._vk.http
             )
 
@@ -221,6 +222,7 @@ def search_user(self, owner_id=None, q=''):
             response.text,
             self.user_id,
             filter_root_el={'class_': 'AudioSerp__found'},
+            convert_m3u8_links=self.convert_m3u8_links,
             http=self._vk.http
         )
 
@@ -252,7 +254,12 @@ def search_iter(self, q, offset=0):
                 }
             )
 
-            tracks = scrap_data(response.text, self.user_id, http=self._vk.http)
+            tracks = scrap_data(
+                response.text,
+                self.user_id,
+                convert_m3u8_links=self.convert_m3u8_links,
+                http=self._vk.http
+            )
 
             if not tracks:
                 break
@@ -272,13 +279,17 @@ def get_audio_by_id(self, owner_id, audio_id):
             'https://m.vk.com/audio{}_{}'.format(owner_id, audio_id),
             allow_redirects=False
         )
-        bs = BeautifulSoup(response.text, 'html.parser')
-        link = bs.select_one('.ai_body input[type=hidden]').attrs['value']
-        decode_link = decode_audio_url(link, self.user_id)
-        if self.convert_m3u8_links and 'm3u8' in decode_link:
-            return RE_M3U8_TO_MP3.sub(r'\1/\2.mp3', decode_link)
+        track = scrap_data(
+            response.text,
+            self.user_id,
+            filter_root_el={'class': 'basisDefault'},
+            convert_m3u8_links=self.convert_m3u8_links,
+            http=self._vk.http
+        )
+        if track:
+            return track['url']
         else:
-            return decode_link
+            return ''
 
     def get_post_audio(self, owner_id, post_id):
         """ Получить список аудиозаписей из поста пользователя или группы
@@ -294,6 +305,7 @@ def get_post_audio(self, owner_id, post_id):
             response.text,
             self.user_id,
             filter_root_el={'class': 'audios_list'},
+            convert_m3u8_links=self.convert_m3u8_links,
             http=self._vk.http
         )
 

From 5ca54c24820017cb27c569f7546a4bd8816e16cd Mon Sep 17 00:00:00 2001
From: qwertyadrian <20292956+qwertyadrian@users.noreply.github.com>
Date: Mon, 17 Feb 2020 23:20:56 +0300
Subject: [PATCH 04/16] =?UTF-8?q?=D0=92=20=D1=81=D0=BB=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=80=D1=8C=20=D1=81=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B5=D0=B9=20=D0=BE=20=D1=82=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=20=D0=BA=D0=BB=D1=8E=D1=87,=20=D1=81=D0=BE=D0=B4=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B6=D0=B0=D1=89=D0=B8=D0=B9=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE?=
 =?UTF-8?q?=D0=BA=20=D1=81=D1=81=D1=8B=D0=BB=D0=BE=D0=BA=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=BB=D0=BE=D0=B6=D0=BD=D1=83=20=D1=82=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D0=B0=20(=D0=BF=D1=83=D1=81=D1=82=D1=83=D1=8E=20=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=BA=D1=83,=20=D0=B5=D1=81=D0=BB=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=BB=D0=BE=D0=B6=D0=B5=D0=BA=20=D0=BD=D0=B5=D1=82?=
 =?UTF-8?q?).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index aa24d29c..71f8337f 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -374,6 +374,7 @@ def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True, http
                 tracks.append({
                     'id': audio[0],
                     'owner_id': audio[1],
+                    'track_covers': audio[14].split(',') if audio[14] else '',
                     'url': link,
 
                     'artist': artist,

From 3f3a52a475b1f1a636a6bff87aa2ad699be08637 Mon Sep 17 00:00:00 2001
From: qwertyadrian <20292956+qwertyadrian@users.noreply.github.com>
Date: Mon, 17 Feb 2020 23:26:58 +0300
Subject: [PATCH 05/16] Fixed TypeError

---
 vk_api/audio.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 71f8337f..cea19ab6 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -287,7 +287,7 @@ def get_audio_by_id(self, owner_id, audio_id):
             http=self._vk.http
         )
         if track:
-            return track['url']
+            return track[0]['url']
         else:
             return ''
 

From 62d25146092bb9abe1ef53d42047aba5e52df8bc Mon Sep 17 00:00:00 2001
From: qwertyadrian <20292956+qwertyadrian@users.noreply.github.com>
Date: Tue, 18 Feb 2020 00:04:13 +0300
Subject: [PATCH 06/16] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=BB=D0=B5=D0=B9=D0=BB=D0=B8=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=B8=D0=B7=20=D0=BF=D0=BE=D1=81=D1=82=D0=B0=20=D0=B8?=
 =?UTF-8?q?=D0=B7-=D0=B7=D0=B0=20=D0=BD=D0=B5=D0=BD=D0=B0=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D1=81=D1=82=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index cea19ab6..72b16dd6 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -329,6 +329,10 @@ def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True, http
     if root_el is None:
         raise ValueError('Could not find root el for audio')
 
+    playlist_snippets = soup.find_all('div', {'class': "audioPlaylistSnippet__list"})
+    for playlist in playlist_snippets:
+        playlist.decompose()
+
     for audio in root_el.find_all('div', {'class': 'audio_item'}):
         if 'audio_item_disabled' in audio['class']:
             continue

From be2f78fd0515c8d5ccc0ab456de41a074cffbca0 Mon Sep 17 00:00:00 2001
From: qwertyadrian <20292956+qwertyadrian@users.noreply.github.com>
Date: Mon, 9 Mar 2020 07:48:07 +0300
Subject: [PATCH 07/16] =?UTF-8?q?=D0=A3=D0=B2=D0=B5=D0=BB=D0=B8=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20TRACKS=5FPER=5FUSER=5FPAGE=20=D0=B4=D0=BE=20100,?=
 =?UTF-8?q?=20=D1=82=D0=B0=D0=BA=20=D0=BA=D0=B0=D0=BA=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B8=2050=20?=
 =?UTF-8?q?=D0=B4=D1=83=D0=B1=D0=BB=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=81=D1=8C=20=D0=B0=D1=83=D0=B4=D0=B8=D0=BE=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B8,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D1=83?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=B8=D1=85=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B5=2050?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 72b16dd6..2e562900 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -22,7 +22,7 @@
 RE_M3U8_TO_MP3 = re.compile(r'/[0-9a-f]+(/audios)?/([0-9a-f]+)/index.m3u8')
 RPS_DELAY = 1.5
 
-TRACKS_PER_USER_PAGE = 50
+TRACKS_PER_USER_PAGE = 100
 TRACKS_PER_ALBUM_PAGE = 100
 ALBUMS_PER_USER_PAGE = 100
 

From 775e9ec47b5532af4d535a12b7b6167887ebfe8c Mon Sep 17 00:00:00 2001
From: qwertyadrian <20292956+qwertyadrian@users.noreply.github.com>
Date: Sun, 5 Jul 2020 17:27:47 +0400
Subject: [PATCH 08/16] =?UTF-8?q?=D0=9C=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20(=D0=BA=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=B5=20get=5Falbums=5Fiter,=20get=5Faudio=5Fby=5Fid=20?=
 =?UTF-8?q?=D0=B8=20get=5Fpost=5Faudio)=20VkAudio=20=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D1=8B=20=D1=81=20=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=D0=BC=20PHP=20=D0=B1=D1=8D=D0=BA=D1=8D=D0=BD=D0=B4?=
 =?UTF-8?q?=D0=B0=20-=20al=5Faudio.php=20=D0=9C=D0=B5=D1=82=D0=BE=D0=B4=20?=
 =?UTF-8?q?search=5Fiter=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=B8=D0=BD=D0=B8=D0=BC=D0=B0=D0=B5=D1=82?=
 =?UTF-8?q?=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20offset,?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BA=D0=BE=D0=BB=D1=8C=D0=BA=D1=83=20"?=
 =?UTF-8?q?=D0=B0=D0=BA=D1=82"=20(=D0=BC=D0=B5=D1=82=D0=BE=D0=B4)=20sectio?=
 =?UTF-8?q?n=20=D0=B8=D0=B7=20al=5Faudio.php=20=D0=BD=D0=B5=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=B2=D0=B0=D0=B5=D1=82=20?=
 =?UTF-8?q?=D1=81=D0=BC=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D0=B5.=20=D0=94?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=B4=D0=B3=D1=80=D0=B7=D1=83=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0=20=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D1=82=D1=81=D1=8F=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20load=5Fcatalog=5Fsection.=20?=
 =?UTF-8?q?=D0=9F=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20count=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20search=20=D0=B1=D1=8B?=
 =?UTF-8?q?=D0=BB=20=D1=83=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B5=D0=BD=20?=
 =?UTF-8?q?=D1=81=2050=20=D0=B4=D0=BE=20100.=20=D0=A4=D1=83=D0=BD=D0=BA?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20scrap=5Fdata=20=D0=B1=D1=8B=D0=BB=D0=B0=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=82=D1=80=D0=B8=20=D1=84=D1=83=D0=BD=D0=BA=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8:=20scrap=5Fids,=20scrap=5Fids=5Ffrom=5Fhtml=20?=
 =?UTF-8?q?=D0=B8=20scrap=5Ftracks=20=D0=91=D1=8B=D0=BB=D0=B0=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=BD=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=87=D0=B8=D1=8F=20=D0=B2=D1=81=D0=B5=D1=85=20=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=85=D0=BE=D0=B4=D0=B8=D0=BC=D1=8B=D1=85=20=D1=85?=
 =?UTF-8?q?=D1=8D=D1=88=D0=B5=D0=B9=20=D0=B0=D1=83=D0=B4=D0=B8=D0=BE=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B8=D1=81=D0=B5=D0=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 206 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 138 insertions(+), 68 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 2e562900..7f4af5c7 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -20,10 +20,12 @@
 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')
-RPS_DELAY = 1.5
 
-TRACKS_PER_USER_PAGE = 100
-TRACKS_PER_ALBUM_PAGE = 100
+RPS_DELAY_RELOAD_AUDIO = 1.5
+RPS_DELAY_LOAD_SECTION = 2.0
+
+TRACKS_PER_USER_PAGE = 2000
+TRACKS_PER_ALBUM_PAGE = 2000
 ALBUMS_PER_USER_PAGE = 100
 
 
@@ -96,35 +98,42 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
             owner_id = self.user_id
 
         if album_id is not None:
-            url = 'https://m.vk.com/audio?act=audio_playlist{}_{}&access_hash={}'.format(
-                owner_id, album_id, access_hash or ''
-            )
             offset_diff = TRACKS_PER_ALBUM_PAGE
         else:
-            url = 'https://m.vk.com/audios{}'.format(owner_id)
             offset_diff = TRACKS_PER_USER_PAGE
 
         offset = 0
         while True:
-            response = self._vk.http.get(
-                url,
-                params={
-                    'offset': offset
+            response = self._vk.http.post(
+                'https://m.vk.com/audio',
+                data={
+                    'act': 'load_section',
+                    'owner_id': owner_id,
+                    'playlist_id': album_id if album_id else -1,
+                    'offset': offset,
+                    'type': 'playlist',
+                    'access_hash': access_hash,
+                    'is_loading_all': 1
                 },
                 allow_redirects=False
-            )
+            ).json()
 
-            if not response.text:
+            if not response['data'][0]:
                 raise AccessDenied(
-                    'You don\'t have permissions to browse user\'s audio'
+                    'You don\'t have permissions to browse {}\'s albums'.format(
+                        owner_id
+                    )
                 )
 
-            tracks = scrap_data(
-                response.text,
+            ids = scrap_ids(
+                response['data'][0]['list']
+            )
+
+            tracks = scrap_tracks(
+                ids,
                 self.user_id,
-                filter_root_el={'class_': 'audioPlaylist__list'} if album_id else None,
-                convert_m3u8_links=self.convert_m3u8_links,
-                http=self._vk.http
+                self._vk.http,
+                convert_m3u8_links=self.convert_m3u8_links
             )
 
             if not tracks:
@@ -133,6 +142,9 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
             for i in tracks:
                 yield i
 
+            if response['data'][0]['totalCount'] <= 2000:
+                break
+
             offset += offset_diff
 
     def get(self, owner_id=None, album_id=None, access_hash=None):
@@ -202,33 +214,45 @@ def search_user(self, owner_id=None, q=''):
         if owner_id is None:
             owner_id = self.user_id
 
-        response = self._vk.http.get(
-            'https://m.vk.com/audio',
-            params={
-                'id': owner_id,
+        response = self._vk.http.post(
+            'https://vk.com/al_audio.php',
+            data={
+                'al': 1,
+                'act': 'section',
+                'claim': 0,
+                'is_layer': 0,
+                'owner_id': owner_id,
+                'section': 'search',
                 'q': q
-            },
-            allow_redirects=False
+            }
         )
+        json_response = json.loads(response.text.replace('<!--', ''))
 
-        if not response.text:
+        if not json_response['payload'][1]:
             raise AccessDenied(
                 'You don\'t have permissions to browse {}\'s audio'.format(
                     owner_id
                 )
             )
 
-        tracks = scrap_data(
-            response.text,
-            self.user_id,
-            filter_root_el={'class_': 'AudioSerp__found'},
-            convert_m3u8_links=self.convert_m3u8_links,
-            http=self._vk.http
-        )
+        if json_response['payload'][1][1]['playlists']:
+
+            ids = scrap_ids(
+                json_response['payload'][1][1]['playlists'][0]['list']
+            )
+
+            tracks = scrap_tracks(
+                ids,
+                self.user_id,
+                self._vk.http,
+                convert_m3u8_links=self.convert_m3u8_links
+            )
 
-        return [track for track in tracks if track['owner_id'] == owner_id]
+            return tracks
+        else:
+            return []
 
-    def search(self, q, count=50):
+    def search(self, q, count=100):
         """ Искать аудиозаписи
 
         :param q: запрос
@@ -237,25 +261,33 @@ def search(self, q, count=50):
 
         return islice(self.search_iter(q), count)
 
-    def search_iter(self, q, offset=0):
+    def search_iter(self, q):
         """ Искать аудиозаписи (генератор)
 
         :param q: запрос
-        :param offset: смещение
         """
 
+        response = self._vk.http.post(
+            'https://vk.com/al_audio.php',
+            data={
+                'al': 1,
+                'act': 'section',
+                'claim': 0,
+                'is_layer': 0,
+                'owner_id': self.user_id,
+                'section': 'search',
+                'q': q
+            }
+        )
+        json_response = json.loads(response.text.replace('<!--', ''))
+
         while True:
-            response = self._vk.http.get(
-                'https://m.vk.com/audio',
-                params={
-                    'act': 'search',
-                    'q': q,
-                    'offset': offset
-                }
+            ids = scrap_ids(
+                json_response['payload'][1][1]['playlist']['list']
             )
 
-            tracks = scrap_data(
-                response.text,
+            tracks = scrap_tracks(
+                ids,
                 self.user_id,
                 convert_m3u8_links=self.convert_m3u8_links,
                 http=self._vk.http
@@ -267,7 +299,16 @@ def search_iter(self, q, offset=0):
             for track in tracks:
                 yield track
 
-            offset += 50
+            response = self._vk.http.post(
+                'https://vk.com/al_audio.php',
+                data={
+                    'al': 1,
+                    'act': 'load_catalog_section',
+                    'section_id': json_response['payload'][1][1]['sectionId'],
+                    'start_from': json_response['payload'][1][1]['nextFrom']
+                }
+            )
+            json_response = json.loads(response.text.replace('<!--', ''))
 
     def get_audio_by_id(self, owner_id, audio_id):
         """ Получить аудиозапись по ID
@@ -279,13 +320,19 @@ def get_audio_by_id(self, owner_id, audio_id):
             'https://m.vk.com/audio{}_{}'.format(owner_id, audio_id),
             allow_redirects=False
         )
-        track = scrap_data(
+        
+        ids = scrap_ids_from_html(
             response.text,
+            filter_root_el={'class': 'basisDefault'}
+        )
+
+        track = scrap_tracks(
+            ids,
             self.user_id,
-            filter_root_el={'class': 'basisDefault'},
-            convert_m3u8_links=self.convert_m3u8_links,
-            http=self._vk.http
+            http=self._vk.http,
+            convert_m3u8_links=self.convert_m3u8_links
         )
+
         if track:
             return track[0]['url']
         else:
@@ -301,29 +348,46 @@ def get_post_audio(self, owner_id, post_id):
             'https://m.vk.com/wall{}_{}'.format(owner_id, post_id)
         )
 
-        tracks = scrap_data(
+        ids = scrap_ids_from_html(
             response.text,
+            filter_root_el={'class': 'audios_list'}
+        )
+
+        tracks = scrap_tracks(
+            ids,
             self.user_id,
-            filter_root_el={'class': 'audios_list'},
-            convert_m3u8_links=self.convert_m3u8_links,
-            http=self._vk.http
+            http=self._vk.http,
+            convert_m3u8_links=self.convert_m3u8_links
         )
 
         return tracks
 
 
-def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True, http=None):
-    """ Парсинг списка аудиозаписей из html страницы """
+def scrap_ids(audio_data):
+    """ Парсинг списка хэшей аудиозаписей из json объекта """
+    ids = []
+
+    for track in audio_data:
+        audio_hashes = track[13].split("/")
+
+        full_id = (
+            str(track[1]), str(track[0]), audio_hashes[2], audio_hashes[5]
+        )
+        if all(full_id):
+            ids.append(full_id)
+
+    return ids
+
+
+def scrap_ids_from_html(html, filter_root_el=None):
+    """ Парсинг списка хэшей аудиозаписей из html страницы """
 
     if filter_root_el is None:
         filter_root_el = {'id': 'au_search_items'}
 
     soup = BeautifulSoup(html, 'html.parser')
-    tracks = []
     ids = []
 
-    last_request = 0.0
-
     root_el = soup.find(**filter_root_el)
 
     if root_el is None:
@@ -338,19 +402,25 @@ def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True, http
             continue
 
         data_audio = json.loads(audio['data-audio'])
-        data_audio[13] = re.sub('(/+)', '/', data_audio[13].strip('/')).split('/')
-        if len(data_audio[13]) == 6:
-            data_audio[13] = [data_audio[13][2], data_audio[13][4]]
-        else:
-            data_audio[13] = data_audio[13][-2:]
+        audio_hashes = data_audio[13].split("/")
 
         full_id = (
-            str(data_audio[1]), str(data_audio[0]), data_audio[13][0], data_audio[13][1]
+            str(data_audio[1]), str(data_audio[0]), audio_hashes[2], audio_hashes[5]
         )
-        ids.append(full_id)
+
+        if all(full_id):
+            ids.append(full_id)
+
+    return ids
+
+
+def scrap_tracks(ids, user_id, http, convert_m3u8_links=True):
+    tracks = []
+
+    last_request = 0.0
 
     for ids_group in [ids[i:i + 10] for i in range(0, len(ids), 10)]:
-        delay = RPS_DELAY - (time.time() - last_request)
+        delay = RPS_DELAY_RELOAD_AUDIO - (time.time() - last_request)
 
         if delay > 0:
             time.sleep(delay)

From 523b105579c0c3113e3fe79ffbb218732d00950a Mon Sep 17 00:00:00 2001
From: qwertyadrian <20292956+qwertyadrian@users.noreply.github.com>
Date: Sun, 5 Jul 2020 18:32:06 +0400
Subject: [PATCH 09/16] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=80=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BD=D0=BE=D0=B5=20=D0=BF=D0=BE=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B0=20get=5Fiter=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20Vk?=
 =?UTF-8?q?Audio,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D1=83=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B5=D0=B5=202000=20=D0=B0=D1=83=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B5=D0=B9.=20=D0=A4?=
 =?UTF-8?q?=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8F=20scrap=5Ftracks=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0=D1=82=D0=BE=D1=80,=20=D0=BF=D0=BE=D1=81=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D1=83=20=D0=BF=D1=80=D0=B8=20=D0=B1=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=88=D0=BE=D0=BC=20=D0=BA=D0=BE=D0=BB=D0=B8=D1=87?=
 =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B2=D0=B5=20=D0=B0=D1=83=D0=B4=D0=B8=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B5=D0=B9=20=D0=BE=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D0=B7=D0=B0=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=B2=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=80=D0=B5=D0=B7?=
 =?UTF-8?q?=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 7f4af5c7..c5fd0513 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -142,11 +142,11 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
             for i in tracks:
                 yield i
 
-            if response['data'][0]['totalCount'] <= 2000:
+            if response['data'][0]['hasMore']:
+                offset += offset_diff
+            else:
                 break
 
-            offset += offset_diff
-
     def get(self, owner_id=None, album_id=None, access_hash=None):
         """ Получить список аудиозаписей пользователя
 
@@ -248,7 +248,7 @@ def search_user(self, owner_id=None, q=''):
                 convert_m3u8_links=self.convert_m3u8_links
             )
 
-            return tracks
+            return list(tracks)
         else:
             return []
 
@@ -334,7 +334,7 @@ def get_audio_by_id(self, owner_id, audio_id):
         )
 
         if track:
-            return track[0]['url']
+            return list(track)[0]['url']
         else:
             return ''
 
@@ -445,18 +445,16 @@ def scrap_tracks(ids, user_id, http, convert_m3u8_links=True):
                 if convert_m3u8_links and 'm3u8' in link:
                     link = RE_M3U8_TO_MP3.sub(r'\1/\2.mp3', link)
 
-                tracks.append({
+                yield {
                     'id': audio[0],
                     'owner_id': audio[1],
-                    'track_covers': audio[14].split(',') if audio[14] else '',
+                    'track_covers': audio[14].split(',') if audio[14] else [],
                     'url': link,
 
                     'artist': artist,
                     'title': title,
                     'duration': duration,
-                })
-
-    return tracks
+                }
 
 
 def scrap_albums(html):

From 3957e58f8466151a3599fd0ca36127a49cd20700 Mon Sep 17 00:00:00 2001
From: qwertyadrian <20292956+qwertyadrian@users.noreply.github.com>
Date: Mon, 6 Jul 2020 16:14:16 +0400
Subject: [PATCH 10/16] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=B4=D1=80=D1=83=D0=B7=D0=B5=D0=B9.=20=D0=9C=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B4=20get=5Faudio=5Fby=5Fid=20=D0=B2=D0=BE=D0=B7=D0=B2?=
 =?UTF-8?q?=D1=80=D0=B0=D1=89=D0=B0=D0=B5=D1=82=20=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D1=83=D1=8E=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8E=20=D0=BE=D0=B1=20=D0=B0=D1=83=D0=B4=D0=B8=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 56 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index c5fd0513..2a71f520 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -310,6 +310,56 @@ def search_iter(self, q):
             )
             json_response = json.loads(response.text.replace('<!--', ''))
 
+    def get_updates_iter(self):
+        """ Искать обновления друзей (генератор) """
+
+        response = self._vk.http.post(
+            'https://vk.com/al_audio.php',
+            data={
+                'al': 1,
+                'act': 'section',
+                'claim': 0,
+                'is_layer': 0,
+                'owner_id': self.user_id,
+                'section': 'updates'
+            }
+        )
+        json_response = json.loads(response.text.replace('<!--', ''))
+
+        while True:
+            updates = [i['list'] for i in json_response['payload'][1][1]['playlists']]
+
+            ids = scrap_ids(
+                [i[0] for i in updates if i]
+            )
+
+            tracks = scrap_tracks(
+                ids,
+                self.user_id,
+                convert_m3u8_links=self.convert_m3u8_links,
+                http=self._vk.http
+            )
+
+            if not tracks:
+                break
+
+            for track in tracks:
+                yield track
+
+            if len(updates) < 11:
+                break
+
+            response = self._vk.http.post(
+                'https://vk.com/al_audio.php',
+                data={
+                    'al': 1,
+                    'act': 'load_catalog_section',
+                    'section_id': json_response['payload'][1][1]['sectionId'],
+                    'start_from': json_response['payload'][1][1]['nextFrom']
+                }
+            )
+            json_response = json.loads(response.text.replace('<!--', ''))
+
     def get_audio_by_id(self, owner_id, audio_id):
         """ Получить аудиозапись по ID
 
@@ -334,9 +384,9 @@ def get_audio_by_id(self, owner_id, audio_id):
         )
 
         if track:
-            return list(track)[0]['url']
+            return next(track)
         else:
-            return ''
+            return []
 
     def get_post_audio(self, owner_id, post_id):
         """ Получить список аудиозаписей из поста пользователя или группы
@@ -415,8 +465,6 @@ def scrap_ids_from_html(html, filter_root_el=None):
 
 
 def scrap_tracks(ids, user_id, http, convert_m3u8_links=True):
-    tracks = []
-
     last_request = 0.0
 
     for ids_group in [ids[i:i + 10] for i in range(0, len(ids), 10)]:

From 6ac9002886f1980b8864cfc48ab729e6ac42f62f Mon Sep 17 00:00:00 2001
From: dashedman <assarbsmail@gmail.com>
Date: Tue, 7 Jul 2020 00:54:36 +0300
Subject: [PATCH 11/16] =?UTF-8?q?first=20commit=20lol=20+=D1=84=D1=83?=
 =?UTF-8?q?=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20get=5Fpopular=5Fiter(),=20get?=
 =?UTF-8?q?=5Fnews=5Fiter()(=20=D0=BF=D0=BE=D0=BF=D1=83=D0=BB=D1=8F=D1=80?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=B8=20=D0=BD=D0=BE=D0=B2=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=BA=D0=B8)=20+=D0=BE=D1=84=D1=84=D1=81=D0=B5=D1=82=D1=8B=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20search=5Fiter(),=20get=5Fpopular=5Fiter(),?=
 =?UTF-8?q?=20get=5Fnews=5Fiter()=20+=D0=B7=D0=B0=D1=89=D0=B8=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=BE=D1=82=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?response=20'playlist'=20=D0=B2=20search=5Fiter()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 399 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 306 insertions(+), 93 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 2e562900..4617c089 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -6,6 +6,8 @@
 :copyright: (c) 2019 python273
 """
 
+from pprint import pprint
+
 import re
 import json
 import time
@@ -13,23 +15,24 @@
 
 from bs4 import BeautifulSoup
 
-from .audio_url_decoder import decode_audio_url
-from .exceptions import AccessDenied
-from .utils import set_cookies_from_list
+from vk_api.audio_url_decoder import decode_audio_url
+from vk_api.exceptions import AccessDenied
+from vk_api.utils import set_cookies_from_list
 
 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')
-RPS_DELAY = 1.5
 
-TRACKS_PER_USER_PAGE = 100
-TRACKS_PER_ALBUM_PAGE = 100
+RPS_DELAY_RELOAD_AUDIO = 1.5
+RPS_DELAY_LOAD_SECTION = 2.0
+
+TRACKS_PER_USER_PAGE = 2000
+TRACKS_PER_ALBUM_PAGE = 2000
 ALBUMS_PER_USER_PAGE = 100
 
 
 class VkAudio(object):
     """ Модуль для получения аудиозаписей без использования официального API.
-
     :param vk: Объект :class:`VkApi`
     """
 
@@ -86,7 +89,6 @@ def __init__(self, vk, convert_m3u8_links=True):
 
     def get_iter(self, owner_id=None, album_id=None, access_hash=None):
         """ Получить список аудиозаписей пользователя (по частям)
-
         :param owner_id: ID владельца (отрицательные значения для групп)
         :param album_id: ID альбома
         :param access_hash: ACCESS_HASH альбома
@@ -96,35 +98,42 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
             owner_id = self.user_id
 
         if album_id is not None:
-            url = 'https://m.vk.com/audio?act=audio_playlist{}_{}&access_hash={}'.format(
-                owner_id, album_id, access_hash or ''
-            )
             offset_diff = TRACKS_PER_ALBUM_PAGE
         else:
-            url = 'https://m.vk.com/audios{}'.format(owner_id)
             offset_diff = TRACKS_PER_USER_PAGE
 
         offset = 0
         while True:
-            response = self._vk.http.get(
-                url,
-                params={
-                    'offset': offset
+            response = self._vk.http.post(
+                'https://m.vk.com/audio',
+                data={
+                    'act': 'load_section',
+                    'owner_id': owner_id,
+                    'playlist_id': album_id if album_id else -1,
+                    'offset': offset,
+                    'type': 'playlist',
+                    'access_hash': access_hash,
+                    'is_loading_all': 1
                 },
                 allow_redirects=False
-            )
+            ).json()
 
-            if not response.text:
+            if not response['data'][0]:
                 raise AccessDenied(
-                    'You don\'t have permissions to browse user\'s audio'
+                    'You don\'t have permissions to browse {}\'s albums'.format(
+                        owner_id
+                    )
                 )
 
-            tracks = scrap_data(
-                response.text,
+            ids = scrap_ids(
+                response['data'][0]['list']
+            )
+
+            tracks = scrap_tracks(
+                ids,
                 self.user_id,
-                filter_root_el={'class_': 'audioPlaylist__list'} if album_id else None,
-                convert_m3u8_links=self.convert_m3u8_links,
-                http=self._vk.http
+                self._vk.http,
+                convert_m3u8_links=self.convert_m3u8_links
             )
 
             if not tracks:
@@ -133,11 +142,13 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
             for i in tracks:
                 yield i
 
-            offset += offset_diff
+            if response['data'][0]['hasMore']:
+                offset += offset_diff
+            else:
+                break
 
     def get(self, owner_id=None, album_id=None, access_hash=None):
         """ Получить список аудиозаписей пользователя
-
         :param owner_id: ID владельца (отрицательные значения для групп)
         :param album_id: ID альбома
         :param access_hash: ACCESS_HASH альбома
@@ -147,7 +158,6 @@ def get(self, owner_id=None, album_id=None, access_hash=None):
 
     def get_albums_iter(self, owner_id=None):
         """ Получить список альбомов пользователя (по частям)
-
         :param owner_id: ID владельца (отрицательные значения для групп)
         """
 
@@ -186,7 +196,6 @@ def get_albums_iter(self, owner_id=None):
 
     def get_albums(self, owner_id=None):
         """ Получить список альбомов пользователя
-
         :param owner_id: ID владельца (отрицательные значения для групп)
         """
 
@@ -194,7 +203,6 @@ def get_albums(self, owner_id=None):
 
     def search_user(self, owner_id=None, q=''):
         """ Искать по аудиозаписям пользователя
-
         :param owner_id: ID владельца (отрицательные значения для групп)
         :param q: запрос
         """
@@ -202,76 +210,255 @@ def search_user(self, owner_id=None, q=''):
         if owner_id is None:
             owner_id = self.user_id
 
-        response = self._vk.http.get(
-            'https://m.vk.com/audio',
-            params={
-                'id': owner_id,
+        response = self._vk.http.post(
+            'https://vk.com/al_audio.php',
+            data={
+                'al': 1,
+                'act': 'section',
+                'claim': 0,
+                'is_layer': 0,
+                'owner_id': owner_id,
+                'section': 'search',
                 'q': q
-            },
-            allow_redirects=False
+            }
         )
+        json_response = json.loads(response.text.replace('<!--', ''))
 
-        if not response.text:
+        if not json_response['payload'][1]:
             raise AccessDenied(
                 'You don\'t have permissions to browse {}\'s audio'.format(
                     owner_id
                 )
             )
 
-        tracks = scrap_data(
-            response.text,
-            self.user_id,
-            filter_root_el={'class_': 'AudioSerp__found'},
-            convert_m3u8_links=self.convert_m3u8_links,
-            http=self._vk.http
-        )
+        if json_response['payload'][1][1]['playlists']:
 
-        return [track for track in tracks if track['owner_id'] == owner_id]
+            ids = scrap_ids(
+                json_response['payload'][1][1]['playlists'][0]['list']
+            )
 
-    def search(self, q, count=50):
-        """ Искать аудиозаписи
+            tracks = scrap_tracks(
+                ids,
+                self.user_id,
+                self._vk.http,
+                convert_m3u8_links=self.convert_m3u8_links
+            )
+
+            return list(tracks)
+        else:
+            return []
 
+    def search(self, q, count=100, offset=0):
+        """ Искать аудиозаписи
         :param q: запрос
         :param count: количество
         """
 
-        return islice(self.search_iter(q), count)
+        return islice(self.search_iter(q, offset=offset), count)
 
     def search_iter(self, q, offset=0):
         """ Искать аудиозаписи (генератор)
-
         :param q: запрос
+        """
+        offset_left = 0
+
+        response = self._vk.http.post(
+            'https://vk.com/al_audio.php',
+            data={
+                'al': 1,
+                'act': 'section',
+                'claim': 0,
+                'is_layer': 0,
+                'owner_id': self.user_id,
+                'section': 'search',
+                'q': q
+            }
+        )
+
+        json_response = json.loads(response.text.replace('<!--', ''))
+
+
+        while json_response['payload'][1][1]['playlist']:
+
+            ids = scrap_ids(
+                json_response['payload'][1][1]['playlist']['list']
+            )
+
+            #len(tracks) <= 10
+            if offset_left + len(ids) >= offset:
+                if offset_left >= offset:
+                    tracks = scrap_tracks(
+                        ids,
+                        self.user_id,
+                        convert_m3u8_links=self.convert_m3u8_links,
+                        http=self._vk.http
+                    )
+                else:
+                    tracks = scrap_tracks(
+                        ids[offset - offset_left:],
+                        self.user_id,
+                        convert_m3u8_links=self.convert_m3u8_links,
+                        http=self._vk.http
+                    )
+
+                if not tracks:
+                    break
+
+                for track in tracks:
+                    yield track
+
+            else:
+                pass
+
+            offset_left += len(ids)
+
+            response = self._vk.http.post(
+                'https://vk.com/al_audio.php',
+                data={
+                    'al': 1,
+                    'act': 'load_catalog_section',
+                    'section_id': json_response['payload'][1][1]['sectionId'],
+                    'start_from': json_response['payload'][1][1]['nextFrom'],
+                    'offset':100
+                }
+            )
+            json_response = json.loads(response.text.replace('<!--', ''))
+
+
+    def get_popular_iter(self,offset=0):
+        """ Искать популярные аудиозаписи  (генератор)
+
         :param offset: смещение
         """
 
+        offset_left = 0
+
+        response = self._vk.http.post(
+            'https://vk.com/al_audio.php',
+            data={
+                'al': 1,
+                'act': 'section',
+                'claim': 0,
+                'is_layer': 0,
+                'owner_id': self.user_id,
+                'section': 'recoms'
+            }
+        )
+        json_response = json.loads(response.text.replace('<!--', ''))
+        #pprint(json_response)
+
         while True:
-            response = self._vk.http.get(
-                'https://m.vk.com/audio',
-                params={
-                    'act': 'search',
-                    'q': q,
-                    'offset': offset
+            ids = scrap_ids(
+                json_response['payload'][1][1]['playlist']['list']
+            )
+
+            #len(tracks) <= 10
+            if offset_left + len(ids) >= offset:
+                if offset_left >= offset:
+                    tracks = scrap_tracks(
+                        ids,
+                        self.user_id,
+                        convert_m3u8_links=self.convert_m3u8_links,
+                        http=self._vk.http
+                    )
+                else:
+                    tracks = scrap_tracks(
+                        ids[offset - offset_left:],
+                        self.user_id,
+                        convert_m3u8_links=self.convert_m3u8_links,
+                        http=self._vk.http
+                    )
+
+                if not tracks:
+                    break
+
+                for track in tracks:
+                    yield track
+
+            else:
+                pass
+
+            offset_left += len(ids)
+
+            response = self._vk.http.post(
+                'https://vk.com/al_audio.php',
+                data={
+                    'al': 1,
+                    'act': 'load_catalog_section',
+                    'section_id': json_response['payload'][1][1]['sectionId'],
+                    'start_from': json_response['payload'][1][1]['nextFrom']
                 }
             )
+            json_response = json.loads(response.text.replace('<!--', ''))
 
-            tracks = scrap_data(
-                response.text,
-                self.user_id,
-                convert_m3u8_links=self.convert_m3u8_links,
-                http=self._vk.http
+    def get_news_iter(self,offset=0):
+        """ Искать новые аудиозаписи  (генератор)
+
+        :param offset: смещение
+        """
+
+        offset_left = 0
+
+        response = self._vk.http.post(
+            'https://vk.com/al_audio.php',
+            data={
+                'al': 1,
+                'act': 'section',
+                'claim': 0,
+                'is_layer': 0,
+                'owner_id': self.user_id,
+                'section': 'recoms'
+            }
+        )
+        json_response = json.loads(response.text.replace('<!--', ''))
+
+        while True:
+            ids = scrap_ids(
+                json_response['payload'][1][1]['playlists'][0]['list']
             )
 
-            if not tracks:
-                break
+            #len(tracks) <= 10
+            if offset_left + len(ids) >= offset:
+                if offset_left >= offset:
+                    tracks = scrap_tracks(
+                        ids,
+                        self.user_id,
+                        convert_m3u8_links=self.convert_m3u8_links,
+                        http=self._vk.http
+                    )
+                else:
+                    tracks = scrap_tracks(
+                        ids[offset - offset_left:],
+                        self.user_id,
+                        convert_m3u8_links=self.convert_m3u8_links,
+                        http=self._vk.http
+                    )
+
+                if not tracks:
+                    break
+
+                for track in tracks:
+                    yield track
+
+            else:
+                pass
 
-            for track in tracks:
-                yield track
+            offset_left += len(ids)
+
+            response = self._vk.http.post(
+                'https://vk.com/al_audio.php',
+                data={
+                    'al': 1,
+                    'act': 'load_catalog_section',
+                    'section_id': json_response['payload'][1][1]['sectionId'],
+                    'start_from': json_response['payload'][1][1]['nextFrom']
+                }
+            )
+            json_response = json.loads(response.text.replace('<!--', ''))
 
-            offset += 50
 
     def get_audio_by_id(self, owner_id, audio_id):
         """ Получить аудиозапись по ID
-
         :param owner_id: ID владельца (отрицательные значения для групп)
         :param audio_id: ID аудио
         """
@@ -279,21 +466,26 @@ def get_audio_by_id(self, owner_id, audio_id):
             'https://m.vk.com/audio{}_{}'.format(owner_id, audio_id),
             allow_redirects=False
         )
-        track = scrap_data(
+
+        ids = scrap_ids_from_html(
             response.text,
+            filter_root_el={'class': 'basisDefault'}
+        )
+
+        track = scrap_tracks(
+            ids,
             self.user_id,
-            filter_root_el={'class': 'basisDefault'},
-            convert_m3u8_links=self.convert_m3u8_links,
-            http=self._vk.http
+            http=self._vk.http,
+            convert_m3u8_links=self.convert_m3u8_links
         )
+
         if track:
-            return track[0]['url']
+            return next(track)
         else:
             return ''
 
     def get_post_audio(self, owner_id, post_id):
         """ Получить список аудиозаписей из поста пользователя или группы
-
         :param owner_id: ID владельца (отрицательные значения для групп)
         :param post_id: ID поста
         """
@@ -301,29 +493,46 @@ def get_post_audio(self, owner_id, post_id):
             'https://m.vk.com/wall{}_{}'.format(owner_id, post_id)
         )
 
-        tracks = scrap_data(
+        ids = scrap_ids_from_html(
             response.text,
+            filter_root_el={'class': 'audios_list'}
+        )
+
+        tracks = scrap_tracks(
+            ids,
             self.user_id,
-            filter_root_el={'class': 'audios_list'},
-            convert_m3u8_links=self.convert_m3u8_links,
-            http=self._vk.http
+            http=self._vk.http,
+            convert_m3u8_links=self.convert_m3u8_links
         )
 
         return tracks
 
 
-def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True, http=None):
-    """ Парсинг списка аудиозаписей из html страницы """
+def scrap_ids(audio_data):
+    """ Парсинг списка хэшей аудиозаписей из json объекта """
+    ids = []
+
+    for track in audio_data:
+        audio_hashes = track[13].split("/")
+
+        full_id = (
+            str(track[1]), str(track[0]), audio_hashes[2], audio_hashes[5]
+        )
+        if all(full_id):
+            ids.append(full_id)
+
+    return ids
+
+
+def scrap_ids_from_html(html, filter_root_el=None):
+    """ Парсинг списка хэшей аудиозаписей из html страницы """
 
     if filter_root_el is None:
         filter_root_el = {'id': 'au_search_items'}
 
     soup = BeautifulSoup(html, 'html.parser')
-    tracks = []
     ids = []
 
-    last_request = 0.0
-
     root_el = soup.find(**filter_root_el)
 
     if root_el is None:
@@ -338,19 +547,25 @@ def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True, http
             continue
 
         data_audio = json.loads(audio['data-audio'])
-        data_audio[13] = re.sub('(/+)', '/', data_audio[13].strip('/')).split('/')
-        if len(data_audio[13]) == 6:
-            data_audio[13] = [data_audio[13][2], data_audio[13][4]]
-        else:
-            data_audio[13] = data_audio[13][-2:]
+        audio_hashes = data_audio[13].split("/")
 
         full_id = (
-            str(data_audio[1]), str(data_audio[0]), data_audio[13][0], data_audio[13][1]
+            str(data_audio[1]), str(data_audio[0]), audio_hashes[2], audio_hashes[5]
         )
-        ids.append(full_id)
+
+        if all(full_id):
+            ids.append(full_id)
+
+    return ids
+
+
+def scrap_tracks(ids, user_id, http, convert_m3u8_links=True):
+    tracks = []
+
+    last_request = 0.0
 
     for ids_group in [ids[i:i + 10] for i in range(0, len(ids), 10)]:
-        delay = RPS_DELAY - (time.time() - last_request)
+        delay = RPS_DELAY_RELOAD_AUDIO - (time.time() - last_request)
 
         if delay > 0:
             time.sleep(delay)
@@ -375,18 +590,16 @@ def scrap_data(html, user_id, filter_root_el=None, convert_m3u8_links=True, http
                 if convert_m3u8_links and 'm3u8' in link:
                     link = RE_M3U8_TO_MP3.sub(r'\1/\2.mp3', link)
 
-                tracks.append({
+                yield {
                     'id': audio[0],
                     'owner_id': audio[1],
-                    'track_covers': audio[14].split(',') if audio[14] else '',
+                    'track_covers': audio[14].split(',') if audio[14] else [],
                     'url': link,
 
                     'artist': artist,
                     'title': title,
                     'duration': duration,
-                })
-
-    return tracks
+                }
 
 
 def scrap_albums(html):

From 47a8250df6222b16c752ee1310d0b802d8f7f1a7 Mon Sep 17 00:00:00 2001
From: dashedman <assarbsmail@gmail.com>
Date: Tue, 7 Jul 2020 09:16:59 +0300
Subject: [PATCH 12/16] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B8=D0=B7=D0=BE?=
 =?UTF-8?q?=D1=88=D0=B5=D0=BB=20=D1=83=D1=88=D0=B8=D0=B1=20=D0=BE=D1=87?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=A3=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B8=D0=BB?=
 =?UTF-8?q?=20=D0=BE=D0=B1=D1=8C=D0=B5=D0=BC=20=D0=BA=D0=BE=D0=B4=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BE=D1=84=D1=84=D1=81=D0=B5=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 143 ++++++++++++++++++++++++++++--------------------
 1 file changed, 85 insertions(+), 58 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 4617c089..1526d184 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -15,9 +15,9 @@
 
 from bs4 import BeautifulSoup
 
-from vk_api.audio_url_decoder import decode_audio_url
-from vk_api.exceptions import AccessDenied
-from vk_api.utils import set_cookies_from_list
+from .audio_url_decoder import decode_audio_url
+from .exceptions import AccessDenied
+from .utils import set_cookies_from_list
 
 RE_ALBUM_ID = re.compile(r'act=audio_playlist(-?\d+)_(\d+)')
 RE_ACCESS_HASH = re.compile(r'access_hash=(\w+)')
@@ -286,20 +286,15 @@ def search_iter(self, q, offset=0):
 
             #len(tracks) <= 10
             if offset_left + len(ids) >= offset:
-                if offset_left >= offset:
-                    tracks = scrap_tracks(
-                        ids,
-                        self.user_id,
-                        convert_m3u8_links=self.convert_m3u8_links,
-                        http=self._vk.http
-                    )
-                else:
-                    tracks = scrap_tracks(
-                        ids[offset - offset_left:],
-                        self.user_id,
-                        convert_m3u8_links=self.convert_m3u8_links,
-                        http=self._vk.http
-                    )
+                if offset_left < offset:
+                    ids = ids[offset - offset_left:]
+
+                tracks = scrap_tracks(
+                    ids,
+                    self.user_id,
+                    convert_m3u8_links=self.convert_m3u8_links,
+                    http=self._vk.http
+                )
 
                 if not tracks:
                     break
@@ -307,8 +302,6 @@ def search_iter(self, q, offset=0):
                 for track in tracks:
                     yield track
 
-            else:
-                pass
 
             offset_left += len(ids)
 
@@ -318,8 +311,58 @@ def search_iter(self, q, offset=0):
                     'al': 1,
                     'act': 'load_catalog_section',
                     'section_id': json_response['payload'][1][1]['sectionId'],
-                    'start_from': json_response['payload'][1][1]['nextFrom'],
-                    'offset':100
+                    'start_from': json_response['payload'][1][1]['nextFrom']
+                }
+            )
+            json_response = json.loads(response.text.replace('<!--', ''))
+
+
+    def get_updates_iter(self):
+        """ Искать обновления друзей (генератор) """
+
+        response = self._vk.http.post(
+            'https://vk.com/al_audio.php',
+            data={
+                'al': 1,
+                'act': 'section',
+                'claim': 0,
+                'is_layer': 0,
+                'owner_id': self.user_id,
+                'section': 'updates'
+            }
+        )
+        json_response = json.loads(response.text.replace('<!--', ''))
+
+        while True:
+            updates = [i['list'] for i in json_response['payload'][1][1]['playlists']]
+
+            ids = scrap_ids(
+                [i[0] for i in updates if i]
+            )
+
+            tracks = scrap_tracks(
+                ids,
+                self.user_id,
+                convert_m3u8_links=self.convert_m3u8_links,
+                http=self._vk.http
+            )
+
+            if not tracks:
+                break
+
+            for track in tracks:
+                yield track
+
+            if len(updates) < 11:
+                break
+
+            response = self._vk.http.post(
+                'https://vk.com/al_audio.php',
+                data={
+                    'al': 1,
+                    'act': 'load_catalog_section',
+                    'section_id': json_response['payload'][1][1]['sectionId'],
+                    'start_from': json_response['payload'][1][1]['nextFrom']
                 }
             )
             json_response = json.loads(response.text.replace('<!--', ''))
@@ -352,22 +395,17 @@ def get_popular_iter(self,offset=0):
                 json_response['payload'][1][1]['playlist']['list']
             )
 
-            #len(tracks) <= 10
+
             if offset_left + len(ids) >= offset:
-                if offset_left >= offset:
-                    tracks = scrap_tracks(
-                        ids,
-                        self.user_id,
-                        convert_m3u8_links=self.convert_m3u8_links,
-                        http=self._vk.http
-                    )
-                else:
-                    tracks = scrap_tracks(
-                        ids[offset - offset_left:],
-                        self.user_id,
-                        convert_m3u8_links=self.convert_m3u8_links,
-                        http=self._vk.http
-                    )
+                if offset_left < offset:
+                    ids = ids[offset - offset_left:]
+
+                tracks = scrap_tracks(
+                    ids,
+                    self.user_id,
+                    convert_m3u8_links=self.convert_m3u8_links,
+                    http=self._vk.http
+                )
 
                 if not tracks:
                     break
@@ -375,9 +413,6 @@ def get_popular_iter(self,offset=0):
                 for track in tracks:
                     yield track
 
-            else:
-                pass
-
             offset_left += len(ids)
 
             response = self._vk.http.post(
@@ -417,22 +452,17 @@ def get_news_iter(self,offset=0):
                 json_response['payload'][1][1]['playlists'][0]['list']
             )
 
-            #len(tracks) <= 10
+
             if offset_left + len(ids) >= offset:
-                if offset_left >= offset:
-                    tracks = scrap_tracks(
-                        ids,
-                        self.user_id,
-                        convert_m3u8_links=self.convert_m3u8_links,
-                        http=self._vk.http
-                    )
-                else:
-                    tracks = scrap_tracks(
-                        ids[offset - offset_left:],
-                        self.user_id,
-                        convert_m3u8_links=self.convert_m3u8_links,
-                        http=self._vk.http
-                    )
+                if offset_left < offset:
+                    ids = ids[offset - offset_left:]
+
+                tracks = scrap_tracks(
+                    ids,
+                    self.user_id,
+                    convert_m3u8_links=self.convert_m3u8_links,
+                    http=self._vk.http
+                )
 
                 if not tracks:
                     break
@@ -440,9 +470,6 @@ def get_news_iter(self,offset=0):
                 for track in tracks:
                     yield track
 
-            else:
-                pass
-
             offset_left += len(ids)
 
             response = self._vk.http.post(
@@ -482,7 +509,7 @@ def get_audio_by_id(self, owner_id, audio_id):
         if track:
             return next(track)
         else:
-            return ''
+            return []
 
     def get_post_audio(self, owner_id, post_id):
         """ Получить список аудиозаписей из поста пользователя или группы

From cef0c7da137a72dd7776e0027f952833992bc7d0 Mon Sep 17 00:00:00 2001
From: dashedman <assarbsmail@gmail.com>
Date: Wed, 8 Jul 2020 16:02:31 +0300
Subject: [PATCH 13/16] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BF=D1=83=D0=BB=D1=8F=D1=80=D0=BD=D1=8B=D1=85=20=D0=B8?=
 =?UTF-8?q?=20=D0=BD=D0=BE=D0=B2=D0=B8=D0=BD=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 1526d184..6dc7202f 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -551,6 +551,15 @@ def scrap_ids(audio_data):
     return ids
 
 
+def scrap_json(html_page):
+    """ Парсинг списка хэшей ауфдиозаписей новинок или популярных + nextFrom&sesionId """
+
+    find_json_pattern = r"new AudioPage\(.*?(\{.*\})"
+    fr = re.search(find_json_pattern, html_page).group(1)
+
+    return fr
+
+
 def scrap_ids_from_html(html, filter_root_el=None):
     """ Парсинг списка хэшей аудиозаписей из html страницы """
 
@@ -587,7 +596,6 @@ def scrap_ids_from_html(html, filter_root_el=None):
 
 
 def scrap_tracks(ids, user_id, http, convert_m3u8_links=True):
-    tracks = []
 
     last_request = 0.0
 

From da65def827758a7ae6675decc2f6e9c57ee23a4a Mon Sep 17 00:00:00 2001
From: dashedman <assarbsmail@gmail.com>
Date: Wed, 8 Jul 2020 16:54:03 +0300
Subject: [PATCH 14/16] =?UTF-8?q?ctrl+s=20=D0=B7=D0=B0=D0=B1=D1=8B=D0=BB?=
 =?UTF-8?q?=20=D0=BD=D0=B0=D0=B6=D0=B0=D1=82=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/audio.py | 153 +++++++++++++++++++++++++-----------------------
 1 file changed, 81 insertions(+), 72 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 93ec4851..0700d3ca 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -237,7 +237,6 @@ def search_user(self, owner_id=None, q=''):
                 json_response['payload'][1][1]['playlists'][0]['list']
             )
 
-
             tracks = scrap_tracks(
                 ids,
                 self.user_id,
@@ -257,7 +256,7 @@ def search(self, q, count=100, offset=0):
 
         return islice(self.search_iter(q, offset=offset), count)
 
-    def search_iter(self, q):
+    def search_iter(self, q, offset=0):
         """ Искать аудиозаписи (генератор)
         :param q: запрос
         """
@@ -275,6 +274,7 @@ def search_iter(self, q):
                 'q': q
             }
         )
+
         json_response = json.loads(response.text.replace('<!--', ''))
 
 
@@ -284,7 +284,6 @@ def search_iter(self, q):
                 json_response['payload'][1][1]['playlist']['list']
             )
 
-
             #len(tracks) <= 10
             if offset_left + len(ids) >= offset:
                 if offset_left < offset:
@@ -306,7 +305,6 @@ def search_iter(self, q):
 
             offset_left += len(ids)
 
-
             response = self._vk.http.post(
                 'https://vk.com/al_audio.php',
                 data={
@@ -376,60 +374,41 @@ def get_popular_iter(self,offset=0):
         :param offset: смещение
         """
 
-        offset_left = 0
-
         response = self._vk.http.post(
-            'https://vk.com/al_audio.php',
+            'https://vk.com/audio',
             data={
-                'al': 1,
-                'act': 'section',
-                'claim': 0,
-                'is_layer': 0,
-                'owner_id': self.user_id,
-                'section': 'recoms'
+                'block':'chart',
+                'section':'recoms'
             }
         )
-        json_response = json.loads(response.text.replace('<!--', ''))
-        #pprint(json_response)
-
-        while True:
-            ids = scrap_ids(
-                json_response['payload'][1][1]['playlist']['list']
-            )
-
-
-            if offset_left + len(ids) >= offset:
-                if offset_left < offset:
-                    ids = ids[offset - offset_left:]
+        json_response = json.loads(scrap_json(response.text))
 
-                tracks = scrap_tracks(
-                    ids,
-                    self.user_id,
-                    convert_m3u8_links=self.convert_m3u8_links,
-                    http=self._vk.http
-                )
+        ids = scrap_ids(
+            json_response['sectionData']['recoms']['playlist']['list']
+        )
 
-                if not tracks:
-                    break
+        #len(tracks) <= 10
+        if offset:
+            tracks = scrap_tracks(
+                ids[offset:],
+                self.user_id,
+                convert_m3u8_links=self.convert_m3u8_links,
+                http=self._vk.http
+            )
+        else:
+            tracks = scrap_tracks(
+                ids,
+                self.user_id,
+                convert_m3u8_links=self.convert_m3u8_links,
+                http=self._vk.http
+            )
 
-                for track in tracks:
-                    yield track
+        for track in tracks:
+            yield track
 
-            offset_left += len(ids)
-
-            response = self._vk.http.post(
-                'https://vk.com/al_audio.php',
-                data={
-                    'al': 1,
-                    'act': 'load_catalog_section',
-                    'section_id': json_response['payload'][1][1]['sectionId'],
-                    'start_from': json_response['payload'][1][1]['nextFrom']
-                }
-            )
-            json_response = json.loads(response.text.replace('<!--', ''))
 
     def get_news_iter(self,offset=0):
-        """ Искать новые аудиозаписи  (генератор)
+        """ Искать популярные аудиозаписи  (генератор)
 
         :param offset: смещение
         """
@@ -437,54 +416,84 @@ def get_news_iter(self,offset=0):
         offset_left = 0
 
         response = self._vk.http.post(
-            'https://vk.com/al_audio.php',
+            'https://vk.com/audio',
             data={
-                'al': 1,
-                'act': 'section',
-                'claim': 0,
-                'is_layer': 0,
-                'owner_id': self.user_id,
-                'section': 'recoms'
+                'block':'new_songs',
+                'section':'recoms'
             }
         )
-        json_response = json.loads(response.text.replace('<!--', ''))
-
-        while True:
-            ids = scrap_ids(
-                json_response['payload'][1][1]['playlists'][0]['list']
-            )
-
+        json_response = json.loads(scrap_json(response.text))
 
-            if offset_left + len(ids) >= offset:
-                if offset_left < offset:
-                    ids = ids[offset - offset_left:]
+        ids = scrap_ids(
+            json_response['sectionData']['recoms']['playlist']['list']
+        )
 
+        #len(tracks) <= 10
+        if offset_left + len(ids) >= offset:
+            if offset_left >= offset:
                 tracks = scrap_tracks(
                     ids,
                     self.user_id,
                     convert_m3u8_links=self.convert_m3u8_links,
                     http=self._vk.http
                 )
+            else:
+                tracks = scrap_tracks(
+                    ids[offset - offset_left:],
+                    self.user_id,
+                    convert_m3u8_links=self.convert_m3u8_links,
+                    http=self._vk.http
+                )
 
-                if not tracks:
-                    break
+            for track in tracks:
+                yield track
 
-                for track in tracks:
-                    yield track
 
-            offset_left += len(ids)
+        offset_left += len(ids)
 
+        while True:
             response = self._vk.http.post(
                 'https://vk.com/al_audio.php',
                 data={
                     'al': 1,
                     'act': 'load_catalog_section',
-                    'section_id': json_response['payload'][1][1]['sectionId'],
-                    'start_from': json_response['payload'][1][1]['nextFrom']
+                    'section_id': json_response['sectionData']['recoms']['sectionId'],
+                    'start_from': json_response['sectionData']['recoms']['nextFrom']
                 }
             )
+
             json_response = json.loads(response.text.replace('<!--', ''))
 
+            ids = scrap_ids(
+                json_response['payload'][1][1]['playlist']['list']
+            )
+
+            #len(tracks) <= 10
+            if offset_left + len(ids) >= offset:
+                if offset_left >= offset:
+                    tracks = scrap_tracks(
+                        ids,
+                        self.user_id,
+                        convert_m3u8_links=self.convert_m3u8_links,
+                        http=self._vk.http
+                    )
+                else:
+                    tracks = scrap_tracks(
+                        ids[offset - offset_left:],
+                        self.user_id,
+                        convert_m3u8_links=self.convert_m3u8_links,
+                        http=self._vk.http
+                    )
+
+                if not tracks:
+                    break
+
+                for track in tracks:
+                    yield track
+
+
+            offset_left += len(ids)
+
 
     def get_audio_by_id(self, owner_id, audio_id):
         """ Получить аудиозапись по ID

From 509fac5f9ae396f0062a25a00ccf76173ee2250b Mon Sep 17 00:00:00 2001
From: dashedman <assarbsmail@gmail.com>
Date: Mon, 3 May 2021 22:17:32 +0300
Subject: [PATCH 15/16] fix infinite loop in audio search

---
 vk_api/audio.py | 80 ++++++++++++++++---------------------------------
 1 file changed, 26 insertions(+), 54 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 0700d3ca..c38ce74b 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -128,6 +128,8 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
             ids = scrap_ids(
                 response['data'][0]['list']
             )
+            if not ids:
+                break
 
             tracks = scrap_tracks(
                 ids,
@@ -136,9 +138,6 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
                 convert_m3u8_links=self.convert_m3u8_links
             )
 
-            if not tracks:
-                break
-
             for i in tracks:
                 yield i
 
@@ -283,6 +282,8 @@ def search_iter(self, q, offset=0):
             ids = scrap_ids(
                 json_response['payload'][1][1]['playlist']['list']
             )
+            if not ids:
+                break
 
             #len(tracks) <= 10
             if offset_left + len(ids) >= offset:
@@ -296,9 +297,6 @@ def search_iter(self, q, offset=0):
                     http=self._vk.http
                 )
 
-                if not tracks:
-                    break
-
                 for track in tracks:
                     yield track
 
@@ -339,6 +337,8 @@ def get_updates_iter(self):
             ids = scrap_ids(
                 [i[0] for i in updates if i]
             )
+            if not ids:
+                break
 
             tracks = scrap_tracks(
                 ids,
@@ -347,9 +347,6 @@ def get_updates_iter(self):
                 http=self._vk.http
             )
 
-            if not tracks:
-                break
-
             for track in tracks:
                 yield track
 
@@ -388,20 +385,12 @@ def get_popular_iter(self,offset=0):
         )
 
         #len(tracks) <= 10
-        if offset:
-            tracks = scrap_tracks(
-                ids[offset:],
-                self.user_id,
-                convert_m3u8_links=self.convert_m3u8_links,
-                http=self._vk.http
-            )
-        else:
-            tracks = scrap_tracks(
-                ids,
-                self.user_id,
-                convert_m3u8_links=self.convert_m3u8_links,
-                http=self._vk.http
-            )
+        tracks = scrap_tracks(
+            ids[offset:] if offset else ids,
+            self.user_id,
+            convert_m3u8_links=self.convert_m3u8_links,
+            http=self._vk.http
+        )
 
         for track in tracks:
             yield track
@@ -430,20 +419,12 @@ def get_news_iter(self,offset=0):
 
         #len(tracks) <= 10
         if offset_left + len(ids) >= offset:
-            if offset_left >= offset:
-                tracks = scrap_tracks(
-                    ids,
-                    self.user_id,
-                    convert_m3u8_links=self.convert_m3u8_links,
-                    http=self._vk.http
-                )
-            else:
-                tracks = scrap_tracks(
-                    ids[offset - offset_left:],
-                    self.user_id,
-                    convert_m3u8_links=self.convert_m3u8_links,
-                    http=self._vk.http
-                )
+            tracks = scrap_tracks(
+                ids if offset_left >= offset else ids[offset - offset_left:],
+                self.user_id,
+                convert_m3u8_links=self.convert_m3u8_links,
+                http=self._vk.http
+            )
 
             for track in tracks:
                 yield track
@@ -467,26 +448,17 @@ def get_news_iter(self,offset=0):
             ids = scrap_ids(
                 json_response['payload'][1][1]['playlist']['list']
             )
+            if not ids:
+                break
 
             #len(tracks) <= 10
             if offset_left + len(ids) >= offset:
-                if offset_left >= offset:
-                    tracks = scrap_tracks(
-                        ids,
-                        self.user_id,
-                        convert_m3u8_links=self.convert_m3u8_links,
-                        http=self._vk.http
-                    )
-                else:
-                    tracks = scrap_tracks(
-                        ids[offset - offset_left:],
-                        self.user_id,
-                        convert_m3u8_links=self.convert_m3u8_links,
-                        http=self._vk.http
-                    )
-
-                if not tracks:
-                    break
+                tracks = scrap_tracks(
+                    ids if offset_left >= offset else ids[offset - offset_left:],
+                    self.user_id,
+                    convert_m3u8_links=self.convert_m3u8_links,
+                    http=self._vk.http
+                )
 
                 for track in tracks:
                     yield track

From b5d582dc0833a1ea30f0102b2e8da8874893e273 Mon Sep 17 00:00:00 2001
From: python273 <iam@python273.pw>
Date: Mon, 3 May 2021 23:58:09 +0300
Subject: [PATCH 16/16] Clean audio.py

---
 vk_api/audio.py | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 3e08c2f0..3409b3e9 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -6,8 +6,6 @@
 :copyright: (c) 2019 python273
 """
 
-from pprint import pprint
-
 import re
 import json
 import time
@@ -33,6 +31,7 @@
 
 class VkAudio(object):
     """ Модуль для получения аудиозаписей без использования официального API.
+
     :param vk: Объект :class:`VkApi`
     """
 
@@ -89,6 +88,7 @@ def __init__(self, vk, convert_m3u8_links=True):
 
     def get_iter(self, owner_id=None, album_id=None, access_hash=None):
         """ Получить список аудиозаписей пользователя (по частям)
+
         :param owner_id: ID владельца (отрицательные значения для групп)
         :param album_id: ID альбома
         :param access_hash: ACCESS_HASH альбома
@@ -148,6 +148,7 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
 
     def get(self, owner_id=None, album_id=None, access_hash=None):
         """ Получить список аудиозаписей пользователя
+
         :param owner_id: ID владельца (отрицательные значения для групп)
         :param album_id: ID альбома
         :param access_hash: ACCESS_HASH альбома
@@ -157,6 +158,7 @@ def get(self, owner_id=None, album_id=None, access_hash=None):
 
     def get_albums_iter(self, owner_id=None):
         """ Получить список альбомов пользователя (по частям)
+
         :param owner_id: ID владельца (отрицательные значения для групп)
         """
 
@@ -195,6 +197,7 @@ def get_albums_iter(self, owner_id=None):
 
     def get_albums(self, owner_id=None):
         """ Получить список альбомов пользователя
+
         :param owner_id: ID владельца (отрицательные значения для групп)
         """
 
@@ -202,6 +205,7 @@ def get_albums(self, owner_id=None):
 
     def search_user(self, owner_id=None, q=''):
         """ Искать по аудиозаписям пользователя
+
         :param owner_id: ID владельца (отрицательные значения для групп)
         :param q: запрос
         """
@@ -249,6 +253,7 @@ def search_user(self, owner_id=None, q=''):
 
     def search(self, q, count=100, offset=0):
         """ Искать аудиозаписи
+
         :param q: запрос
         :param count: количество
         :param offset: смещение
@@ -258,7 +263,9 @@ def search(self, q, count=100, offset=0):
 
     def search_iter(self, q, offset=0):
         """ Искать аудиозаписи (генератор)
+
         :param q: запрос
+        :param offset: смещение
         """
         offset_left = 0
 
@@ -285,7 +292,6 @@ def search_iter(self, q, offset=0):
             if not ids:
                 break
 
-            #len(tracks) <= 10
             if offset_left + len(ids) >= offset:
                 if offset_left < offset:
                     ids = ids[offset - offset_left:]
@@ -300,7 +306,6 @@ def search_iter(self, q, offset=0):
                 for track in tracks:
                     yield track
 
-
             offset_left += len(ids)
 
             response = self._vk.http.post(
@@ -314,7 +319,6 @@ def search_iter(self, q, offset=0):
             )
             json_response = json.loads(response.text.replace('<!--', ''))
 
-            
     def get_updates_iter(self):
         """ Искать обновления друзей (генератор) """
 
@@ -364,8 +368,7 @@ def get_updates_iter(self):
             )
             json_response = json.loads(response.text.replace('<!--', ''))
 
-
-    def get_popular_iter(self,offset=0):
+    def get_popular_iter(self, offset=0):
         """ Искать популярные аудиозаписи  (генератор)
 
         :param offset: смещение
@@ -374,8 +377,8 @@ def get_popular_iter(self,offset=0):
         response = self._vk.http.post(
             'https://vk.com/audio',
             data={
-                'block':'chart',
-                'section':'recoms'
+                'block': 'chart',
+                'section': 'recoms'
             }
         )
         json_response = json.loads(scrap_json(response.text))
@@ -384,7 +387,6 @@ def get_popular_iter(self,offset=0):
             json_response['sectionData']['recoms']['playlist']['list']
         )
 
-        #len(tracks) <= 10
         tracks = scrap_tracks(
             ids[offset:] if offset else ids,
             self.user_id,
@@ -395,8 +397,7 @@ def get_popular_iter(self,offset=0):
         for track in tracks:
             yield track
 
-
-    def get_news_iter(self,offset=0):
+    def get_news_iter(self, offset=0):
         """ Искать популярные аудиозаписи  (генератор)
 
         :param offset: смещение
@@ -407,8 +408,8 @@ def get_news_iter(self,offset=0):
         response = self._vk.http.post(
             'https://vk.com/audio',
             data={
-                'block':'new_songs',
-                'section':'recoms'
+                'block': 'new_songs',
+                'section': 'recoms'
             }
         )
         json_response = json.loads(scrap_json(response.text))
@@ -417,7 +418,6 @@ def get_news_iter(self,offset=0):
             json_response['sectionData']['recoms']['playlist']['list']
         )
 
-        #len(tracks) <= 10
         if offset_left + len(ids) >= offset:
             tracks = scrap_tracks(
                 ids if offset_left >= offset else ids[offset - offset_left:],
@@ -450,7 +450,6 @@ def get_news_iter(self,offset=0):
             if not ids:
                 break
 
-            #len(tracks) <= 10
             if offset_left + len(ids) >= offset:
                 tracks = scrap_tracks(
                     ids if offset_left >= offset else ids[offset - offset_left:],
@@ -466,6 +465,7 @@ def get_news_iter(self,offset=0):
 
     def get_audio_by_id(self, owner_id, audio_id):
         """ Получить аудиозапись по ID
+
         :param owner_id: ID владельца (отрицательные значения для групп)
         :param audio_id: ID аудио
         """
@@ -493,6 +493,7 @@ def get_audio_by_id(self, owner_id, audio_id):
 
     def get_post_audio(self, owner_id, post_id):
         """ Получить список аудиозаписей из поста пользователя или группы
+
         :param owner_id: ID владельца (отрицательные значения для групп)
         :param post_id: ID поста
         """