优化代码结构 删除无用队列结果集参数

This commit is contained in:
shmilylty
2019-08-05 18:00:01 +08:00
parent 53213304e2
commit 11642edf6e
50 changed files with 332 additions and 502 deletions
+9 -12
View File
@@ -1,9 +1,9 @@
# coding=utf-8
import time
import queue
from common.search import Search
from bs4 import BeautifulSoup
from config import logger
from common.search import Search
class Baidu(Search):
@@ -65,11 +65,11 @@ class Baidu(Search):
if self.page_num >= self.limit_num: # 搜索条数限制
break
def run(self, rx_queue):
def run(self):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块搜索{self.domain}的子域')
self.begin()
self.search(self.domain, full_search=True)
@@ -87,21 +87,18 @@ class Baidu(Search):
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块搜索{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
def do(domain): # 统一入口名字 方便多线程调用
"""
类统一调用入口
:param str domain: 域名
:param rx_queue: 结果集队列
"""
search = Baidu(domain)
search.run(rx_queue)
search.run()
if __name__ == '__main__':
result_queue = queue.Queue()
do('example.com', result_queue)
do('example.com')