synced/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2025-03-14 10:36:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow nesting of base hosts data, and within extension folders.

Browse Source
This commit is contained in:
Steven Black
2016-12-18 19:57:55 -05:00
parent d39ad733dc
commit db58b6db95
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
updateHostsFile.py
View File

@ -271,30 +271,28 @@ def createInitialFile():
mergeFile = tempfile.NamedTemporaryFile()
# spin the sources for the base file
#### glob('data/**/hosts',recursive=True)
for source in settings["sources"]:
filename = os.path.join(settings["datapath"], source, settings["hostfilename"])
with open(filename, "r") as curFile:
for source in glob(settings["datapath"] + "/**/" + settings["hostfilename"], recursive=True):
with open(source, "r") as curFile:
#Done in a cross-python way
writeData(mergeFile, curFile.read())
pathToUpdateFile = os.path.join(settings["datapath"], source, settings["sourcedatafilename"])
if os.path.exists(pathToUpdateFile):
updateFile = open(pathToUpdateFile, "r")
updateData = json.load(updateFile)
settings["sourcesdata"].append(updateData)
updateFile.close()
for source in glob(settings["datapath"] + "/**/" + settings["sourcedatafilename"], recursive=True):
updateFile = open(source, "r")
updateData = json.load(updateFile)
settings["sourcesdata"].append(updateData)
updateFile.close()
# spin the sources for extensions to the base file
for source in settings["extensions"]:
filename = os.path.join(settings["extensionspath"], source, settings["hostfilename"])
with open(filename, "r") as curFile:
#Done in a cross-python way
writeData(mergeFile, curFile.read())
# filename = os.path.join(settings["extensionspath"], source, settings["hostfilename"])
for filename in glob(os.path.join(settings["extensionspath"], source) + "/**/" + settings["hostfilename"], recursive=True):
with open(filename, "r") as curFile:
#Done in a cross-python way
writeData(mergeFile, curFile.read())
pathToUpdateFile = os.path.join(settings["extensionspath"], source, settings["sourcedatafilename"])
if os.path.exists(pathToUpdateFile):
updateFile = open(pathToUpdateFile, "r")
# updateFilePath = os.path.join(settings["extensionspath"], source, settings["sourcedatafilename"])
for updateFilePath in glob( os.path.join(settings["extensionspath"], source) + "/**/" + settings["sourcedatafilename"], recursive=True):
updateFile = open(updateFilePath, "r")
updateData = json.load(updateFile)
settings["sourcesdata"].append(updateData)
updateFile.close()