add. pass VkApi/VkApiMethod (VkUpload) (#215)

Author: ALEXREDX

vk_api/upload.py

@@ -6,6 +6,9 @@
 :copyright: (c) 2018 python273
 """
 
+from .vk_api import VkApi, VkApiMethod
+
+
 STORY_ALLOWED_LINK_TEXTS = {
     'to_store', 'vote', 'more', 'book', 'order',
     'enroll', 'fill', 'signup', 'buy', 'ticket',
@@ -17,13 +20,26 @@
 class VkUpload(object):
     """ Загрузка файлов через API (https://vk.com/dev/upload_files)
 
-    :param vk: объект :class:`VkApi`
+    :param vk: объект :class:`VkApi` или :class:`VkApiMethod`
     """
 
     __slots__ = ('vk',)
 
     def __init__(self, vk):
-        self.vk = vk
+
+        if not isinstance(vk, (VkApi, VkApiMethod)):
+            raise TypeError(
+                'The arg should be VkApi or VkApiMethod instance'
+            )
+
+        if isinstance(vk, VkApiMethod):
+            self.vk = vk
+        else:
+            self.vk = vk.get_api()
+
+    @property
+    def http(self):
+        return self.vk._vk.http
 
     def photo(self, photos, album_id,
               latitude=None, longitude=None, caption=None, description=None,
@@ -48,10 +64,10 @@ def photo(self, photos, album_id,
         if group_id:
             values['group_id'] = group_id
 
-        url = self.vk.method('photos.getUploadServer', values)['upload_url']
+        url = self.vk.photos.getUploadServer(**values)['upload_url']
 
         with FilesOpener(photos) as photo_files:
-            response = self.vk.http.post(url, files=photo_files).json()
+            response = self.http.post(url, files=photo_files).json()
 
         if 'album_id' not in response:
             response['album_id'] = response['aid']
@@ -65,7 +81,7 @@ def photo(self, photos, album_id,
 
         values.update(response)
 
-        return self.vk.method('photos.save', values)
+        return self.vk.photos.save(**values)
 
     def photo_messages(self, photos):
         """ Загрузка изображений в сообщения
@@ -74,12 +90,12 @@ def photo_messages(self, photos):
         :type photos: str or list
         """
 
-        url = self.vk.method('photos.getMessagesUploadServer')['upload_url']
+        url = self.vk.photos.getMessagesUploadServer()['upload_url']
 
         with FilesOpener(photos) as photo_files:
-            response = self.vk.http.post(url, files=photo_files)
+            response = self.http.post(url, files=photo_files)
 
-        return self.vk.method('photos.saveMessagesPhoto', response.json())
+        return self.vk.photos.saveMessagesPhoto(**response.json())
 
     def photo_profile(self, photo, owner_id=None, crop_x=None, crop_y=None,
                       crop_width=None):
@@ -108,17 +124,17 @@ def photo_profile(self, photo, owner_id=None, crop_x=None, crop_y=None,
                 crop_x, crop_y, crop_width
             )
 
-        response = self.vk.method('photos.getOwnerPhotoUploadServer', values)
+        response = self.vk.photos.getOwnerPhotoUploadServer(**values)
         url = response['upload_url']
 
         with FilesOpener(photo, key_format='file') as photo_files:
-            response = self.vk.http.post(
+            response = self.http.post(
                 url,
                 data=crop_params,
                 files=photo_files
             )
 
-        return self.vk.method('photos.saveOwnerPhoto', response.json())
+        return self.vk.photos.saveOwnerPhoto(**response.json())
 
     def photo_chat(self, photo, chat_id):
         """ Загрузка и смена обложки в беседе
@@ -128,14 +144,14 @@ def photo_chat(self, photo, chat_id):
         """
 
         values = {'chat_id': chat_id}
-        url = self.vk.method('photos.getChatUploadServer', values)['upload_url']
+        url = self.vk.photos.getChatUploadServer(**values)['upload_url']
 
         with FilesOpener(photo, key_format='file') as photo_file:
-            response = self.vk.http.post(url, files=photo_file)
+            response = self.http.post(url, files=photo_file)
 
-        return self.vk.method('messages.setChatPhoto', {
-            'file': response.json()['response']
-        })
+        return self.vk.messages.setChatPhoto(
+            file=response.json()['response']
+        )
 
     def photo_wall(self, photos, user_id=None, group_id=None):
         """ Загрузка изображений на стену пользователя или в группу
@@ -154,15 +170,15 @@ def photo_wall(self, photos, user_id=None, group_id=None):
         elif group_id:
             values['group_id'] = group_id
 
-        response = self.vk.method('photos.getWallUploadServer', values)
+        response = self.vk.photos.getWallUploadServer(**values)
         url = response['upload_url']
 
         with FilesOpener(photos) as photos_files:
-            response = self.vk.http.post(url, files=photos_files)
+            response = self.http.post(url, files=photos_files)
 
         values.update(response.json())
 
-        return self.vk.method('photos.saveWallPhoto', values)
+        return self.vk.photos.saveWallPhoto(**values)
 
     def audio(self, audio, artist, title):
         """ Загрузка аудио
@@ -172,17 +188,17 @@ def audio(self, audio, artist, title):
         :param title: название
         """
 
-        url = self.vk.method('audio.getUploadServer')['upload_url']
+        url = self.vk.audio.getUploadServer()['upload_url']
 
         with FilesOpener(audio, key_format='file') as f:
-            response = self.vk.http.post(url, files=f).json()
+            response = self.http.post(url, files=f).json()
 
         response.update({
             'artist': artist,
             'title': title
         })
 
-        return self.vk.method('audio.save', response)
+        return self.vk.audio.save(**response)
 
     def video(self, video_file=None, link=None, name=None, description=None,
               is_private=None, wallpost=None, group_id=None,
@@ -257,11 +273,11 @@ def video(self, video_file=None, link=None, name=None, description=None,
             'repeat': repeat
         }
 
-        response = self.vk.method('video.save', values)
+        response = self.vk.video.save(**values)
         url = response['upload_url']
 
         with FilesOpener(video_file or [], 'video_file') as f:
-            return self.vk.http.post(
+            return self.http.post(
                 url,
                 files=f or None
             ).json()
@@ -283,23 +299,23 @@ def document(self, doc, title=None, tags=None, group_id=None,
         }
 
         if to_wall:
-            method = 'docs.getWallUploadServer'
+            method = self.vk.docs.getWallUploadServer
         elif message_peer_id:
-            method = 'docs.getMessagesUploadServer'
+            method = self.vk.docs.getMessagesUploadServer
         else:
-            method = 'docs.getUploadServer'
+            method = self.vk.docs.getUploadServer
 
-        url = self.vk.method(method, values)['upload_url']
+        url = method(**values)['upload_url']
 
         with FilesOpener(doc, 'file') as files:
-            response = self.vk.http.post(url, files=files).json()
+            response = self.http.post(url, files=files).json()
 
         response.update({
             'title': title,
             'tags': tags
         })
 
-        return self.vk.method('docs.save', response)
+        return self.vk.docs.save(**response)
 
     def document_wall(self, doc, title=None, tags=None, group_id=None):
         """ Загрузка документа в папку Отправленные,
@@ -380,16 +396,13 @@ def photo_cover(self, photo, group_id,
             'crop_y2': crop_y2
         }
 
-        url = self.vk.method(
-            'photos.getOwnerCoverPhotoUploadServer', values
-        )['upload_url']
+        url = self.vk.photos.getOwnerCoverPhotoUploadServer(**values)['upload_url']
 
         with FilesOpener(photo, key_format='file') as photo_files:
-            response = self.vk.http.post(url, files=photo_files)
+            response = self.http.post(url, files=photo_files)
 
-        return self.vk.method(
-            'photos.saveOwnerCoverPhoto',
-            response.json()
+        return self.vk.photos.saveOwnerCoverPhoto(
+            **response.json()
         )
 
     def story(self, file, file_type, add_to_news=True, user_ids=None,
@@ -414,9 +427,9 @@ def story(self, file, file_type, add_to_news=True, user_ids=None,
             user_ids = []
 
         if file_type == 'photo':
-            method = 'stories.getPhotoUploadServer'
+            method = self.vk.stories.getPhotoUploadServer
         elif file_type == 'video':
-            method = 'stories.getVideoUploadServer'
+            method = self.vk.stories.getVideoUploadServer
         else:
             raise ValueError('type should be either photo or video')
 
@@ -453,10 +466,10 @@ def story(self, file, file_type, add_to_news=True, user_ids=None,
             'group_id': group_id
         }
 
-        url = self.vk.method(method, values)['upload_url']
+        url = method(**values)['upload_url']
 
         with FilesOpener(file, key_format='file') as files:
-            return self.vk.http.post(url, files=files)
+            return self.http.post(url, files=files)
 
 
 class FilesOpener(object):