notwa/respodns
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

deduplicate main loop

Browse Source
This commit is contained in:
Connor Olding 2020-09-04 15:07:48 +02:00
parent 93cf742971
commit a8a7b9e7b8
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
respodns/dns.py
View File

@ -215,38 +215,36 @@ async def main(db, filepaths, checks, opts: Options):
pooler = make_pooler(opts.ip_simul, finisher)
seen = 0
async def process(ip, total=None):
nonlocal seen
first = seen == 0
seen += 1
if opts.progress:
if total is None:
print(f"#{seen}: {ip}", file=stderr)
else:
print(f"#{seen}/{total}: {ip}", file=stderr)
stderr.flush()
if not first:
await sleep(opts.ip_wait)
await pooler(try_ip(db, ip, checks, opts))
if opts.blocking_file_io:
from .ip_util import read_ips
seen = 0
for filepath in filepaths:
f = stdin if filepath == "" else open(filepath, "r")
for ip in read_ips(f):
first = seen == 0
seen += 1
if opts.progress:
print(f"#{seen}: {ip}", file=stderr)
stderr.flush()
if not first:
await sleep(opts.ip_wait)
await pooler(try_ip(db, ip, checks, opts))
await process(ip)
if f != stdin:
f.close()
else: # blocking_file_io
else:
from .ip_util import IpReader
fps = [stdin if fp == "" else fp for fp in filepaths]
with IpReader(*fps) as reader:
seen = 0
async for ip in reader:
first = seen == 0
seen += 1
if opts.progress:
print(f"#{seen}/{reader.total}: {ip}", file=stderr)
stderr.flush()
if not first:
await sleep(opts.ip_wait)
await pooler(try_ip(db, ip, checks, opts))
await process(ip, reader.total)
await pooler()
await syncing