vkaudio now is independent class

Author: neigrok

examples/get_all_audio.py

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
+import collections
 import vk_api
 
 
@@ -14,7 +15,7 @@ def main():
         print(error_msg)
         return
 
-    vk = vk_session.get_api()
+    vkaudio = vk_session.get_audio()
 
     """
         VkApi.audio.get и VkApi.audio.search делает запросы к странице m.vk.com
@@ -26,28 +27,27 @@ def main():
     """
 
     count = 0
-    artists = {}
+    artists = collections.Counter()
     while True:
-        audios = vk.audio.get(owner_id=-99463083, offset=count)
+        audios = vkaudio.get(owner_id=-99463083, offset=count)
         print('offset=', count)
         for audio in audios:
-            try:
-                artists[audio['artist']] += 1
-            except KeyError:
-                artists[audio['artist']] = 1
+            artists[audio['artist']] += 1
 
         count += len(audios)
 
         if len(audios) == 0:
             break
 
     # состаляем рейтинг первых 15
+    print('\nTop 15:')
     sorted_artists = sorted(artists, key=artists.get, reverse=True)
     for artist in sorted_artists[:15]:
         print('{} - {} tracks added'.format(artist, artists[artist]))
 
     # ищем треки самого популярного
-    tracks = vk.audio.search(q=sorted_artists[0])
+    print('\nSearch for ', sorted_artists[0])
+    tracks = vkaudio.search(q=sorted_artists[0])
     for n, track in enumerate(tracks[:10]):
         print('{}. {}'.format(n+1, track['title']))
 

examples/get_full_wall.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import vk_api
 
+
 def main():
     """ Пример получения всех постов со стены """
 

vk_api/exceptions.py

@@ -15,7 +15,7 @@ class VkApiError(Exception):
     pass
 
 
-class AccessRightsError(Exception):
+class AccessDenied (VkApiError):
     pass
 
 

vk_api/vk_api.py

@@ -378,6 +378,9 @@ def auth_handler(self):
     def get_api(self):
         return VkApiMethod(self)
 
+    def get_audio(self):
+        return VKAudio(self)
+
     def method(self, method, values=None, captcha_sid=None, captcha_key=None, raw=False):
         """ Использование методов API
 
@@ -459,8 +462,6 @@ def __init__(self, vk, method=None):
         self._vk = vk
         self._method = method
 
-        self.audio = VKAudio(vk)  # audio branch
-
     def __getattr__(self, method):
         if self._method:
             self._method += '.' + method

vk_api/vk_audio.py

@@ -1,6 +1,6 @@
 from bs4 import BeautifulSoup
 import re
-from .exceptions import AccessRightsError
+from .exceptions import AccessDenied
 
 RE_VALUE = re.compile(r'>(.*?)<')
 RE_DURATION = re.compile(r'data-dur="([0-9]*)"')
@@ -10,35 +10,36 @@ class VKAudio:
     def __init__(self, vk):
         self._vk = vk
 
-    def get(self, **kwargs):
-        response = self._vk.http.get('https://m.vk.com/audios{}'.format(kwargs['owner_id']),
-                                     params={'offset': kwargs.get('offset', 0)},
-                                     allow_redirects=False)
+    def get(self, owner_id, offset=0):
+        """ Получение html со списком аудиозаписей пользователя"""
+        response = self._vk.http.get(
+            'https://m.vk.com/audios{}'.format(owner_id),
+            params={'offset': offset},
+            allow_redirects=False)
+
         if response.text == '':
-            raise AccessRightsError("You dont have permissions to browse {}'s audios".format(kwargs['owner_id']))
+            raise AccessDenied("You dont have permissions to browse {}'s audios".format(kwargs['owner_id']))
         return scrap_data(response.text)
 
-    def search(self, **kwargs):
-        response = self._vk.http.get('https://m.vk.com/audio', params={'act': 'search',
-                                                                       'q': kwargs['q'],
-                                                                       'offset': kwargs.get('offset', 0)})
+    def search(self, q='', offset=0):
+        """ Получение html со списком аудиозаписей по запросу """
+        response = self._vk.http.get(
+            'https://m.vk.com/audio',
+            params={'act': 'search',
+                    'q': q,
+                    'offset': offset})
         return scrap_data(response.text)
 
 
 def value(tag, duration=False):
-    string = str(tag)
+    """ Извлечение значений из html тега """
     if duration:
-        regex = RE_DURATION
-    else:
-        regex = RE_VALUE
-    extracted = regex.search(string)
-    if extracted:
-        groups = extracted.groups()
-        return groups[0]
-    return None
+        return tag[0]['data-dur']
+    return tag[0].text
 
 
 def scrap_data(html):
+    """ Сбор информации из html и записывание ее в словарь """
     soup = BeautifulSoup(html, "html.parser")
     songs = []