From 190592577de0f47ee5b401a469d2987c55c6ca10 Mon Sep 17 00:00:00 2001 From: gfyoung Date: Sun, 14 May 2017 14:19:57 -0400 Subject: [PATCH] Condense exclusion customization logic --- updateHostsFile.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/updateHostsFile.py b/updateHostsFile.py index 462043bbd..0d1caffd3 100644 --- a/updateHostsFile.py +++ b/updateHostsFile.py @@ -188,11 +188,6 @@ def promptForExclusions(): print("OK, we'll only exclude domains in the whitelist.") -def promptForMoreCustomExclusions(question="Do you have more domains " - "you want to enter?"): - return query_yes_no(question) - - def promptForFlushDnsCache(): if settings["flushdnscache"]: flush_dns_cache() @@ -231,18 +226,29 @@ def displayExclusionOptions(): continue if query_yes_no("Do you want to exclude any other domains?"): - gatherCustomExclusions() + gather_custom_exclusions() -def gatherCustomExclusions(): +def gather_custom_exclusions(): + """ + Gather custom exclusions from the user. + """ + + # We continue running this while-loop until the user + # says that they have no more domains to exclude. while True: - # Cross-python Input - domainFromUser = raw_input("Enter the domain you want to exclude (e.g. facebook.com): ") - if isValidDomainFormat(domainFromUser): - excludeDomain(domainFromUser) - if not promptForMoreCustomExclusions(): + domain_prompt = ("Enter the domain you want " + "to exclude (e.g. facebook.com): ") + user_domain = raw_input(domain_prompt) + + if isValidDomainFormat(user_domain): + excludeDomain(user_domain) + + continue_prompt = "Do you have more domains you want to enter?" + if not query_yes_no(continue_prompt): return + def excludeDomain(domain): settings["exclusionregexs"].append(re.compile(settings["exclusionpattern"] + domain))