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 2019-12-16 23:17:47 +08:00
parent c475c2b9f5
commit 2c1d01e06e
4 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
adblock-for-dnsmasq.conf
View File

@ -1,4 +1,4 @@
#TIME=20191216142455
#TIME=20191216151634
#URL=https://github.com/privacy-protection-tools/anti-AD
address=/0024aaaa.com/
address=/0026645142c89aeb1.com/
@ -6142,6 +6142,8 @@ address=/chqulqxfghdz.com/
address=/christinehris.com/
address=/chromc.com/
address=/chrome.google.com/
address=/googleadapis.l.google.com/
address=/gstaticadssl.l.google.com/
address=/mail-ads.google.com/
address=/plusone.google.com/
address=/adservice.google.com/
@ -10713,7 +10715,7 @@ address=/appsupport.qq.com/
address=/astat.bugly.qq.com/
address=/astrategy.beacon.qq.com/
address=/bksoup.v.qq.com/
address=/bs.l.qq.com/
address=/l.qq.com/
address=/btrace.qq.com/
address=/btrace.video.qq.com/
address=/bugreportv2.qq.com/
@ -11646,6 +11648,7 @@ address=/gvoraoonpi.com/
address=/gvoszbzfzmtl.com/
address=/gvrqquiotcyr.com/
address=/gvsvegtnsyoxt.bid/
address=/gvt1.com/
address=/gvt2.com/
address=/gvtawzpydsujep.com/
address=/gvwyxnyq.com/
@ -31384,6 +31387,7 @@ address=/bd2.zuimeitianqi.com/
address=/hwad.zuimeitianqi.com/
address=/stat.zuimeitianqi.com/
address=/ae.bdstatic.com/
address=/b.bdstatic.com/
address=/gss0.bdstatic.com/
address=/mipcache.bdstatic.com/
address=/su.bdstatic.com/
@ -35032,6 +35036,7 @@ address=/vxsnk.com/
address=/w1a.cc/
address=/wwww.adleads.com/
address=/wancai.com/
address=/wangbase.com/
address=/wannianli.mobi/
address=/web605.cn/
address=/webdissector.com/

5
lib/addressMaker.class.php
View File

@ -9,7 +9,6 @@
*
*/
class addressMaker {
/**
@ -37,8 +36,8 @@ class addressMaker {
$str_reg .= ')';
$str_reg .= '(\.cn|\.hk|\.tw|\.uk|\.jp|\.kr|\.th|\.au|\.ua|\.so|\.br|\.sg|\.pt|\.ec|\.ar|\.my|\.tr|\.bd|\.mk|\.za|\.mt)?)$/';
if(preg_match($str_reg, $str_domain, $matchs)){
return strval($matchs[1]);
if(preg_match($str_reg, $str_domain, $matches)){
return strval($matches[1]);
}
return "";

17
lib/writerFormat.class.php Normal file
View File

@ -0,0 +1,17 @@
<?php
/**
* 定义输出格式
*
*
*/
class writerFormat{
/*dnsmasq支持格式的屏蔽广告列表*/
const DNSMASQ = array('format' => 'address=/{DOMAIN}/', 'header' => "#TIME={DATE}\n#URL={URL}\n");
/*easylist 兼容格式的屏蔽广告列表*/
const EASYLIST = array('format' => '||{DOMAIN}^', 'header' => "#TIME={DATE}\n#URL={URL}\n");
/*Surge 兼容格式的屏蔽广告列表*/
const SURGE = array('format' => 'DOMAIN-SUFFIX,{DOMAIN},REJECT', 'header' => "#TIME={DATE}\n#URL={URL}\n[RULE]\n");
/*and etc...*/
}

12
make-addr.php
View File

@ -9,21 +9,19 @@
*
*/
define('ROOT_DIR', __DIR__ . '/');
set_time_limit(600);
error_reporting(0);
if(PHP_SAPI != 'cli'){
die('nothing.');
}
require('./lib/addressMaker.class.php');
$arr_blacklist = require('./lib/black_domain_list.php');
$arr_whitelist = require('./lib/white_domain_list.php');
require ROOT_DIR . 'lib/writerFormat.class.php';
require ROOT_DIR . 'lib/addressMaker.class.php';
$arr_result = array();
$easylist = file_get_contents('./origin-files/base-src-easylist.txt');
$arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_from_easylist($easylist));
@ -31,6 +29,6 @@ $hosts = file_get_contents('./origin-files/base-src-hosts.txt');
$arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_list($hosts));
echo 'Written file size:';
echo addressMaker::write_to_conf($arr_result, './adblock-for-dnsmasq.conf', 'q-filter.conf');
echo addressMaker::write_to_conf($arr_result, './adblock-for-dnsmasq.conf');