Add ad servers

src/lists/tracker_lowe.txt

@@ -329,7 +329,6 @@ admixer.net
 admized.com
 admob.com
 admonitor.com
-admotion.com.ar
 adn.lrb.co.uk
 adnet.asahi.com
 adnet.biz
@@ -1276,7 +1275,6 @@ blogcounter.de
 blogherads.com
 blogtoplist.se
 blogtopsites.com
-blueadvertise.com
 blueconic.com
 blueconic.net
 bluekai.com
@@ -1694,6 +1692,7 @@ engage.dnsfilter.com
 engagebdr.com
 engine.espace.netavenir.com
 enginenetwork.com
+enormousearth.com
 enquisite.com
 ensighten.com
 entercasino.com
@@ -2192,7 +2191,10 @@ log.btopenworld.com
 log.logrocket.io
 log.pinterest.com
 logger.snackly.co
+logs.datadoghq.com
+logs.datadoghq.eu
 logs.roku.com
+logs.spilgames.com
 logsss.com
 logua.com
 longinglettuce.com

src/tracker_download.py

@@ -64,9 +64,9 @@ def customlist(fname):
 
 
 def easylist(fname, urlname):
-    url = github('easylist/easylist/master/easyprivacy/') + urlname
+    url = github('easylist/easylist/master/') + urlname
     res = set()
-    for x in enum_lines(url, b'!'):
+    for x in enum_lines(url):
         if not x.startswith(b'||'):
             continue
         x = x[2:]
@@ -125,7 +125,8 @@ def combine_all(changes):
         print('  no-change: tracker_all.txt')
         return
     res = set()
-    for fname in ['custom.txt', 'lowe.txt', 'easylist.txt', 'easylist_int.txt',
+    for fname in ['custom.txt', 'lowe.txt',
+                  'easylist.txt', 'easyprivacy', 'easyprivacy_int',
                   'exodus.txt', 'lockdown_clickbait.txt',
                   'lockdown_marketing.txt', 'lockdown_game_ads.txt']:
         for dom in mylib.read_list('tracker_' + fname):
@@ -142,9 +143,12 @@ def process():
     changes = []
     changes += customlist('custom.txt')
     changes += lowe('lowe.txt')
-    changes += easylist('easylist.txt', 'easyprivacy_trackingservers.txt')
-    changes += easylist('easylist_int.txt',
-                        'easyprivacy_trackingservers_international.txt')
+    changes += easylist('easylist.txt',
+                        'easylist/easylist_adservers.txt')
+    changes += easylist('easyprivacy.txt',
+                        'easyprivacy/easyprivacy_trackingservers.txt')
+    changes += easylist('easyprivacy_int.txt',
+                        'easyprivacy/easyprivacy_trackingservers_international.txt')
     changes += exodus('exodus.txt')
     # changes += lockdown('lockdown_clickbait.txt', 'clickbait.txt')
     # changes += lockdown('lockdown_marketing.txt', 'marketing.txt')