jh163888/anti-AD
1
0
Fork 0
mirror of https://github.com/privacy-protection-tools/anti-AD.git synced 2025-02-13 17:12:41 +08:00
Code Issues Projects Releases Wiki Activity

更新输出格式

Browse Source
This commit is contained in:
gently 2020-02-10 17:45:44 +08:00
parent 8f812dfe24
commit e4be6b9203
6 changed files with 221 additions and 1439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
adblock-for-dnsmasq.conf
View File

@ -1,6 +1,6 @@
#VER=20200210091359
#VER=20200210094143
#URL=https://github.com/privacy-protection-tools/anti-AD
#TOTAL COUNT=31344
#TOTAL_COUNT=31361
address=/0024aaaa.com/
address=/0026645142c89aeb1.com/
address=/003store.com/
@ -1645,7 +1645,6 @@ address=/ynuf.alibaba.com/
address=/dmtracking.alibaba.com/
address=/hydra.alibaba.com/
address=/p4psearch.china.alibaba.com/
address=/fourier.alibaba.com/
address=/acootaul.net/
address=/acount.alley.ws/
address=/acq.io/
@ -17316,7 +17315,6 @@ address=/o6uea.cn/
address=/oa-panther.data.aliyun.com/
address=/acjs.aliyun.com/
address=/osfota.cdn.aliyun.com/
address=/promotion.aliyun.com/
address=/oabcufwk.com/
address=/oacautoh.net/
address=/oacram.com/
@ -22624,7 +22622,27 @@ address=/tannelssepara.info/
address=/tantella.com/
address=/tantoporno.com/
address=/tanwanyx.com/
address=/tanx.com/
address=/toruk.tanx.com/
address=/a.tanx.com/
address=/cdn.tanx.com/
address=/click.tanx.com/
address=/cmc.tanx.com/
address=/cms.opendsp.tanx.com/
address=/cms.tanx.com/
address=/df.tanx.com/
address=/ecpm.tanx.com/
address=/ef-dongfeng.tanx.com/
address=/ef.opendsp.tanx.com/
address=/ef.tanx.com/
address=/et.tanx.com/
address=/ex.tanx.com/
address=/ifs.tanx.com/
address=/ope.tanx.com/
address=/opehs.tanx.com/
address=/p.tanx.com/
address=/pcookie.tanx.com/
address=/phs.tanx.com/
address=/rdstat.tanx.com/
address=/taobaoaliyun.cn/
address=/taobaojx.com/
address=/taobayun.cn/
@ -27612,7 +27630,6 @@ address=/wtradv.market.xiaomi.com/
address=/data.mistat.intl.xiaomi.com/
address=/adv.sec.miui.com/
address=/admob.xiaomi.com/
address=/file.market.xiaomi.com/
address=/tujidao.com/
address=/a.tuuituii2999.com/
address=/a.vserv.mobi/

8
anti-ad-domains.txt
View File

@ -1,6 +1,6 @@
#VER=20200210091359
#VER=20200210094143
#URL=https://github.com/privacy-protection-tools/anti-AD
#TOTAL COUNT=35855
#TOTAL_COUNT=35851
0024aaaa.com
0026645142c89aeb1.com
003store.com
@ -1945,7 +1945,6 @@ ynuf.alibaba.com
dmtracking.alibaba.com
hydra.alibaba.com
p4psearch.china.alibaba.com
fourier.alibaba.com
acootaul.net
acount.alley.ws
acq.io
@ -20107,7 +20106,6 @@ o6uea.cn
oa-panther.data.aliyun.com
acjs.aliyun.com
osfota.cdn.aliyun.com
promotion.aliyun.com
oabcufwk.com
oacautoh.net
oacram.com
@ -25927,7 +25925,6 @@ tanwanyx.com
b.code.tanwanyx.com
hv.code.tanwanyx.com
xd.code.tanwanyx.com
tanx.com
toruk.tanx.com
a.tanx.com
cdn.tanx.com
@ -31561,7 +31558,6 @@ adv.sec.miui.com
ad.intl.xiaomi.com
ad.xiaomi.com
admob.xiaomi.com
file.market.xiaomi.com
a.tujidao.com
www.tujidao.com
a.tuuituii2999.com

1582
anti-ad-easylist.txt
View File

File diff suppressed because it is too large Load Diff

29
anti-ad-surge.txt
View File

