river_tao/OneForAll-mirror
1
0
Fork 0
mirror of https://github.com/shmilylty/OneForAll.git synced 2026-10-28 03:35:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

resp_queue改为resp_list

Browse Source
This commit is contained in:
Jing Ling
2020-09-10 20:31:06 +08:00
parent 8de9f0aa6e
commit d6e2c4c725
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/request.py
+5 -8
View File
@@ -127,7 +127,7 @@ def get_progress_bar(total):
return bar return bar
def get(url, resp_queue, session): def get(url, resp_list, session):
timeout = settings.request_timeout_second timeout = settings.request_timeout_second
redirect = settings.request_allow_redirect redirect = settings.request_allow_redirect
proxy = utils.get_proxy() proxy = utils.get_proxy()
@@ -136,13 +136,13 @@ def get(url, resp_queue, session):
except Exception as e: except Exception as e:
logger.log('DEBUG', e.args) logger.log('DEBUG', e.args)
return return
resp_queue.put((url, resp)) resp_list.append((url, resp))
def request(urls_queue, resp_queue, session): def request(urls_queue, resp_list, session):
while not urls_queue.empty(): while not urls_queue.empty():
url = urls_queue.get() url = urls_queue.get()
get(url, resp_queue, session) get(url, resp_list, session)
urls_queue.task_done() urls_queue.task_done()
@@ -172,7 +172,6 @@ def bulk_request(urls):
logger.log('INFOR', 'Requesting urls in bulk') logger.log('INFOR', 'Requesting urls in bulk')
resp_list = list() resp_list = list()
urls_queue = Queue() urls_queue = Queue()
resp_queue = Queue()
for url in urls: for url in urls:
urls_queue.put(url) urls_queue.put(url)
total = len(urls) total = len(urls)
@@ -186,13 +185,11 @@ def bulk_request(urls):
for i in range(thread_count): for i in range(thread_count):
request_thread = Thread(target=request, name=f'RequestThread-{i}', request_thread = Thread(target=request, name=f'RequestThread-{i}',
args=(urls_queue, resp_queue, session), daemon=True) args=(urls_queue, resp_list, session), daemon=True)
request_thread.start() request_thread.start()
urls_queue.join() urls_queue.join()
while not resp_queue.empty():
resp_list.append(resp_queue.get())
return resp_list return resp_list