Skip to content

Commit 097ee54

Browse files
committed
L015 - fix cleanFriend always false and maybe other;
1 parent aaef218 commit 097ee54

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

log.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ def __init__(self, path):
1111

1212
def log(self, message):
1313
timestamp = '{:%Y-%m-%d %H:%M:%S}'.format(datetime.now())
14-
text = timestamp + ' ' + message + '\n'
14+
text = timestamp + ' ' + message
1515
print(text)
16-
self.file.write(text)
16+
self.file.write(text + '\n')
1717

1818
def close(self):
1919
self.file.close()

post/post_interface.py

+1
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ def fail(self):
5252
def check(self):
5353
self.successful = self.successful and (self.post_obj is not None and self.post_obj.success)
5454
self.checked += 1
55+
return self.successful

post/post_subclasses.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ def init_post_dict(self):
6161
self.post_dict['token'] = self.user.data.get('token')
6262

6363
def post(self):
64-
count = 0
64+
self.check() # Must be called.
65+
self.successful
6566
fields_list = self.user.data['fields']
67+
6668
for filed_info in fields_list:
6769
if filed_info['hasEgg'] == '1':
6870
count += 1
6971
self.post_dict['fieldId'] = filed_info.get('id')
7072
self.post_obj = Post('getFieldEggs', self.post_dict)
7173
self.check()
72-
self.check()
74+
7375
# TODO check logic
74-
if count == 0:
75-
self.successful = True
7676
# sleep
7777

7878
def success(self):
@@ -117,7 +117,7 @@ def post(self):
117117
self.check()
118118
if not self.successful:
119119
self.log.log(self.post_obj.response_json['message'])
120-
self.check()
120+
self.check() # Should have called check()
121121
# TODO check logic
122122
if active_count == 0:
123123
self.successful = True
@@ -131,7 +131,6 @@ def fail(self):
131131
self.next_step = 'end' # todo 下一步是啥
132132

133133

134-
135134
class CleanFriend(PostInterface):
136135
def __init__(self, user, log):
137136
GetFriendList(user, log)
@@ -143,18 +142,19 @@ def init_post_dict(self):
143142
self.post_dict['token'] = self.user.data.get('token')
144143

145144
def post(self):
146-
self.check()
147-
print('clean', self.successful)
145+
self.check() # Must be called.
146+
self.successful = True
147+
148148
if self.user.data['friends']:
149149
for friend in self.user.data['friends']:
150150
# 还没被清扫
151151
if friend['hasClean'] == '0':
152152
self.post_dict['friendId'] = friend.get('userId')
153153
self.post_obj = Post('cleanFriend', self.post_dict)
154-
self.check()
155-
if not self.successful:
154+
if self.post_obj and not self.check():
156155
self.log.log(self.post_obj.response_json['message'])
157-
self.check()
156+
# l debug
157+
# print('clean', self.successful)
158158

159159
def success(self):
160160
self.next_step = 'hatchField'

0 commit comments

Comments
 (0)