Merge pull request #7 from wangmanv2/master

解决函数复用问题并格式化代码

main.py

@@ -5,13 +5,15 @@ import telepot
 
 tele_enable = False
 sc_enable = False
-sign='https://n.cg.163.com/api/v2/sign-today'
+sign_url = 'https://n.cg.163.com/api/v2/sign-today'
 current = 'https://n.cg.163.com/api/v2/client-settings/@current'
 
+
 cookies = sys.argv[1].split('#')
 teleid = sys.argv[2]
 teletoken = sys.argv[3]
 sckey = sys.argv[4]
+
 if cookies == "":
     print('[网易云游戏自动签到]未设置cookie，正在退出……')
     sys.exit()
@@ -21,9 +23,11 @@ if teleid!="" and teletoken!="":
 if sckey != "":
     sc_enable = True
 
+
 class Error(Exception):
     pass
 
+
 def signin(url, cookie):
     header = {
         'Accept': 'application/json, text/plain, */*',
@@ -45,6 +49,7 @@ def signin(url,cookie):
     result = r.post(url=url, headers=header)
     return result
 
+
 def getme(url, cookie):
     header = {
         'Host': 'n.cg.163.com',
@@ -64,15 +69,19 @@ def getme(url,cookie):
     result = r.get(url=url, headers=header)
     return result
 
+
 def send(id, message):
     if tele_enable:
-        bot.sendMessage(id, message, parse_mode=None, disable_web_page_preview=None, disable_notification=None, reply_to_message_id=None, reply_markup=None)
+        bot.sendMessage(id, message, parse_mode=None, disable_web_page_preview=None, disable_notification=None,
+                        reply_to_message_id=None, reply_markup=None)
+
 
 def scsend(SCKEY, message):
     sc_url = 'http://sc.ftqq.com/{}.send?text=网易云游戏自动签到脚本&desp={}'.format(SCKEY, message)
     if sc_enable:
         r.get(url=sc_url)
 
+
 if __name__ == "__main__":
     success = []
     failure = []
@@ -83,33 +92,37 @@ if __name__ == "__main__":
         cookie = i
         autherror = False
         signerror = False
+        sign_return = NULL
+        me = NULL
         try:
             me = getme(current, cookie)
         except:
-            message='第{}个账号验证失败！请检查Cookie是否过期！或者附上报错信息到 https://github.com/GamerNoTitle/wyycg-autosignin/issues 发起issue'.format(cookies.index(i)+1)
+            message = '第{}个账号验证失败！请检查Cookie是否过期！或者附上报错信息到 https://github.com/GamerNoTitle/wyycg-autosignin/issues 发起issue'.format(
+                cookies.index(i) + 1)
             failure.append(cookie)
             msg.append(message)
             autherror = True
 
-        if(me.status_code!=200 and autherror!=True):
-            message='第{}个账号验证失败！请检查Cookie是否过期！或者附上报错信息到 https://github.com/GamerNoTitle/wyycg-autosignin/issues 发起issue'.format(cookies.index(i)+1)
+        if me.status_code != 200 and not autherror:
+            message = '第{}个账号验证失败！请检查Cookie是否过期！或者附上报错信息到 https://github.com/GamerNoTitle/wyycg-autosignin/issues 发起issue'.format(
+                cookies.index(i) + 1)
             failure.append(cookie)
             msg.append(message)
 
         try:
-            sign=signin(sign,cookie)
+            sign_return = signin(sign_url, cookie)
         except:
-            message='第{}个账号签到失败，回显状态码为{}，具体错误信息如下：{}'.format(cookies.index(i)+1,sign.status_code,sign.text)
+            message = '第{}个账号签到失败，回显状态码为{}，具体错误信息如下：{}'.format(cookies.index(i) + 1, sign_return.status_code, sign_return.text)
             failure.append(cookie)
             msg.append(message)
             signerror = True
 
-        if(sign.status_code==200):
+        if sign.status_code == 200:
             message = '第{}个账号签到成功！'.format(cookies.index(i) + 1)
             success.append(cookie)
             msg.append(message)
-        elif(signerror!=True):
-            message='第{}个账号签到失败，回显状态码为{}，具体错误信息如下：{}'.format(cookies.index(i)+1,sign.status_code,sign.text)
+        elif not signerror:
+            message = '第{}个账号签到失败，回显状态码为{}，具体错误信息如下：{}'.format(cookies.index(i) + 1, sign_return.status_code, sign_return.text)
             failure.append(cookie)
             msg.append(message)
     outputmsg = str(msg).replace("[", '').replace(']', '').replace(',', '<br>').replace('\'', '')