From e2a25d240a96b1fa7a2f652c6a5f618c2731e803 Mon Sep 17 00:00:00 2001
From: gently <1243610+gentlyxu@users.noreply.github.com>
Date: Sun, 26 Jul 2020 23:24:29 +0800
Subject: [PATCH] add new regex rules

---
 anti-ad-easylist.txt              | 26 ++++----------------------
 scripts/tools/easylist-extend.php |  5 +++--
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt
index f8e2a892..e814f87b 100644
--- a/anti-ad-easylist.txt
+++ b/anti-ad-easylist.txt
@@ -1,7 +1,7 @@
 !TITLE=anti-AD
-!VER=20200726225412
+!VER=20200726232322
 !URL=https://github.com/privacy-protection-tools/anti-AD
-!TOTAL_LINES=34897
+!TOTAL_LINES=34879
 ||*.wap.xsbiquge.com^
 ||*serror*.wo.com.cn^
 ||201*.myhard.com^
@@ -10310,18 +10310,7 @@
 ||e521d17fa185a2.com^
 ||e647ob.cn^
 ||e6cfmdmo81.com^
-||e7001.com^
-||e7002.com^
-||e7009.com^
-||e701.net^
-||e70123.com^
-||e7015.com^
-||e703.net^
-||e704.net^
-||e705.net^
-||e706.net^
-||e708.net^
-||e719.net^
+/^(\S+\.)?e7[0-9]{2,4}\.(net|com)?$/
 ||e7is2u38.top^
 ||e8934fbbed0495.com^
 ||e960e146d9b5ca.com^
@@ -12423,22 +12412,15 @@
 ||g-content.bid^
 ||g-statistic.com^
 ||xyoss.g.com.cn^
-||g1341551423.com^
+/^(\S+\.)?g[1-4][0-9]{8,9}\.com?$/
 ||g17media.com^
 ||g1c5.com^
 ||g1dxj6q1qfl2.com^
 ||g1f5.com^
 ||g1thub.com^
-||g2247755016.com^
 ||g22rbb7.com^
-||g2440001011.com^
-||g2526721279.com^
-||g2546417787.com^
 ||g27zkdvsxl.com^
-||g2921554487.com^
 ||g2afse.com^
-||g3369554495.com^
-||g344530742.com^
 ||g35.cc^
 ||g3ao2q.cn^
 ||g3j2wzmon8b.com^
diff --git a/scripts/tools/easylist-extend.php b/scripts/tools/easylist-extend.php
index 91138ce2..c56e8589 100644
--- a/scripts/tools/easylist-extend.php
+++ b/scripts/tools/easylist-extend.php
@@ -106,7 +106,9 @@ $ARR_REGEX_LIST = array(
     '/^(\S+\.)?ali2[a-z]\.xyz$/' => null, //连号
     '/^(\S+\.)?777\-?partners?\.(net|com)$/' => null, //组合
     '/^(\S+\.)?voyage-prive\.[a-z]+(\.uk)?$/' => null, //组合
-    
+    '/^(\S+\.)?e7[0-9]{2,4}\.(net|com)?$/' => null, //组合
+    '/^(\S+\.)?g[1-4][0-9]{8,9}\.com?$/' => null, //批量组合
+
     // '/^(\S+\.)?(?=.*[a-f].*\.com$)(?=.*\d.*\.com$)[a-f0-9]{15,}\.com$/' => null,
 );
 
@@ -234,7 +236,6 @@ while(!feof($src_fp)){
     }
 
     foreach($arr_wild_src as $core_str => $wild_row){
-//        $match_rule = str_replace('*', '.*', $core_str);
         $match_rule = str_replace(array('.', '*'), array('\\.', '.*'), $core_str);
         if(!array_key_exists($core_str, $wrote_wild)){
             $written_size += fwrite($new_fp, "||${core_str}^\n");