update tester

cookiespool/api.py

@@ -12,7 +12,6 @@ app = Flask(__name__)
 def index():
     return '<h2>Welcome to Cookie Pool System</h2>'
 
-
 def get_conn():
     """
     获取

cookiespool/generator.py

@@ -1,11 +1,6 @@
 import json
-import requests
 from selenium import webdriver
-from selenium.common.exceptions import WebDriverException, TimeoutException
 from selenium.webdriver import DesiredCapabilities
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
 from cookiespool.config import *
 from cookiespool.db import RedisClient
 from login.weibo.cookies import WeiboCookies
@@ -85,6 +80,8 @@ class CookiesGenerator(object):
                         print('成功删除账号')
                 else:
                     print(result.get('content'))
+        else:
+            print('所有账号都已经成功获取Cookies')
     
     def close(self):
         """

cookiespool/scheduler.py

@@ -10,12 +10,12 @@ class Scheduler(object):
     @staticmethod
     def valid_cookie(cycle=CYCLE):
         while True:
-            print('Checking Cookies')
+            print('Cookies检测进程开始运行')
             try:
                 for name, cls in TESTER_MAP.items():
                     tester = eval(cls + '(name="' + name + '")')
                     tester.run()
-                    print('Tester Finished')
+                    print('Cookies检测完成')
                     del tester
                     time.sleep(cycle)
             except Exception as e:
@@ -24,20 +24,20 @@ class Scheduler(object):
     @staticmethod
     def generate_cookie(cycle=CYCLE):
         while True:
-            print('Generating Cookies')
+            print('Cookies生成进程开始运行')
             try:
                 for name, cls in GENERATOR_MAP.items():
                     generator = eval(cls + '(name="' + name + '")')
                     generator.run()
-                    print('Generator Finished')
+                    print('Cookies生成完成')
                     generator.close()
-                    print('Deleted Generator')
                     time.sleep(cycle)
             except Exception as e:
                 print(e.args)
 
     @staticmethod
     def api():
+        print('API接口开始运行')
         app.run(host=API_HOST, port=API_PORT)
 
     def run(self):

cookiespool/tester.py

@@ -10,42 +10,38 @@ class ValidTester(object):
         self.cookies_db = RedisClient('cookies', self.name)
         self.account_db = RedisClient('accounts', self.name)
     
-    def test(self, account, cookies):
+    def test(self, username, cookies):
         raise NotImplementedError
     
     def run(self):
-        accounts = self.cookies_db.all()
+        cookies_groups = self.cookies_db.all()
-        print(accounts)
+        for username, cookies in cookies_groups.items():
-        for account in accounts:
+            self.test(username, cookies)
-            username = account.get('username')
-            cookies = self.cookies_db.get(username)
-            self.test(account, cookies)
 
 
 class WeiboValidTester(ValidTester):
     def __init__(self, name='weibo'):
         ValidTester.__init__(self, name)
     
-    def test(self, account, cookies):
+    def test(self, username, cookies):
-        print('Testing Account', account.get('username'))
+        print('正在测试Cookies', '用户名', username)
         try:
             cookies = json.loads(cookies)
         except TypeError:
-            print('Invalid Cookies Value', account.get('username'))
+            print('Cookies不合法', username)
-            self.cookies_db.delete(account.get('username'))
+            self.cookies_db.delete(username)
-            print('Deleted User', account.get('username'))
+            print('删除Cookies', username)
-            return None
+            return
         try:
             test_url = TEST_URL_MAP[self.name]
             response = requests.get(test_url, cookies=cookies, timeout=5, allow_redirects=False)
             if response.status_code == 200:
-                print('Valid Cookies', account.get('username'))
+                print('Cookies有效', username)
+                print('部分测试结果', response.text[0:50])
             else:
                 print(response.status_code, response.headers)
-                print('Invalid Cookies', account.get('username'))
+                print('Cookies失效', username)
-                self.cookies_db.delete(account.get('username'))
+                self.cookies_db.delete(username)
-                print('Deleted User', account.get('username'))
+                print('删除Cookies', username)
         except ConnectionError as e:
-            print('Error', e.args)
+            print('发生异常', e.args)
-            print('Invalid Cookies', account.get('username'))
-

login/weibo/cookies.py

@@ -1,8 +1,6 @@
-import os
 import time
 from io import BytesIO
 from PIL import Image
-from selenium import webdriver
 from selenium.common.exceptions import TimeoutException
 from selenium.webdriver import ActionChains
 from selenium.webdriver.common.by import By
@@ -158,6 +156,7 @@ class WeiboCookies():
         :return:
         """
         # 获得四个按点
+        try:
             circles = self.browser.find_elements_by_css_selector('.patt-wrap .patt-circ')
             dx = dy = 0
             for index in range(4):
@@ -183,6 +182,8 @@ class WeiboCookies():
                     # 计算下一次偏移
                     dx = circles[numbers[index + 1] - 1].location['x'] - circle.location['x']
                     dy = circles[numbers[index + 1] - 1].location['y'] - circle.location['y']
+        except:
+            return False
     
     def get_cookies(self):
         """