aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Atack <jon@atack.com>2022-04-15 15:43:36 +0200
committerlaanwj <126646+laanwj@users.noreply.github.com>2022-05-31 11:57:49 +0200
commitae00b9e02c819a69293fdcdab91f57b33e9275d9 (patch)
treed70b0cb11ec9312133be3eab9dbddbe77ee64e98
parentb54180303de0df9be7023577f35648225cf95443 (diff)
contrib: add seeds progress indicator and remove asmap one in makeseeds script
-rwxr-xr-xcontrib/seeds/makeseeds.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py
index 23b40cf028..12a9f72b93 100755
--- a/contrib/seeds/makeseeds.py
+++ b/contrib/seeds/makeseeds.py
@@ -47,7 +47,7 @@ def parseline(line: str) -> Union[dict, None]:
sline = line.split()
if len(sline) < 11:
# line too short to be valid, skip it.
- return None
+ return None
m = PATTERN_IPV4.match(sline[0])
sortkey = None
ip = None
@@ -141,10 +141,6 @@ def filterbyasn(asmap: ASMap, ips: List[Dict], max_per_asn: Dict, max_per_net: i
asn_count: Dict[int, int] = collections.defaultdict(int)
for i, ip in enumerate(ips_ipv46):
- if i % 10 == 0:
- # give progress update
- print(f"{i:6d}/{len(ips_ipv46)} [{100*i/len(ips_ipv46):04.1f}%]\r", file=sys.stderr, end='', flush=True)
-
if net_count[ip['net']] == max_per_net:
# do not add this ip as we already too many
# ips from this network
@@ -184,8 +180,10 @@ def main():
asmap = ASMap(args.asmap)
print('Done.', file=sys.stderr)
+ print('Loading and parsing DNS seeds…', end='', file=sys.stderr, flush=True)
lines = sys.stdin.readlines()
ips = [parseline(line) for line in lines]
+ print('Done.', file=sys.stderr)
print('\x1b[7m IPv4 IPv6 Onion Pass \x1b[0m', file=sys.stderr)
print(f'{ip_stats(ips):s} Initial', file=sys.stderr)