微调代码

Author: linkv-an

README.md

@@ -12,8 +12,15 @@ LINKV SDK for the Python2 programming language.
 git clone https://github.com/linkv-io/python2-sdk
 ```
 
+## Install SetupTools
+```sh
+wget https://bootstrap.pypa.io/ez_setup.py -O - | python
+```
+
 ## Install
 ```sh
+
+
 cd python2-sdk
 python setup.py build
 python setup.py install --record log
@@ -59,10 +66,10 @@ def main():
         return
     golds0 = r1['golds']
     print('golds0:%d' % golds0)
-    unique_id = '1231234'
+    unique_id = '123123123'
     gold = 10
-    r2 = live.SuccessOrderByLiveOpenID(live_open_id, unique_id, linkv_sdk.OrderTypeAdd, gold, 10, 1,
-                                       linkv_sdk.PlatformTypeH5, '')
+    r2 = live.SuccessOrderByLiveOpenID(live_open_id, unique_id, linkv_sdk.OrderAdd, gold, 10, 1,
+                                       linkv_sdk.PlatformH5, '')
     if not r2['status']:
         print('live.SuccessOrderByLiveOpenID(%s)' % r2['error'])
         return
@@ -73,8 +80,8 @@ def main():
         print('(golds0+gold) != golds1')
         return
 
-    unique_id1 = '456456'
-    ok = live.ChangeGoldByLiveOpenID(live_open_id, unique_id1, linkv_sdk.OrderTypeDel, gold, 1, 'test del')
+    unique_id1 = '456456456'
+    ok = live.ChangeGoldByLiveOpenID(live_open_id, unique_id1, linkv_sdk.OrderDel, gold, 1, 'test del')
     if not ok:
         print('!ok')
         return
@@ -94,6 +101,7 @@ def main():
 
 if __name__ == "__main__":
     main()
