From: Steven Black <redacted>
Date: Sun, 18 Dec 2016 23:32:44 +0000 (-0500)
Subject: ‘hostsfilename’ is a better variable name than ‘datafilenames’.
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=ad2100aaf2e109453e860e5445baa17827ad5cb1;p=stevenblack-hosts.git

‘hostsfilename’ is a better variable name than ‘datafilenames’.
---

diff --git a/updateHostsFile.py b/updateHostsFile.py
index 3c66dcb9f..87e312279 100644
--- a/updateHostsFile.py
+++ b/updateHostsFile.py
@@ -84,7 +84,7 @@ defaults = {
     "extensionspath" : os.path.join(BASEDIR_PATH, "extensions"),
     "extensions" : [],
     "outputsubfolder" : "",
-    "datafilenames" : "hosts",
+    "hostfilename" : "hosts",
     "targetip" : "0.0.0.0",
     "ziphosts" : False,
     "sourcedatafilename" : "update.json",
@@ -259,7 +259,7 @@ def updateAllSources():
             updatedFile = updatedFile.replace("\r", "") #get rid of carriage-return symbols
 
             # This is cross-python code
-            dataFile = open(os.path.join(BASEDIR_PATH, os.path.dirname(source), settings["datafilenames"]), "wb")
+            dataFile = open(os.path.join(BASEDIR_PATH, os.path.dirname(source), settings["hostfilename"]), "wb")
             writeData(dataFile, updatedFile)
             dataFile.close()
         except:
@@ -271,8 +271,9 @@ 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["datafilenames"])
+        filename = os.path.join(settings["datapath"], source, settings["hostfilename"])
         with open(filename, "r") as curFile:
             #Done in a cross-python way
             writeData(mergeFile, curFile.read())
@@ -286,7 +287,7 @@ def createInitialFile():
 
     # spin the sources for extensions to the base file
     for source in settings["extensions"]:
-        filename = os.path.join(settings["extensionspath"], source, settings["datafilenames"])
+        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())