@ -1,6 +1,6 @@
#VER=20200210091359
#VER=20200210094143
#URL=https://github.com/privacy-protection-tools/anti-AD
#TOTAL COUNT=31344
#TOTAL_COUNT=31361
DOMAIN-SUFFIX,0024aaaa.com
DOMAIN-SUFFIX,0026645142c89aeb1.com
DOMAIN-SUFFIX,003store.com
@ -1645,7 +1645,6 @@ DOMAIN-SUFFIX,ynuf.alibaba.com
DOMAIN-SUFFIX,dmtracking.alibaba.com
DOMAIN-SUFFIX,hydra.alibaba.com
DOMAIN-SUFFIX,p4psearch.china.alibaba.com
DOMAIN-SUFFIX,fourier.alibaba.com
DOMAIN-SUFFIX,acootaul.net
DOMAIN-SUFFIX,acount.alley.ws
DOMAIN-SUFFIX,acq.io
@ -17316,7 +17315,6 @@ DOMAIN-SUFFIX,o6uea.cn
DOMAIN-SUFFIX,oa-panther.data.aliyun.com
DOMAIN-SUFFIX,acjs.aliyun.com
DOMAIN-SUFFIX,osfota.cdn.aliyun.com
DOMAIN-SUFFIX,promotion.aliyun.com
DOMAIN-SUFFIX,oabcufwk.com
DOMAIN-SUFFIX,oacautoh.net
DOMAIN-SUFFIX,oacram.com
@ -22624,7 +22622,27 @@ DOMAIN-SUFFIX,tannelssepara.info
DOMAIN-SUFFIX,tantella.com
DOMAIN-SUFFIX,tantoporno.com
DOMAIN-SUFFIX,tanwanyx.com
DOMAIN-SUFFIX,tanx.com
DOMAIN-SUFFIX,toruk.tanx.com
DOMAIN-SUFFIX,a.tanx.com
DOMAIN-SUFFIX,cdn.tanx.com
DOMAIN-SUFFIX,click.tanx.com
DOMAIN-SUFFIX,cmc.tanx.com
DOMAIN-SUFFIX,cms.opendsp.tanx.com
DOMAIN-SUFFIX,cms.tanx.com
DOMAIN-SUFFIX,df.tanx.com
DOMAIN-SUFFIX,ecpm.tanx.com
DOMAIN-SUFFIX,ef-dongfeng.tanx.com
DOMAIN-SUFFIX,ef.opendsp.tanx.com
DOMAIN-SUFFIX,ef.tanx.com
DOMAIN-SUFFIX,et.tanx.com
DOMAIN-SUFFIX,ex.tanx.com
DOMAIN-SUFFIX,ifs.tanx.com
DOMAIN-SUFFIX,ope.tanx.com
DOMAIN-SUFFIX,opehs.tanx.com
DOMAIN-SUFFIX,p.tanx.com
DOMAIN-SUFFIX,pcookie.tanx.com
DOMAIN-SUFFIX,phs.tanx.com
DOMAIN-SUFFIX,rdstat.tanx.com
DOMAIN-SUFFIX,taobaoaliyun.cn
DOMAIN-SUFFIX,taobaojx.com
DOMAIN-SUFFIX,taobayun.cn
@ -27612,7 +27630,6 @@ DOMAIN-SUFFIX,wtradv.market.xiaomi.com
DOMAIN-SUFFIX,data.mistat.intl.xiaomi.com
DOMAIN-SUFFIX,adv.sec.miui.com
DOMAIN-SUFFIX,admob.xiaomi.com
DOMAIN-SUFFIX,file.market.xiaomi.com
DOMAIN-SUFFIX,tujidao.com
DOMAIN-SUFFIX,a.tuuituii2999.com
DOMAIN-SUFFIX,a.vserv.mobi

8
lib/writerFormat.class.php
View File

@ -11,7 +11,7 @@ class writerFormat{
/*dnsmasq支持格式的屏蔽广告列表*/
const DNSMASQ = array(
'format' => 'address=/{DOMAIN}/',
'header' => "#VER={DATE}\n#URL={URL}\n#TOTAL COUNT={COUNT}\n",
'header' => "#VER={DATE}\n#URL={URL}\n#TOTAL_COUNT={COUNT}\n",
'full_domain' => 0,
'name' => 'dnsmasq',
'filename' => 'adblock-for-dnsmasq.conf',
@ -39,7 +39,7 @@ class writerFormat{
/*easylist 兼容格式的屏蔽广告列表*/
const EASYLIST = array(
'format' => '||{DOMAIN}^',
'header' => "!AdBlock-style blocklists\n!VER={DATE}\n!URL={URL}\n!TOTAL COUNT=UNLIMITED\n",
'header' => "!AdBlock-style blocklists\n!VER={DATE}\n!URL={URL}\n",
'full_domain' => 0,
'name' => 'easylist',
'filename' => 'anti-ad-easylist.txt',
@ -67,7 +67,7 @@ class writerFormat{
/*Surge 兼容格式的屏蔽广告列表*/
const SURGE = array(
'format' => 'DOMAIN-SUFFIX,{DOMAIN}',
'header' => "#VER={DATE}\n#URL={URL}\n#TOTAL COUNT={COUNT}\n",
'header' => "#VER={DATE}\n#URL={URL}\n#TOTAL_COUNT={COUNT}\n",
'full_domain' => 0,
'name' => 'surge',
'filename' => 'anti-ad-surge.txt',
@ -95,7 +95,7 @@ class writerFormat{
/*Domains 格式的屏蔽广告列表，用于支持pi-hole等*/
const DOMAINS = array(
'format' => '{DOMAIN}',
'header' => "#VER={DATE}\n#URL={URL}\n#TOTAL COUNT={COUNT}\n",
'header' => "#VER={DATE}\n#URL={URL}\n#TOTAL_COUNT={COUNT}\n",
'full_domain' => 1, //保留子域名，即使其上级域名
'name' => 'domains',
'filename' => 'anti-ad-domains.txt',

4
make-addr.php
View File

@ -65,7 +65,7 @@ foreach($formatterList as $name => $formatObj){
$arr_src_domains = array_merge_recursive($arr_src_domains, $ARR_BLACKLIST);
$arr_output[] = addressMaker::write_to_file($arr_src_domains, $formatObj, $arr_tmp_whitelist);
$arr_output[] = '[' . $name . ']:' . addressMaker::write_to_file($arr_src_domains, $formatObj, $arr_tmp_whitelist);
}
var_dump($arr_output);
echo join(',', $arr_output);