+
 ```
 
 ## License

example/example.py

@@ -31,8 +31,8 @@ def main():
     print('golds0:%d' % golds0)
     unique_id = '123123123'
     gold = 10
-    r2 = live.SuccessOrderByLiveOpenID(live_open_id, unique_id, linkv_sdk.OrderTypeAdd, gold, 10, 1,
-                                       linkv_sdk.PlatformTypeH5, '')
+    r2 = live.SuccessOrderByLiveOpenID(live_open_id, unique_id, linkv_sdk.OrderAdd, gold, 10, 1,
+                                       linkv_sdk.PlatformH5, '')
     if not r2['status']:
         print('live.SuccessOrderByLiveOpenID(%s)' % r2['error'])
         return
@@ -44,7 +44,7 @@ def main():
         return
 
     unique_id1 = '456456456'
-    ok = live.ChangeGoldByLiveOpenID(live_open_id, unique_id1, linkv_sdk.OrderTypeDel, gold, 1, 'test del')
+    ok = live.ChangeGoldByLiveOpenID(live_open_id, unique_id1, linkv_sdk.OrderDel, gold, 1, 'test del')
     if not ok:
         print('!ok')
         return

linkv_sdk/config/bindings/binding.py

@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 
-from ffi import dlopen_platform_specific, download
+from .ffi import dlopen_platform_specific, download
 from ctypes import c_char_p, c_void_p, cast
 
 VERSION = '0.0.4'
@@ -17,15 +17,15 @@ def decrypt(self, app_id, app_secret):
         self.core.decrypt.argtypes = [c_char_p, c_char_p]
         self.core.decrypt.restype = c_void_p
         ptr = self.core.decrypt(app_id.encode('utf-8'), app_secret.encode('utf-8'))
-        app_config = cast(ptr, c_char_p).value
+        app_config = cast(ptr, c_char_p).value.encode(encoding='utf8')
         self.core.release.argtypes = c_void_p,
         self.core.release.restype = None
         self.core.release(ptr)
         return app_config
 
 
 def download_library():
-    return download(FILE, "", VERSION)
+    return download(FILE, '', VERSION)
 
 
 _binding = None

linkv_sdk/config/config.py

@@ -4,11 +4,12 @@
 from linkv_sdk.rtc.config import dict_config as dict_rtc_config
 from linkv_sdk.live.config import dict_config as dict_live_config
 from linkv_sdk.http.http import http
-from bindings.binding import download_library, binding
+from .bindings.binding import download_library, binding
+from linkv_sdk import __version__
 from json import loads
 
 
-def init(app_id, app_secret, version):
+def init(app_id, app_secret, version=__version__):
     http(version)
     if not download_library():
         return False

linkv_sdk/http/http.py

@@ -34,4 +34,8 @@ def post(self, uri='', params={}, headers={}):
 
 
 def http(version=''):
-    return _http if _http is not None else _HTTP(version)
+    global _http
+    if _http:
+        return _http
+    _http = _HTTP(version)
+    return _http

linkv_sdk/linkv_sdk.py

@@ -1,18 +1,7 @@
 # -*- coding: UTF-8 -*-
 
-import config.config as config
-from . import __version__
-from im.im import LvIM
-from rtc.rtc import LvRTC
-from live.live import LvLIVE
+from .config.config import init
+from .im.im import LvIM
+from .rtc.rtc import LvRTC
+from .live.live import LvLIVE, OrderAdd, OrderDel, PlatformH5, PlatformANDROID, PlatformIOS
 
-OrderTypeAdd = 1
-OrderTypeDel = 2
-
-PlatformTypeH5 = 'h5'
-PlatformTypeANDROID = 'android'
-PlatformTypeIOS = 'ios'
-
-
-def init(app_id, app_secret):
-    return config.init(app_id, app_secret, __version__)

linkv_sdk/live/live.py

@@ -10,6 +10,34 @@
 from linkv_sdk.http.http import http
 
 
+class OrderType(object):
+    __slots__ = ['idx']
+
+    def __init__(self, idx):
+        self.idx = idx
+
+    def string(self):
+        return str(self.idx)
+
+
+class PlatformType(object):
+    __slots__ = ['value']
+
+    def __init__(self, value):
+        self.value = value
+
+    def string(self):
+        return self.value
+
+
+OrderAdd = OrderType(1)
+OrderDel = OrderType(2)
+
+PlatformH5 = PlatformType('h5')
+PlatformANDROID = PlatformType('android')
+PlatformIOS = PlatformType('ios')
+
+
 class Live(object):
     def __init__(self):
         pass
@@ -75,12 +103,12 @@ def SuccessOrderByLiveOpenID(live_open_id, unique_id, order_type, gold, money, e
             'app_id': config().app_key,
             'uid': live_open_id,
             'request_id': unique_id,
-            'type': str(order_type),
+            'type': order_type.string(),
             'value': str(gold),
             'money': str(money),
             'expriation': str(time.mktime(datetime.now().timetuple()) + expr * 86400),
             'channel': config().alias,
-            'platform': platform_type,
+            'platform': platform_type.string(),
         }
 
         if len(order_id) > 0:
@@ -119,7 +147,7 @@ def ChangeGoldByLiveOpenID(live_open_id, unique_id, order_type, gold, expr, opti
             'app_id': config().app_key,
             'uid': live_open_id,
             'request_id': unique_id,
-            'type': str(order_type),
+            'type': order_type.string(),
             'value': str(gold),
         }
         if expr > 0:
@@ -142,7 +170,10 @@ def ChangeGoldByLiveOpenID(live_open_id, unique_id, order_type, gold, expr, opti
 
         result = json.loads(response.read())
 
-        return int(result['status']) == 200
+        return {
+            'status': False,
+            'ok': int(result['status']) == 200,
+        }
 
     @staticmethod
     def GetGoldByLiveOpenID(live_open_id):
@@ -199,22 +230,21 @@ def GetGoldByLiveOpenID(self, live_open_id):
 
 
 def genRandomString():
-    container = ''.join(random.sample('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890', 8))
-    container += str(int(time.mktime(datetime.now().timetuple())))
-    container += ''.join(random.sample('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890', 8))
-    return container
+    return '{}{}{}'.format(
+        ''.join(random.sample('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890', 8)),
+        str(int(time.mktime(datetime.now().timetuple()))),
+        ''.join(random.sample('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890', 8)))
 
 
 def genSign(params, md5_secret):
     data = __encode(params) + "&key=" + md5_secret
     obj = hashlib.new('md5')
-    obj.update(data)
+    obj.update(data.decode(encoding='utf8'))
     return obj.hexdigest().lower()
 
 
 def __encode(params):
-    keys = params.keys()
-    keys.sort()
+    keys = sorted(params.keys())
     container = ''
     for k in keys:
         if len(container) > 0:

setup.py

@@ -5,7 +5,7 @@
 tests_require = []
 extras_require = {}
 install_requires = [
-    'requests'
+    'requests',
 ]
 
 setup(
@@ -37,8 +37,4 @@
         'License :: OSI Approved :: Apache-2.0 License',
         'Topic :: Utilities'
     ],
-    project_urls={
-        'Documentation': 'https://doc.linkv.sg',
-        'Source': 'https://github.com/linkv-io/python-sdk',
-    },
 )