refactoring

1 files changed, 115 insertions, 16 deletions

diff --git a/api.py b/api.py
index e7fbb81..fb08ca4 100644
--- a/api.py
+++ b/api.py
@@ -2,19 +2,118 @@
 # This file is licensed under the terms of the MIT License.
 # See LICENSE.txt for details.
 
-import json, sys, urllib.request
-
-def call_method(method_name, **kwargs):
-    get_args = '&'.join(map(lambda k: '{}={}'.format(k, kwargs[k]), kwargs))
-    url = 'https://api.vk.com/method/{}?lang=en&{}'.format(method_name, get_args)
-    response = json.loads(urllib.request.urlopen(url).read().decode())
-    if 'response' not in response:
-        print(response, file=sys.stderr)
-        sys.exit(1)
-    return response['response']
-
-def users_get(**kwargs):
-    return call_method('users.get', **kwargs)
-
-def friends_get(**kwargs):
-    return call_method('friends.get', **kwargs)
+import collections
+from datetime import datetime
+from enum import Enum
+import json
+import sys
+import urllib.request
+
+class Language(Enum):
+    DEFAULT = None
+    EN = 'en'
+
+    def __str__(self):
+        return self.value
+
+class Method(Enum):
+    USERS_GET = 'users.get'
+    FRIENDS_GET = 'friends.get'
+
+    def __str__(self):
+        return self.value
+
+class User:
+    def __init__(self, impl):
+        self._impl = impl
+
+    def get_uid(self):
+        return self._impl[self.Field.UID.value]
+
+    def get_first_name(self):
+        return self._impl[self.Field.FIRST_NAME.value]
+
+    def get_last_name(self):
+        return self._impl[self.Field.LAST_NAME.value]
+
+    def has_last_name(self):
+        return self.Field.LAST_NAME.value in self._impl and self.get_last_name()
+
+    def has_screen_name(self):
+        return self.Field.SCREEN_NAME.value in self._impl
+
+    def get_screen_name(self):
+        if self.has_screen_name():
+            return self._impl[self.Field.SCREEN_NAME.value]
+        else:
+            return 'id' + str(self.get_uid())
+
+    def is_online(self):
+        return self._impl[self.Field.ONLINE.value]
+
+    def get_last_seen(self):
+        return datetime.fromtimestamp(self._impl[self.Field.LAST_SEEN.value]['time'])
+
+    def __str__(self):
+        return repr(self._impl)
+
+    def __hash__(self):
+        return hash(self.get_uid())
+
+    def __eq__(self, other):
+        return self.get_uid() == other.get_uid()
+
+    class Field(Enum):
+        UID = 'uid'
+        FIRST_NAME = 'first_name'
+        LAST_NAME = 'last_name'
+        SCREEN_NAME = 'screen_name'
+        ONLINE = 'online'
+        LAST_SEEN = 'last_seen'
+
+        def __str__(self):
+            return self.value
+
+class API:
+    def __init__(self, lang=Language.DEFAULT):
+        self.lang = lang
+
+    def _lang_is_specified(self):
+        return self.lang != Language.DEFAULT
+
+    def _call_method(self, method, **kwargs):
+        get_args = '&'.join(map(lambda k: '{}={}'.format(k, kwargs[k]), kwargs))
+        if self._lang_is_specified():
+            get_args += '&lang={}'.format(self.lang.value)
+        url = 'https://api.vk.com/method/{}?{}'.format(method, get_args)
+        response = json.loads(urllib.request.urlopen(url).read().decode())
+        if 'response' not in response:
+            raise self.Error(response)
+        return response['response']
+
+    @staticmethod
+    def _format_param_values(xs):
+        if isinstance(xs, str):
+            return xs
+        if isinstance(xs, collections.Iterable):
+            return ','.join(map(str, xs))
+        return str(xs)
+
+    def users_get(self, user_ids, fields=()):
+        return map(User, self._call_method(
+            Method.USERS_GET,
+            user_ids=self._format_param_values(user_ids),
+            fields=self._format_param_values(fields)))
+
+    def friends_get(self, user_id, fields=()):
+        return map(User, self._call_method(
+            Method.FRIENDS_GET,
+            user_id=str(user_id),
+            fields=self._format_param_values(fields)))
+
+    class Error(RuntimeError):
+        def __init__(self, impl):
+            self._impl = impl
+
+        def __str__(self):
+            return repr(self._impl)