Add known licenses data to json metadata

diff --git a/data/Badd-Boyz-Hosts/update.json b/data/Badd-Boyz-Hosts/update.json
index 6bfa4a165440b78ba41243603e169b552d42f4ec..f14fabea00f7dd396fb23c986e989d763e55f783 100644 (file)
--- a/data/Badd-Boyz-Hosts/update.json
+++ b/data/Badd-Boyz-Hosts/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/mitchellkrogza/Badd-Boyz-Hosts",
     "frequency": "weekly",
     "issues": "https://github.com/mitchellkrogza/Badd-Boyz-Hosts/issues",
-    "url": "https://raw.githubusercontent.com/mitchellkrogza/Badd-Boyz-Hosts/master/hosts"
+    "url": "https://raw.githubusercontent.com/mitchellkrogza/Badd-Boyz-Hosts/master/hosts",
+    "license": "'non-commercial with attribution'"
 }

diff --git a/data/KADhosts/update.json b/data/KADhosts/update.json
index 43c754838fdf31f39467edafc4c536bd6b5cdfe6..439488f0d1f08d9f3d25c20a5589f871e86b8bdf 100644 (file)
--- a/data/KADhosts/update.json
+++ b/data/KADhosts/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/azet12/KADhosts",
     "frequency": "frequently",
     "issues": "https://github.com/azet12/KADhosts/issues",
-    "url": "https://raw.githubusercontent.com/azet12/KADhosts/master/KADhosts.txt"
-}
\ No newline at end of file
+    "url": "https://raw.githubusercontent.com/azet12/KADhosts/master/KADhosts.txt",
+    "license": "GPLv3"
+}

diff --git a/data/SpotifyAds/update.json b/data/SpotifyAds/update.json
index 9693a0b2a1f0180ef265d2dfb82574e51bddc176..bbb03eb6a4d8a4310a7b7bb09b66ac3d9dad3fb3 100644 (file)
--- a/data/SpotifyAds/update.json
+++ b/data/SpotifyAds/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/FadeMind/hosts.extras",
     "frequency": "occasionally",
     "issues": "https://github.com/FadeMind/hosts.extras/issues",
-    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/SpotifyAds/hosts"
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/SpotifyAds/hosts",
+    "license": "MIT"
 }

diff --git a/data/UncheckyAds/update.json b/data/UncheckyAds/update.json
index 142b34d36c52e31c6fadc8415171ea380b0d8347..b8805e0407b94e37bc3322c65f90a652b291fa47 100644 (file)
--- a/data/UncheckyAds/update.json
+++ b/data/UncheckyAds/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/FadeMind/hosts.extras",
     "frequency": "occasionally",
     "issues": "https://github.com/FadeMind/hosts.extras/issues",
-    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts"
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts",
+    "license": "MIT"
 }

diff --git a/data/adaway.org/update.json b/data/adaway.org/update.json
index a59e42605f0db90cf3777c9eef1bce76760a217c..f2847747ec72eccb20e261e1526e7097f406cd97 100644 (file)
--- a/data/adaway.org/update.json
+++ b/data/adaway.org/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://adaway.org/",
     "frequency": "occasionally",
     "issues": "https://github.com/AdAway/AdAway/issues",
-    "url": "https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt"
+    "url": "https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt",
+    "license": "CC BY 3.0"
 }

diff --git a/data/add.2o7Net/update.json b/data/add.2o7Net/update.json
index cde1e3c7479eb1c3b5db2e8627ee84de577de049..e2dfa1e9c1fdf2ddf2242cf867779e98d3347322 100644 (file)
--- a/data/add.2o7Net/update.json
+++ b/data/add.2o7Net/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/FadeMind/hosts.extras",
     "frequency": "occasionally",
     "issues": "https://github.com/FadeMind/hosts.extras/issues",
-    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts"
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts",
+    "license": "MIT"
 }

