From 11283026c67d22240071e49c0c7a12ab5720506f Mon Sep 17 00:00:00 2001
From: Zak <60068872+Zakovskiy@users.noreply.github.com>
Date: Sat, 4 Mar 2023 21:37:09 +0300
Subject: [PATCH 1/5] Creating and editing an audio in the web version.

Added a function for uploading and editing audio in the web version of the site.
---
 vk_api/audio.py | 104 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 0589755..7c620b0 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -16,6 +16,7 @@
 from .audio_url_decoder import decode_audio_url
 from .exceptions import AccessDenied
 from .utils import set_cookies_from_list
+from .upload import FilesOpener
 
 RE_ALBUM_ID = re.compile(r'act=audio_playlist(-?\d+)_(\d+)')
 RE_ACCESS_HASH = re.compile(r'access_hash=(\w+)')
@@ -252,6 +253,90 @@ def search_user(self, owner_id=None, q=''):
         else:
             return []
 
+    def edit_audio(self, audio_id: int, owner_id: int, hash: str, performer: str, title: str, text: str = "", genre: int = 1001):
+        """ Редактировать аудиозапись
+
+        :param audio_id: ID аудиозаписи
+        :param owner_id: ID владельца (отрицательные значения для групп)
+        :param hash: хэш для редактирования аудиозаписи
+        :param performer: название аудиозаписи
+        :param title: заголовок аудиозаписи
+        :param test: текст аудиозаписи
+        """
+        data = {
+            'al': 1,
+            'act': 'edit_audio',
+            'aid': audio_id,
+            'oid': owner_id,
+            'force_edit_hash': '',
+            'hash': hash,
+            'performer': performer,
+            'text': text,
+            'title': title,
+            'genre': genre
+        }
+        response = self._vk.http.post(
+            'https://vk.com/al_audio.php',
+            data=data
+        )
+        json_response = json.loads(response.text.replace('<!--', ''))
+        return json_response["payload"][1][0]
+
+    def new_audio(self, group_id: int):
+        """ Получение данных для новой аудиозаписи
+
+        :param group_id: ID группы
+        """
+
+        response = self._vk.http.post(
+            'https://vk.com/al_audio.php',
+            data={
+                'al': 1,
+                'act': 'new_audio',
+                'boxhash': base36encode(),
+                'gid': group_id
+            }
+        )
+        json_response = json.loads(response.text.replace('<!--', ''))
+
+        return json_response["payload"][1]
+
+    def get_upload_url(self, group_id: int):
+        """ Получение ссылки для залива аудиозаписи
+
+        :param group_id: ID группы
+        """
+        response = self.new_audio(group_id)[2]
+        return re.search("(https?:[^']*)", response).group(0)
+
+    def done_add(self, uploader_response: str):
+        """ Подтверждение загрузки аудиозаписи
+
+        :param uploader_response: результат залива аудиозаписи
+        """
+        response = self._vk.http.post(
+            'https://vk.com/al_audio.php',
+            data={
+                'al': 1,
+                'act': 'done_add',
+                'go_uploader_response': uploader_response,
+                'upldr': 1
+            }
+        )
+        json_response = json.loads(response.text.replace('<!--', ''))
+        return json_response["payload"][1][0]
+
+    def upload_audio(self, audio: str, group_id: int):
+        """ Загрузка аудиозаписи
+
+        :param group_id: ID группы
+        """
+        url = self.get_upload_url(group_id)
+        with FilesOpener(audio, key_format='file') as f:
+            uploader_response = self._vk.http.post(url, files=f).json()
+        response = self.done_add(json.dumps(uploader_response))
+        return response
+
     def search(self, q, count=100, offset=0):
         """ Искать аудиозаписи
 
@@ -680,3 +765,22 @@ def scrap_albums(html):
         })
 
     return albums
+
+def base36encode():
+    number = int(time.time() * 1000)
+    alphabet = '0123456789abcdefghijklmnopqrstuvwxyz'
+    base36 = ''
+    sign = ''
+
+    if number < 0:
+        sign = '-'
+        number = -number
+
+    if 0 <= number < len(alphabet):
+        return sign + alphabet[number]
+
+    while number != 0:
+        number, i = divmod(number, len(alphabet))
+        base36 = alphabet[i] + base36
+
+    return sign + base36

From c96bdf7d62828325b1c4103cd0a2b029db40826d Mon Sep 17 00:00:00 2001
From: Zak <60068872+Zakovskiy@users.noreply.github.com>
Date: Sat, 4 Mar 2023 21:43:44 +0300
Subject: [PATCH 2/5] Update audio.py

Corrected the commentary
---
 vk_api/audio.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 7c620b0..86b02be 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -261,7 +261,8 @@ def edit_audio(self, audio_id: int, owner_id: int, hash: str, performer: str, ti
         :param hash: хэш для редактирования аудиозаписи
         :param performer: название аудиозаписи
         :param title: заголовок аудиозаписи
-        :param test: текст аудиозаписи
+        :param text: текст аудиозаписи
+        :param genre: жанр аудиозаписи
         """
         data = {
             'al': 1,

From bfbdb9db7b992eafb97907e0bbfba983f0567f4c Mon Sep 17 00:00:00 2001
From: Zak <60068872+Zakovskiy@users.noreply.github.com>
Date: Sat, 4 Mar 2023 21:57:15 +0300
Subject: [PATCH 3/5] Update audio.py

Corrected the commentary 2.0
---
 vk_api/audio.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 86b02be..9160c5e 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -283,10 +283,10 @@ def edit_audio(self, audio_id: int, owner_id: int, hash: str, performer: str, ti
         json_response = json.loads(response.text.replace('<!--', ''))
         return json_response["payload"][1][0]
 
-    def new_audio(self, group_id: int):
+    def new_audio(self, group_id: int = 0):
         """ Получение данных для новой аудиозаписи
 
-        :param group_id: ID группы
+        :param group_id: ID группы, для юзера - 0
         """
 
         response = self._vk.http.post(
@@ -302,10 +302,10 @@ def new_audio(self, group_id: int):
 
         return json_response["payload"][1]
 
-    def get_upload_url(self, group_id: int):
+    def get_upload_url(self, group_id: int = 0):
         """ Получение ссылки для залива аудиозаписи
 
-        :param group_id: ID группы
+        :param group_id: ID группы, для юзера - 0
         """
         response = self.new_audio(group_id)[2]
         return re.search("(https?:[^']*)", response).group(0)
@@ -327,10 +327,10 @@ def done_add(self, uploader_response: str):
         json_response = json.loads(response.text.replace('<!--', ''))
         return json_response["payload"][1][0]
 
-    def upload_audio(self, audio: str, group_id: int):
+    def upload_audio(self, audio: str, group_id: int = 0):
         """ Загрузка аудиозаписи
 
-        :param group_id: ID группы
+        :param group_id: ID группы, для юзера - 0
         """
         url = self.get_upload_url(group_id)
         with FilesOpener(audio, key_format='file') as f:

From a4de4c0df12f83409cbebe91b0cdc3805b60375c Mon Sep 17 00:00:00 2001
From: Zak <60068872+Zakovskiy@users.noreply.github.com>
Date: Thu, 23 Mar 2023 00:35:35 +0300
Subject: [PATCH 4/5] Update audio.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

укоротил
---
 vk_api/audio.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 9160c5e..9e6b796 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -771,17 +771,9 @@ def base36encode():
     number = int(time.time() * 1000)
     alphabet = '0123456789abcdefghijklmnopqrstuvwxyz'
     base36 = ''
-    sign = ''
-
-    if number < 0:
-        sign = '-'
-        number = -number
-
-    if 0 <= number < len(alphabet):
-        return sign + alphabet[number]
 
     while number != 0:
         number, i = divmod(number, len(alphabet))
         base36 = alphabet[i] + base36
 
-    return sign + base36
+    return base36

From 5f2c5bd80b4ff55411495231c1183d083896c702 Mon Sep 17 00:00:00 2001
From: Zak <60068872+Zakovskiy@users.noreply.github.com>
Date: Thu, 23 Mar 2023 00:42:54 +0300
Subject: [PATCH 5/5] Update audio.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

сократил загрузку аудио в одну функцию
---
 vk_api/audio.py | 66 ++++++++++++++-----------------------------------
 1 file changed, 19 insertions(+), 47 deletions(-)

diff --git a/vk_api/audio.py b/vk_api/audio.py
index 9e6b796..f7b9d88 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -264,31 +264,29 @@ def edit_audio(self, audio_id: int, owner_id: int, hash: str, performer: str, ti
         :param text: текст аудиозаписи
         :param genre: жанр аудиозаписи
         """
-        data = {
-            'al': 1,
-            'act': 'edit_audio',
-            'aid': audio_id,
-            'oid': owner_id,
-            'force_edit_hash': '',
-            'hash': hash,
-            'performer': performer,
-            'text': text,
-            'title': title,
-            'genre': genre
-        }
         response = self._vk.http.post(
             'https://vk.com/al_audio.php',
-            data=data
+            data={
+                'al': 1,
+                'act': 'edit_audio',
+                'aid': audio_id,
+                'oid': owner_id,
+                'force_edit_hash': '',
+                'hash': hash,
+                'performer': performer,
+                'text': text,
+                'title': title,
+                'genre': genre
+            }
         )
         json_response = json.loads(response.text.replace('<!--', ''))
         return json_response["payload"][1][0]
 
-    def new_audio(self, group_id: int = 0):
-        """ Получение данных для новой аудиозаписи
+    def upload_audio(self, audio: str, group_id: int = 0):
+        """ Загрузка аудиозаписи
 
         :param group_id: ID группы, для юзера - 0
         """
-
         response = self._vk.http.post(
             'https://vk.com/al_audio.php',
             data={
@@ -298,45 +296,19 @@ def new_audio(self, group_id: int = 0):
                 'gid': group_id
             }
         )
-        json_response = json.loads(response.text.replace('<!--', ''))
-
-        return json_response["payload"][1]
-
-    def get_upload_url(self, group_id: int = 0):
-        """ Получение ссылки для залива аудиозаписи
-
-        :param group_id: ID группы, для юзера - 0
-        """
-        response = self.new_audio(group_id)[2]
-        return re.search("(https?:[^']*)", response).group(0)
-
-    def done_add(self, uploader_response: str):
-        """ Подтверждение загрузки аудиозаписи
-
-        :param uploader_response: результат залива аудиозаписи
-        """
+        url = re.search("(https?:[^']*)", json.loads(response.text.replace('<!--', ''))["payload"][1][2]).group(0)
+        with FilesOpener(audio, key_format='file') as f:
+            uploader_response = self._vk.http.post(url, files=f).json()
         response = self._vk.http.post(
             'https://vk.com/al_audio.php',
             data={
                 'al': 1,
                 'act': 'done_add',
-                'go_uploader_response': uploader_response,
+                'go_uploader_response': json.dumps(uploader_response),
                 'upldr': 1
             }
         )
-        json_response = json.loads(response.text.replace('<!--', ''))
-        return json_response["payload"][1][0]
-
-    def upload_audio(self, audio: str, group_id: int = 0):
-        """ Загрузка аудиозаписи
-
-        :param group_id: ID группы, для юзера - 0
-        """
-        url = self.get_upload_url(group_id)
-        with FilesOpener(audio, key_format='file') as f:
-            uploader_response = self._vk.http.post(url, files=f).json()
-        response = self.done_add(json.dumps(uploader_response))
-        return response
+        return json.loads(response.text.replace('<!--', ''))["payload"][1][0]
 
     def search(self, q, count=100, offset=0):
         """ Искать аудиозаписи