Skip to content

Commit

Permalink
Add known licenses data to json metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
brarcher committed Oct 25, 2017
1 parent 3b0ab4f commit dad4378
Show file tree
Hide file tree
Showing 19 changed files with 54 additions and 36 deletions.
3 changes: 2 additions & 1 deletion data/Badd-Boyz-Hosts/update.json
Expand Up @@ -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'"
}
5 changes: 3 additions & 2 deletions data/KADhosts/update.json
Expand Up @@ -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"
}
"url": "https://raw.githubusercontent.com/azet12/KADhosts/master/KADhosts.txt",
"license": "GPLv3"
}
3 changes: 2 additions & 1 deletion data/SpotifyAds/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion data/UncheckyAds/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion data/adaway.org/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion data/add.2o7Net/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion data/add.Dead/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion data/add.Risk/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion data/add.Spam/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion data/malwaredomainlist.com/update.json
Expand Up @@ -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'"
}
3 changes: 2 additions & 1 deletion data/mvps.org/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion data/someonewhocares.org/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion extensions/fakenews/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion extensions/gambling/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion extensions/porn/sinfonietta-snuff/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion extensions/porn/sinfonietta/update.json
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion extensions/social/update.json
Expand Up @@ -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"
}
32 changes: 16 additions & 16 deletions readme_template.md
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions updateReadme.py
Expand Up @@ -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("-", ", ")
Expand Down

0 comments on commit dad4378

Please sign in to comment.