Commit Graph

2129 Commits

Author SHA1 Message Date
funilrys
dd7904dcc8
Add forgotten sorting.
Indeed, I forgot to sort the content of the hosts file.
2020-04-21 23:54:01 +02:00
funilrys
665dc98191
Unification of the sorting of the sources.
Before this patch, there was no proper sorting and the sources.

As @XhmikosR mentioned in StevenBlack/hosts#1166, without this patch,
the output is totally different in Windows. But let's be honest, if it
is like that under Windows, chances are that the same behavior happens
across different OSes or machines around the globe.

Another reason behind this patch is that - desperate the fact that we
certainly trust @StevenBlack - the integrity of the generated files
could not be guarenteed because of the sorting which may be completely
different from an OS to another and a machine to another.

For those reasons, this patch introduces a unification of the sorting of
all sources.

The idea behind this patch is to have @StevenBlack's ad-hoc hosts
file always on top (1st) and the rest of the sources sorted
alphabetically based on the name of the folder inside the `data`
or `extensions` directory.

This will ensure that we get the same result everywhere.

Concretely speaking, I just added the function (`sort_sources`) which
sorts a given list of sources files. And later on, call the new function
everywhere it was necessary. Tests of the newly introduced function
are also included.

Contributors:
  * @ScriptTiger
  * @XhmikosR

Notes:
  * This patch fix (completely ?) ScriptTiger/hosts#1
  * This patch fix https://github.com/StevenBlack/hosts/issues/1166#issuecomment-590511086
2020-04-21 22:54:25 +02:00
Steven Black
6548b1af25
Add domains from Issue #1237. 2020-04-20 23:43:38 -04:00
Steven Black
0c9ec0732d
Add domains from Issue #1226. 2020-04-20 23:40:22 -04:00
Steven Black
546a6587cb
Merge pull request #1230 from XhmikosR/patch-1
Update KADhosts homeurl
2020-04-20 14:39:49 -04:00
Steven Black
2e9fb614d5
Merge pull request #1231 from XhmikosR/patch-2
Fix FadeMind's lists license
2020-04-20 14:13:41 -04:00
XhmikosR
cd426b4d8e Update KADhosts homeurl 2020-04-20 09:27:42 +03:00
XhmikosR
7b00af4d07 Fix FadeMind's lists license 2020-04-20 09:27:23 +03:00
Steven Black
5b25845933
Release 2.6.6 2020-04-18 22:39:31 -04:00
Steven Black
ee37f38580
Fix error I introduced in commit daf16c7eba. 2020-04-18 22:39:13 -04:00
Steven Black
7cb8c82481
Release 2.6.5 2020-04-18 20:41:20 -04:00
Steven Black
58d1cfc3b3
Updates from ypyo.org, URLHaus, StevenBlack, KADHosts, and hostsVN. 2020-04-18 20:40:44 -04:00
Steven Black
daf16c7eba
Adding domains related to xHelper. 2020-04-18 20:32:12 -04:00
Steven Black
05d4b42737
Issue #1232: fix - adding ikezijik.ga. 2020-04-18 20:23:01 -04:00
Steven Black
c34d990cf1
Issue #1234: fix - adding Github phishing domains. 2020-04-18 20:19:36 -04:00
Steven Black
6004c65c41
Release 2.6.4 2020-04-16 21:52:02 -04:00
Steven Black
6e71030b58
Updates from sinfonietta, yoyo.org, URLHaaus, KADhosts, Badd-Boyz, and AdAway. 2020-04-16 21:51:42 -04:00
Steven Black
e84761d17d
Add domains from Issue #1229. 2020-04-16 14:10:17 -04:00
Steven Black
dcb32b0b1e
Release 2.6.3 2020-04-13 21:52:11 -04:00
Steven Black
a63fa1291b
Updates from sinfonietta, yoyo.org, URLHaus, ADhosts, hostsVN, Badd-Boyz, and AdAway. 2020-04-13 21:51:51 -04:00
Steven Black
1a2e8765cc
Merge pull request #1227 from djnym/add-wlbl
Allow whitelist/blacklist files to be passed via command line
2020-04-13 20:23:33 -04:00
Anthony Molinaro
4aa8b65cc2 provide defaults for args 2020-04-13 16:20:22 -07:00
Anthony Molinaro
dd2d878e95 Allow whitelist/blacklist files to be passed via command line 2020-04-13 12:14:34 -07:00
Steven Black
a2ab99d9b1
Sort my ad-hoc list. 2020-04-12 18:14:51 -04:00
Steven Black
b655a57e76
Release 2.6.2 2020-04-11 16:37:39 -04:00
Steven Black
6cc5d83fed
Updates from sinfonietta, URLHaus, KADhosts, hostsVN, Badd-Boyz, and AdAway. 2020-04-11 16:37:19 -04:00
Steven Black
832138b4bc
New domain. 2020-04-11 15:31:23 -04:00
Steven Black
3ea9dc7ca9
Release 2.6.1 2020-04-10 22:54:17 -04:00
Steven Black
b91104aa64
Updates from sinfonietta, yoyo.org, URLHaus, KADhosts, and Badd-Boyz. 2020-04-10 22:53:54 -04:00
Steven Black
f058719a56
Issue #1220 - add www.traffclick.ru. 2020-04-10 21:20:44 -04:00
Steven Black
3b7c7caa52
Issue #1221: added three domains raised in this issue. 2020-04-10 21:19:15 -04:00
Steven Black
f5c028779c
Issue #1222: Add globalpagee-prod-webex.com. 2020-04-10 21:17:45 -04:00
Steven Black
d281b49b9f
Resolving FadeMind/hosts.extras/issues/32. 2020-04-10 13:35:34 -04:00
Steven Black
de2de429c8
Release 2.6.0 2020-04-09 15:09:05 -04:00
Steven Black
3e749f1f37
Updates from URLHaus, KADhosts, hostsVN, and add.Risk. 2020-04-09 15:07:59 -04:00
Steven Black
e091bcc185
Merge pull request #1216 from djnym/clean-checkout-fixes
Keep checkout unmodified when adding outputpath.
2020-04-08 16:23:58 -04:00
Anthony Molinaro
b87c81f796 update template not readme 2020-04-08 11:56:50 -07:00
Steven Black
da2c5f86f2
Merge pull request #1217 from XhmikosR/patch-1
Fix typo
2020-04-08 14:54:56 -04:00
Steven Black
8801e184d5
Merge pull request #1218 from PerfectSlayer/patch-1
Update AdAdawy hosts issue report link
2020-04-08 11:44:05 -04:00
PerfectSlayer
f3464b98bf Fix adaway metadata according code review 2020-04-08 15:22:35 +02:00
PerfectSlayer
3768103c1e Revert "Update AdAdawy hosts issue report link"
This reverts commit 0581b133b1.
2020-04-08 15:20:52 +02:00
Bruce BUJON
0581b133b1
Update AdAdawy hosts issue report link
Hi @StevenBlack 

