Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Improved usability of external progressbar func #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2022
Merged

Improved usability of external progressbar func #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion maigret/checking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,8 @@ async def maigret(
cookies=None,
retries=0,
check_domains=False,
*args,
**kwargs,
) -> QueryResultWrapper:
"""Main search func

Expand Down Expand Up @@ -660,7 +662,8 @@ async def maigret(
executor = AsyncioSimpleExecutor(logger=logger)
else:
executor = AsyncioProgressbarQueueExecutor(
logger=logger, in_parallel=max_connections, timeout=timeout + 0.5
logger=logger, in_parallel=max_connections, timeout=timeout + 0.5,
*args, **kwargs
)

# make options objects for all the requests
Expand Down
24 changes: 22 additions & 2 deletions maigret/executors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,22 @@ def __init__(self, *args, **kwargs):
self.queue = asyncio.Queue(self.workers_count)
self.timeout = kwargs.get('timeout')

async def increment_progress(self, count):
update_func = self.progress.update
if asyncio.iscoroutinefunction(update_func):
await update_func(count)
else:
update_func(count)
await asyncio.sleep(0)

async def stop_progress(self):
stop_func = self.progress.close
if asyncio.iscoroutinefunction(stop_func):
await stop_func()
else:
stop_func()
await asyncio.sleep(0)

async def worker(self):
while True:
try:
Expand All @@ -96,7 +112,7 @@ async def worker(self):
result = kwargs.get('default')

self.results.append(result)
self.progress.update(1)
await self.increment_progress(1)
self.queue.task_done()

async def _run(self, queries: Iterable[QueryDraft]):
Expand All @@ -109,10 +125,14 @@ async def _run(self, queries: Iterable[QueryDraft]):
workers = [create_task_func()(self.worker()) for _ in range(min_workers)]

self.progress = self.progress_func(total=len(queries_list))

for t in queries_list:
await self.queue.put(t)

await self.queue.join()

for w in workers:
w.cancel()
self.progress.close()

await self.stop_progress()
return self.results