Change update.info files to update.json, update the python generators, and docs.

data/KADhosts/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/azet12/KADhosts/master/KADhosts.txt

data/KADhosts/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/azet12/KADhosts/master/KADhosts.txt"
+}

data/SpotifyAds/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/FadeMind/hosts.extras/master/SpotifyAds/hosts

data/SpotifyAds/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/SpotifyAds/hosts"
+}

data/StevenBlack/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/StevenBlack/hosts/master/data/StevenBlack/hosts

data/StevenBlack/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/StevenBlack/hosts/master/data/StevenBlack/hosts"
+}

data/Telemetry/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/FadeMind/hosts.extras/master/Telemetry/hosts

data/Telemetry/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/Telemetry/hosts"
+}

data/UncheckyAds/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts

data/UncheckyAds/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts"
+}

data/adaway.org/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt

data/adaway.org/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt"
+}

data/add.2o7Net/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts

data/add.2o7Net/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts"
+}

data/add.Dead/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Dead/hosts

data/add.Dead/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Dead/hosts"
+}

data/add.Risk/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts

data/add.Risk/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts"
+}

data/add.Spam/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts

data/add.Spam/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts"
+}

data/malwaredomainlist.com/update.info

@@ -1 +0,0 @@
-https://www.malwaredomainlist.com/hostslist/hosts.txt

data/malwaredomainlist.com/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://www.malwaredomainlist.com/hostslist/hosts.txt"
+}

data/mvps.org/update.info

@@ -1 +0,0 @@
-http://winhelp2002.mvps.org/hosts.txt

data/mvps.org/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "http://winhelp2002.mvps.org/hosts.txt"
+}

data/someonewhocares.org/update.info

@@ -1 +0,0 @@
-http://someonewhocares.org/hosts/zero/hosts

data/someonewhocares.org/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "http://someonewhocares.org/hosts/zero/hosts"
+}

data/tyzbit/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/tyzbit/hosts/master/data/tyzbit/hosts

data/tyzbit/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/tyzbit/hosts/master/data/tyzbit/hosts"
+}

data/yoyo.org/update.info

@@ -1 +0,0 @@
-https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext&useip=0.0.0.0

data/yoyo.org/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext&useip=0.0.0.0"
+}

extensions/gambling/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/gambling-hosts

extensions/gambling/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/gambling-hosts"
+}

extensions/porn/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/pornography-hosts

extensions/porn/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/pornography-hosts"
+}

extensions/social/update.info

@@ -1 +0,0 @@
-https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/social-hosts

extensions/social/update.json

@@ -0,0 +1,3 @@
+{
+    "url": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/social-hosts"
+}

updateHostsFile.py

@@ -87,7 +87,7 @@ defaults = {
     "datafilenames" : "hosts",
     "targetip" : "0.0.0.0",
     "ziphosts" : False,
-    "updateurlfilename" : "update.info",
+    "sourcedatafilename" : "update.json",
     "readmefilename" : "readme.md",
     "readmetemplate" : os.path.join(BASEDIR_PATH, "readme_template.md"),
     "readmedata" : {},
@@ -260,14 +260,14 @@ def updateAllSources():
                     print ("Skipping.")
 
 def getUpdateURLsFromFile(source):
-    pathToUpdateFile = os.path.join(settings["datapath"], source, settings["updateurlfilename"])
+    pathToUpdateFile = os.path.join(settings["datapath"], source, settings["sourcedatafilename"])
     if os.path.exists(pathToUpdateFile):
         updateFile = open(pathToUpdateFile, "r")
-        retURLs     = updateFile.readlines()
-        # .strip()
+        updateData = json.load(updateFile)
+        retURLs    = [updateData["url"]]
         updateFile.close()
     else:
-        retURL = None
+        retURLs = None
         printFailure("Warning: Can't find the update file for source " + source + "\n" +
                      "Make sure that there's a file at " + pathToUpdateFile)
     return retURLs
@@ -275,10 +275,11 @@ def getUpdateURLsFromFile(source):
 
 
 def getUpdateURLFromFile(source):
-    pathToUpdateFile = os.path.join(settings["datapath"], source, settings["updateurlfilename"])
+    pathToUpdateFile = os.path.join(settings["datapath"], source, settings["sourcedatafilename"])
     if os.path.exists(pathToUpdateFile):
         with open(pathToUpdateFile, "r") as updateFile:
-            return updateFile.readline().strip()
+            updateData = json.load(updateFile)
+            return [updateData["url"]]
     printFailure("Warning: Can't find the update file for source " + source + "\n" +
                  "Make sure that there's a file at " + pathToUpdateFile)
     return None