Skip to content

Commit a5dcfbd

Browse files
author
dqw
committed
完善进度信息
1 parent 74f049c commit a5dcfbd

2 files changed

Lines changed: 19 additions & 6 deletions

File tree

‎main.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ def test_sqlite(dbfile):
7272
thread_pool.start_task()
7373
thread_pool.wait_all_complete()
7474

75-
work_queue_num, tasks_number, save_queue_number = thread_pool.get_progress_info()
76-
print "任务完成,总下载数:",tasks_number
75+
work_queue_num, tasks_number, save_queue_number, success, failure = thread_pool.get_progress_info()
76+
print "总任务数:",tasks_number
77+
print "成功下载:",success
78+
print "下载失败:",failure
7779
print "花费时间: {0} 秒".format(time.time()-start)
7880

‎utils/pool.py‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ def __init__(self, thread_num, args):
1515
self.save_queue = Queue.Queue()
1616
self.threads = []
1717
self.running = 0
18+
self.failure = 0
19+
self.success = 0
1820
self.tasks = {}
1921
self.__init_thread_pool(thread_num)
2022

@@ -46,6 +48,11 @@ def start_task(self):
4648
# 开始打印进度信息
4749
PrintProgress(self)
4850

51+
def increase_success(self):
52+
self.success += 1
53+
54+
def increase_failure(self):
55+
self.failure += 1
4956

5057
def increase_running(self):
5158
self.running += 1
@@ -57,7 +64,7 @@ def get_running(self):
5764
return self.running
5865

5966
def get_progress_info(self):
60-
return self.work_queue.qsize(), len(self.tasks), self.save_queue.qsize()
67+
return self.work_queue.qsize(), len(self.tasks), self.save_queue.qsize(), self.success, self.failure
6168

6269
def add_save_task(self, url, html):
6370
self.save_queue.put((url, html))
@@ -85,8 +92,12 @@ def run(self):
8592

8693
html, new_link = do(url, self.thread_pool.args, flag_get_new_link)
8794

88-
# html添加到待保存队列
89-
self.thread_pool.add_save_task(url, html)
95+
if html == '':
96+
self.thread_pool.increase_failure()
97+
else:
98+
self.thread_pool.increase_success()
99+
# html添加到待保存队列
100+
self.thread_pool.add_save_task(url, html)
90101

91102
# 添加新任务
92103
if new_link:
@@ -116,7 +127,7 @@ def run(self):
116127
if thread_num <= 0:
117128
break
118129

119-
work_queue_num, tasks_number, save_queue_number = self.thread_pool.get_progress_info()
130+
work_queue_num, tasks_number, save_queue_number, success, failure = self.thread_pool.get_progress_info()
120131

121132
print '下载中:', thread_num
122133
print '待下载:', work_queue_num

0 commit comments

Comments
 (0)