I hope you're going well.
I propose a small change about the link to report an issue about AdAway's default hosts. I link it to the site GitHub project, not the application.
Moreover, @jawz101 has taken over the `hosts` file management. There is [more frequent updates](https://github.com/AdAway/adaway.github.io/commits/master) than ever so you might also want to change the _occasionnaly_ frequence label.

I take the opportunity of this PR to announce your hosts will be integrated as default source for the AdAway application! 🎉 
I think some of the users already added it to their configuration but it will be enabled by default for all new users.
I hope it is fine to you. Don't hesitate to tell me if not.

Regards
2020-04-08 13:11:34 +02:00
Anthony Molinaro
c6b54e9674 update readme.md with new additional argument 2020-04-07 23:26:38 -07:00
Anthony Molinaro
7dd582dac3 2 blank lines? 2020-04-07 23:07:40 -07:00
Anthony Molinaro
cac15b1c11 use nogendata for arg 2020-04-07 22:55:02 -07:00
Anthony Molinaro
37bc3821f8 applied black 2020-04-07 22:44:37 -07:00
Anthony Molinaro
9c1b8b2579 use more succinct name for arg 2020-04-07 22:40:30 -07:00
Anthony Molinaro
aec3738838 fix unit test 2020-04-07 22:18:35 -07:00
XhmikosR
787022fea2
Fix typo 2020-04-08 07:36:24 +03:00
Steven Black
4c3aa77895
Sorting my personal ad-hoc hosts file. 2020-04-08 00:13:24 -04:00