L016 - fix some log logic; tried threading

Author: LesterLian

gui.py

@@ -10,7 +10,7 @@
 
 
 # 感觉没效果
-@threads(100)
+# @threads(100)
 def press(btn_name):
     if btn_name == '添加':
         app.showSubWindow('password_box')
@@ -39,27 +39,32 @@ def press(btn_name):
         app.disableButton('开始')
         app.clearListBox("处理结果")
         for passport in passport_list:
-            user = User()
-            user.update(passport)
-            director = Director(user)
-            director.run()
-            # TODO delete
-            print(director.user.data)
-            if director.wrong_info == []:
-                passport = director.user.data['phone'] + ": " + "成功" + \
-                    " 兔子数：" + director.user.data['chickenCount'] + \
-                    " 兔仔数: " + director.user.data['eggCount']
-            else:
-                passport = director.user.data['phone'] + ": " + "失败" + str(director.wrong_info) + \
-                       " 兔子数：" + director.user.data['chickenCount'] + \
-                       " 兔仔数: " + director.user.data['eggCount']
-            app.addListItem('处理结果', passport)
-            # time.sleep(1)
+            run(passport)
         # TODO delete
         print('-------结束----------')
         app.enableButton('开始')
 
 
+# @threads(2)  # app.addListItem may need block
+def run(passport):
+    user = User()
+    user.update(passport)
+    director = Director(user)
+    director.run()
+    # TODO delete
+    print(director.user.data)
+    if director.wrong_info == []:
+        passport = director.user.data['phone'] + ": " + "成功" + \
+                   " 兔子数：" + director.user.data['chickenCount'] + \
+                   " 兔仔数: " + director.user.data['eggCount']
+    else:
+        passport = director.user.data['phone'] + ": " + "失败" + str(director.wrong_info) + \
+                   " 兔子数：" + director.user.data['chickenCount'] + \
+                   " 兔仔数: " + director.user.data['eggCount']
+    app.addListItem('处理结果', passport)
+    # time.sleep(1)
+
+
 # create the GUI & set a title
 app = gui("AutoRabbit", "600x300")
 

log.py

@@ -2,6 +2,7 @@
 # @Time    : 1/25/18 6:26 PM
 # @Author  : Lester
 from datetime import datetime
+from post.post import Post
 
 
 class Log:
@@ -11,7 +12,14 @@ def __init__(self, path):
 
     def log(self, message):
         timestamp = '{:%Y-%m-%d %H:%M:%S}'.format(datetime.now())
-        text = timestamp + '    ' + message
+        text = timestamp + '    '
+
+        if message is None:
+            text += 'POST has no response.'
+        elif message.__class__ is Post:
+            text += message.response_json['message']
+        elif message.__class__ is str:
+            text += message
         print(text)
         self.file.write(text + '\n')
 

post/post.py

@@ -28,6 +28,7 @@ def run(self):
     def post(self):
         url = gv.url + self.command
         data = self.make_data(self.warp_dic(self.post_dict))
+        # TODO maybe move.
         try:
             response_temp = requests.post(url, data=data, headers=gv.headers)
             try:

post/post_subclasses.py

@@ -25,7 +25,7 @@ def success(self):
     def fail(self):
         self.wrong_info = '登录'
         self.next_step = 'login'
-        self.log.log(self.post_obj.response_json['message'])
+        self.log.log(self.post_obj)
 
 
 class GetRatio(PostInterface):
@@ -62,12 +62,12 @@ def init_post_dict(self):
 
     def post(self):
         self.check()  # Must be called.
-        self.successful
+        self.successful = True
         fields_list = self.user.data['fields']
 
         for filed_info in fields_list:
             if filed_info['hasEgg'] == '1':
-                count += 1
+                print('hasEgg')
                 self.post_dict['fieldId'] = filed_info.get('id')
                 self.post_obj = Post('getFieldEggs', self.post_dict)
                 self.check()
@@ -81,7 +81,7 @@ def success(self):
     def fail(self):
         self.wrong_info = '收兔'
         self.next_step = 'cleanFriend'  # TODO check logic
-        self.log.log(self.post_obj.response_json['message'])
+        self.log.log(self.post_obj)
 
 
 class HatchField(PostInterface):
@@ -101,10 +101,10 @@ def post(self):
         # 对小兔取整数
         egg_count = int(float(self.user.data['eggCount']))
         fields_list = self.user.data['fields']
-        active_count = 0
+        self.check()
+        self.successful = True
         for filed_info in fields_list:
             if egg_count > 0 and filed_info['active']:
-                active_count += 1
                 # 可以孵化位置数量
                 blank_space = max_num - int(filed_info['chickens'])
                 if blank_space > 0:
@@ -114,13 +114,10 @@ def post(self):
                     self.post_dict['addCount'] = str(add_count)
                     self.post_obj = Post('hatchField', self.post_dict)
                     # TODO logic
-                    self.check()
-                    if not self.successful:
-                        self.log.log(self.post_obj.response_json['message'])
-        self.check()  # Should have called check()
+
+                    if not self.check():
+                        self.log.log(self.post_obj)
         # TODO check logic
-        if active_count == 0:
-            self.successful = True
         # sleep
 
     def success(self):
@@ -151,8 +148,8 @@ def post(self):
                 if friend['hasClean'] == '0':
                     self.post_dict['friendId'] = friend.get('userId')
                     self.post_obj = Post('cleanFriend', self.post_dict)
-                    if self.post_obj and not self.check():
-                        self.log.log(self.post_obj.response_json['message'])
+                    if not self.check():
+                        self.log.log(self.post_obj)
         # l debug
         # print('clean', self.successful)
 

test.py

@@ -60,21 +60,4 @@ def test_fiend():
 if __name__ == '__main__':
     # test()
     # test_fiend()
-    file = open('user', 'w')
-    user_list = [
-        {'phone': '17702209668', 'pwd': '111111'},
-        {'phone': '17702209690', 'pwd': '111111'},
-        {'phone': '17702209693', 'pwd': '111111'},
-        {'phone': '17702206367', 'pwd': '111111'},
-        {'phone': '13752155678', 'pwd': '111111'},
-        {'phone': '18902144454', 'pwd': '111111'},
-        {'phone': '18902145524', 'pwd': '111111'},
-        {'phone': '17702201060', 'pwd': '111111'}
-    ]
-    for info in user_list:
-        file.write(info['phone']+' '+info['pwd']+'\n')
-    new_list = []
-    # for line in file.readlines():
-    #     temp = line.split()
-    #     new_list.append({'phone': temp[0], 'pwd': temp[1]})
-    # print(new_list)
+    print('a'.__class__ is str)