diff --git a/data/add.Dead/update.json b/data/add.Dead/update.json
index 61e043ccf0942db15d54d5c5cde35e5fb19b6027..48a2e9f8c571ba40de134fa03a9f547b35bbb271 100644 (file)
--- a/data/add.Dead/update.json
+++ b/data/add.Dead/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/FadeMind/hosts.extras",
     "frequency": "occasionally",
     "issues": "https://github.com/FadeMind/hosts.extras/issues",
-    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Dead/hosts"
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Dead/hosts",
+    "license": "MIT"
 }

diff --git a/data/add.Risk/update.json b/data/add.Risk/update.json
index 6803b15f71c1608218c77e430b77e18706df7bdf..698c84074a3e58341aef5f2157db1181a4276c6d 100644 (file)
--- a/data/add.Risk/update.json
+++ b/data/add.Risk/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/FadeMind/hosts.extras",
     "frequency": "occasionally",
     "issues": "https://github.com/FadeMind/hosts.extras/issues",
-    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts"
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts",
+    "license": "MIT"
 }

diff --git a/data/add.Spam/update.json b/data/add.Spam/update.json
index 8117ee3bfde3ffc6751101789660034c80333db3..8cbd7a89f249f924f34c02ca55fe464e359033ff 100644 (file)
--- a/data/add.Spam/update.json
+++ b/data/add.Spam/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/FadeMind/hosts.extras",
     "frequency": "occasionally",
     "issues": "https://github.com/FadeMind/hosts.extras/issues",
-    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts"
+    "url": "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts",
+    "license": "MIT"
 }

diff --git a/data/malwaredomainlist.com/update.json b/data/malwaredomainlist.com/update.json
index 13b9b80d270927655ff2cf1dfd0846d511112dc9..c267e1edecf930a854dd0a827810f60ec3b6d79b 100644 (file)
--- a/data/malwaredomainlist.com/update.json
+++ b/data/malwaredomainlist.com/update.json
@@ -4,5 +4,6 @@
     "homeurl": "http://www.malwaredomainlist.com/",
     "frequency": "weekly",
     "issues": "http://www.malwaredomainlist.com/contact.php",
-    "url": "https://www.malwaredomainlist.com/hostslist/hosts.txt"
+    "url": "https://www.malwaredomainlist.com/hostslist/hosts.txt",
+    "license": "'can be used for free by anyone'"
 }

diff --git a/data/mvps.org/update.json b/data/mvps.org/update.json
index 8ed734e4c9b3c09846a22eb62842d71f854f96a8..0aaf918919e240c1de8751f3b7a9cd2ecb9fb8e8 100644 (file)
--- a/data/mvps.org/update.json
+++ b/data/mvps.org/update.json
@@ -4,5 +4,6 @@
     "homeurl": "http://winhelp2002.mvps.org/",
     "frequency": "monthly",
     "issues": "mailto:winhelp2002@gmail.com",
-    "url": "http://winhelp2002.mvps.org/hosts.txt"
+    "url": "http://winhelp2002.mvps.org/hosts.txt",
+    "license": "CC BY-NC-SA 4.0"
 }

diff --git a/data/someonewhocares.org/update.json b/data/someonewhocares.org/update.json
index 939e098ab2675672a26a883b598ff23677220cd3..f77405327e02c7c24eea2a38930f271a424eaf6b 100644 (file)
--- a/data/someonewhocares.org/update.json
+++ b/data/someonewhocares.org/update.json
@@ -4,5 +4,6 @@
     "homeurl": "http://someonewhocares.org/hosts/",
     "frequency": "frequently",
     "issues": "hosts@someonewhocares.org",
-    "url": "http://someonewhocares.org/hosts/zero/hosts"
+    "url": "http://someonewhocares.org/hosts/zero/hosts",
+    "license": "non-commercial with attribution"
 }

