Improve albums example

Author: vanyasem

examples/get_album_audio.py

@@ -19,31 +19,27 @@ def main():
 
     vkaudio = VkAudio(vk_session)
 
-    artists = collections.Counter()
-
+    albums = []
     offset = 0
 
     while True:
-        albums = vkaudio.get_albums(owner_id='194957739', offset=offset)
+        temp_albums = vkaudio.get_albums(owner_id='194957739', offset=offset)
 
-        if not albums:
+        if not temp_albums:
             break
 
-        for album in albums:
-            artists[album['artist']] += 1
+        for album in temp_albums:
+            albums.append(album)
 
-        offset += len(albums)
+        offset += len(temp_albums)
 
-    # Составляем рейтинг первых 15
-    print('\nTop 15:')
-    for artist, tracks in artists.most_common(15):
-        print('{} - {} tracks'.format(artist, tracks))
+    print('\nLast 5:')
+    for album in albums[:5]:
+        print(album['title'])
 
     # Ищем треки последнего альбома
-    album = vkaudio.get(owner_id='194957739', get_albums=True)[0]
-    print('\nSearch for', album['title'])
-
-    tracks = vkaudio.get(album_id=album['id'][25:])
+    print('\nSearch for', albums[0]['title'])
+    tracks = vkaudio.get(album_id=albums[0]['id'][25:])
 
     for n, track in enumerate(tracks, 1):
         print('{}. {} {}'.format(n, track['title'], track['url']))

vk_api/audio.py

@@ -31,14 +31,13 @@ def get(self, owner_id=None, album_id=None, offset=0):
         elif owner_id is not None and album_id is not None:
             raise TypeError('get() too many arguments')
 
-        user_id = owner_id
-        url = 'https://m.vk.com/audios{}'
         if album_id is not None:
-            user_id = album_id
-            url = 'https://m.vk.com/audio?act=audio_playlist{}'
+            url = 'https://m.vk.com/audio?act=audio_playlist{}'.format(album_id)
+        else:
+            url = 'https://m.vk.com/audios{}'.format(owner_id)
 
         response = self._vk.http.get(
-            url.format(user_id),
+            url,
             params={
                 'offset': offset
             },
@@ -47,9 +46,7 @@ def get(self, owner_id=None, album_id=None, offset=0):
 
         if not response.text:
             raise AccessDenied(
-                'You don\'t have permissions to browse {}\'s audio'.format(
-                    user_id
-                )
+                'You don\'t have permissions to browse user\'s audio'
             )
 
         return scrap_data(response.text)