Marown/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2024-07-07 13:02:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #779 from funilrys/issue-777

Browse Source 
Fix of the extra line and the way we manage lines with comments at the end
This commit is contained in:
Steven Black 2018-09-13 18:53:19 -04:00 committed by GitHub
commit e909f8144e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testUpdateHostsFile.py
View File

@ -86,7 +86,7 @@ class TestGetDefaults(Base):
"replace": False,
"backup": False,
"skipstatichosts": False,
"keepdomaincomments": False,
"keepdomaincomments": True,
"extensionspath": "foo" + self.sep + "extensions",
"extensions": [],
"compress": False,
@ -753,10 +753,12 @@ class TestStripRule(Base):
self.assertEqual(output, line)
def test_strip_more_than_two(self):
comment = " # comments here galore"
for line in ["0.0.0.0 twitter.com", "127.0.0.1 facebook.com",
"8.8.8.8 google.com", "1.2.3.4 foo.bar.edu"]:
output = strip_rule(line + " # comments here galore")
self.assertEqual(output, line)
output = strip_rule(line + comment)
self.assertEqual(output, line + comment)
class TestWriteOpeningHeader(BaseMockDir):

27
updateHostsFile.py
View File

@ -60,7 +60,7 @@ def get_defaults():
"replace": False,
"backup": False,
"skipstatichosts": False,
"keepdomaincomments": False,
"keepdomaincomments": True,
"extensionspath": path_join_robust(BASEDIR_PATH, "extensions"),
"extensions": [],
"compress": False,
@ -99,8 +99,8 @@ def main():
parser.add_argument("--ip", "-i", dest="targetip", default="0.0.0.0",
help="Target IP address. Default is 0.0.0.0.")
parser.add_argument("--keepdomaincomments", "-k",
dest="keepdomaincomments", default=False,
help="Keep domain line comments.")
dest="keepdomaincomments", action="store_false", default=True,
help="Do not keep domain line comments.")
parser.add_argument("--noupdate", "-n", dest="noupdate", default=False,
action="store_true", help="Don't update from "
"host data sources.")
@ -628,8 +628,8 @@ def create_initial_file():
for source in recursive_glob(settings["datapath"],
settings["hostfilename"]):
start = "# Start {}\n".format(os.path.basename(os.path.dirname(source)))
end = "# End {}\n".format(os.path.basename(os.path.dirname(source)))
start = "# Start {}\n\n".format(os.path.basename(os.path.dirname(source)))
end = "# End {}\n\n".format(os.path.basename(os.path.dirname(source)))
with open(source, "r") as curFile:
write_data(merge_file, start + curFile.read() + end)
@ -772,7 +772,7 @@ def remove_dups_and_excl(merge_file, exclusion_regexes, output_file=None):
line = line.replace("\t+", " ")
# see gh-271: trim trailing whitespace, periods
line = line.rstrip(' .') + "\n"
line = line.rstrip(' .')
# Testing the first character doesn't require startswith
if line[0] == "#" or re.match(r'^\s*$', line[0]):
@ -843,7 +843,10 @@ def normalize_rule(rule, target_ip, keep_domain_comments):
rule = "%s %s" % (target_ip, hostname)
if suffix and keep_domain_comments:
rule += " #%s" % suffix
if not suffix.strip().startswith('#'):
rule += " #%s" % suffix
else:
rule += " %s" % suffix
return hostname, rule + "\n"
@ -860,7 +863,10 @@ def normalize_rule(rule, target_ip, keep_domain_comments):
rule = "%s %s" % (target_ip, ip_host)
if suffix and keep_domain_comments:
rule += " #%s" % suffix
if not suffix.strip().startswith('#'):
rule += " #%s" % suffix
else:
rule += " %s" % suffix
return ip_host, rule + "\n"
@ -875,9 +881,6 @@ def strip_rule(line):
"""
Sanitize a rule string provided before writing it to the output hosts file.
Some sources put comments around their rules, for accuracy we need
to strip them the comments are preserved in the output hosts file.
Parameters
----------
line : str
@ -894,7 +897,7 @@ def strip_rule(line):
# just return blank
return ""
else:
return split_line[0] + " " + split_line[1]
return " ".join(split_line)
def write_opening_header(final_file, **header_params):