diff --git a/extensions/fakenews/update.json b/extensions/fakenews/update.json
index aee133f7c2a904e300809e312920b9a6e7f6ba5a..66861f7b7e240928b87acb13544b88602ad12856 100644 (file)
--- a/extensions/fakenews/update.json
+++ b/extensions/fakenews/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/marktron/fakenews",
     "frequency": "occasional",
     "issues": "https://github.com/marktron/fakenews/issues",
-    "url": "https://raw.githubusercontent.com/marktron/fakenews/master/fakenews"
+    "url": "https://raw.githubusercontent.com/marktron/fakenews/master/fakenews",
+    "license": "MIT"
 }

diff --git a/extensions/gambling/update.json b/extensions/gambling/update.json
index e3ca034667599d94d7d7c697c5415b93ecac50f3..d43e44635bca6101cae421d733073f74f3e664b6 100644 (file)
--- a/extensions/gambling/update.json
+++ b/extensions/gambling/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/Sinfonietta/hostfiles",
     "frequency": "occasional",
     "issues": "https://github.com/Sinfonietta/hostfiles/issues",
-    "url": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/gambling-hosts"
+    "url": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/gambling-hosts",
+    "license": "MIT"
 }

diff --git a/extensions/porn/sinfonietta-snuff/update.json b/extensions/porn/sinfonietta-snuff/update.json
index f12ca07f040f2ded1e7b7d0a8e9081750227088f..9421b1139099f25969fa28e8937be76c4d6acf48 100644 (file)
--- a/extensions/porn/sinfonietta-snuff/update.json
+++ b/extensions/porn/sinfonietta-snuff/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/Sinfonietta/hostfiles",
     "frequency": "occasional",
     "issues": "https://github.com/Sinfonietta/hostfiles/issues",
-    "url": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/snuff-hosts"
+    "url": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/snuff-hosts",
+    "license": "MIT"
 }

diff --git a/extensions/porn/sinfonietta/update.json b/extensions/porn/sinfonietta/update.json
index b3d48db91030d3c7a661ed43494504baf343f0bf..872e17cd1744a3d751a2b3e4bc437bb9d77c05b7 100644 (file)
--- a/extensions/porn/sinfonietta/update.json
+++ b/extensions/porn/sinfonietta/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/Sinfonietta/hostfiles",
     "frequency": "occasional",
     "issues": "https://github.com/Sinfonietta/hostfiles/issues",
-    "url": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/pornography-hosts"
+    "url": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/pornography-hosts",
+    "license": "MIT"
 }

diff --git a/extensions/social/update.json b/extensions/social/update.json
index 7bc42267ae7a083da2e36a0bbd81993a81b31965..e71832d5bb78a95786441b2a77b33a9542213e5f 100644 (file)
--- a/extensions/social/update.json
+++ b/extensions/social/update.json
@@ -4,5 +4,6 @@
     "homeurl": "https://github.com/Sinfonietta/hostfiles",
     "frequency": "occasional",
     "issues": "https://github.com/Sinfonietta/hostfiles/issues",
-    "url": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/social-hosts"
+    "url": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/social-hosts",
+    "license": "MIT"
 }

diff --git a/readme_template.md b/readme_template.md
index 40c3db672224a1474b71bcac776d87351e944655..04cb4d032bd8b1d645f0ff33bffd87ae3a362272 100644 (file)
--- a/readme_template.md
+++ b/readme_template.md
@@ -19,22 +19,22 @@ Host file recipe | Readme | Raw hosts | Unique domains | Non Github mirror
 ---------------- |:------:|:---------:|:--------------:|:-------------:
 @TOCROWS@
 
-**Expectation**: These unified hosts files should serve all devices, regardless 
+**Expectation**: These unified hosts files should serve all devices, regardless
 of OS.
 
 ## Sources of hosts data unified in this variant
 
-Updated `hosts` files from the following locations are always unified and 
+Updated `hosts` files from the following locations are always unified and
 included:
 
-Host file source | Description | Home page | Raw hosts | Update frequency 
------------------|-------------|:---------:|:---------:|:-------:
+Host file source | Description | Home page | Raw hosts | Update frequency | License
+-----------------|-------------|:---------:|:---------:|:-------:|:-------:
 @SOURCEROWS@
 
 
 ## Extensions
-The unified hosts file is extensible.  You manage extensions by curating the 
-`extensions/` folder tree. See the `fakenews`, `social`, `gambling`, and `porn` extension 
+The unified hosts file is extensible.  You manage extensions by curating the
+`extensions/` folder tree. See the `fakenews`, `social`, `gambling`, and `porn` extension
 folders.
 
 ## Generate your own unified hosts file
@@ -70,34 +70,34 @@ source's folder). Otherwise, it will use the `hosts` file that's already there.
 `--auto`, or `-a`: run the script without prompting. When `--auto` is invoked,
 
 * Hosts data sources, including extensions, are updated.
-* No extensions are included by default.  Use the `--extensions` or `-e` flag 
+* No extensions are included by default.  Use the `--extensions` or `-e` flag
 to include any you want.
-* Your active hosts file is *not* replaced unless you include the `--replace` 
+* Your active hosts file is *not* replaced unless you include the `--replace`
 flag.
 
-`--backup`, or `-b`: Make a backup of existing hosts file(s) as you generate 
+`--backup`, or `-b`: Make a backup of existing hosts file(s) as you generate
 over them.
 
-`--extensions <ext1> <ext2> <ext3>`, or `-e <ext1> <ext2> <ext3>`: the names 
-of subfolders below the `extensions` folder containing additional 
-category-specific hosts files to include in the amalgamation. Example: 
+`--extensions <ext1> <ext2> <ext3>`, or `-e <ext1> <ext2> <ext3>`: the names
+of subfolders below the `extensions` folder containing additional
+category-specific hosts files to include in the amalgamation. Example:
 `--extensions porn` or `-e social porn`.
 
 `--flush-dns-cache`, or `-f`: skip the prompt for flushing the DNS cache.  
 Only active when `--replace` is also active.
 
-`--ip nnn.nnn.nnn.nnn`, or `-i nnn.nnn.nnn.nnn`: the IP address to use as the 
+`--ip nnn.nnn.nnn.nnn`, or `-i nnn.nnn.nnn.nnn`: the IP address to use as the
 target.  Default is `0.0.0.0`.
 
-`--keepdomaincomments`, or `-k`: `false` (default) or `true`, keep the comments 
+`--keepdomaincomments`, or `-k`: `false` (default) or `true`, keep the comments
 that appear on the same line as domains.  The default is `false` since some
 router-based implementations can't handle comments in-line with hosts.
 
-`--skipstatichosts`, or `-s`: `false` (default) or `true`, 
+`--skipstatichosts`, or `-s`: `false` (default) or `true`,
 
 `--noupdate`, or `-n`: skip fetching updates from hosts data sources.
 
-`--output <subfolder>`, or `-o <subfolder>`: place the generated source file 
+`--output <subfolder>`, or `-o <subfolder>`: place the generated source file
 in a subfolder.  If the subfolder does not exist, it will be created.
 
 `--replace`, or `-r`: trigger replacing your active hosts

diff --git a/updateReadme.py b/updateReadme.py
index 730e29c9c595a39208dc89280fae62d8b5b48440..d18fcf7f5e27c529bd6cd8d0acafc834475b3b2f 100644 (file)
--- a/updateReadme.py
+++ b/updateReadme.py
@@ -58,10 +58,11 @@ def main():
         "homeurl": "",
         "frequency": "",
         "issues": "",
-        "url": ""}
+        "url": "",
+        "license: ""}
 
     t = Template('${name} | ${description} |[link](${homeurl})'
-                 ' | [raw](${url}) | ${frequency} ')
+                 ' | [raw](${url}) | ${frequency} | ${license} ')
 
     for key in keys:
         extensions = key.replace("-", ", ")