Fix #248

AdGuard Home Compilation List/AGHtest.py

@@ -356,7 +356,7 @@ def prepare_agh(lines) -> str:
 
         line = re.sub(
            r"\|\|([0-9][0-9]?[0-9]?)\.([0-9][0-9]?[0-9]?)\.$", 
-           r"://\1.\2.\n@@://\1.\2.*in-addr.arpa^", 
+           r"", 
            line
         )
 
@@ -594,6 +594,12 @@ def prepare_agh(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"^://[1-2]?[0-9]?[0-9]\.[1-2]?[0-9]?[0-9]\.$", 
+           r"", 
+           line
+        )
+
         if is_supported_agh(line) and not line == '':
             text += line + '\r\n'
 
@@ -855,7 +861,7 @@ def prepare_ip(lines) -> str:
 
         line = re.sub(
            r"^([0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?)\.$", 
-           r"\1.0.0/16", 
+           r"", 
            line
         )
 
@@ -933,7 +939,7 @@ def prepare_ip(lines) -> str:
 
         line = re.sub(
            r"^/\(https\?:\\/\\/\)([0-9][0-9]?[0-9]?)\\.([0-9][0-9]?[0-9]?)\\.\..*/", 
-           r"\1.\2.0.0/16", 
+           r"", 
            line
         )
 
@@ -961,6 +967,12 @@ def prepare_ip(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"^ $", 
+           r"", 
+           line
+        )
+
         if is_supported_ip(line) and not line == '':
             text += line + '\r\n'
 

AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt

@@ -3,15 +3,10 @@
 ! Expires: 14 days
 ! Licence: In accordance with the Dandelicence, the borrowed entries are considered to have been changed and reduced enough from their original lists, that they're counted as transformative work, meaning that creditation and seperate paragraphs are not necessary unless one of the lists' makers were to ask for such.
 ! Description: This was made as a proof-of-concept to see if the IP-based entries of major adblock lists, could be used to create an IP adblocker list for IP blockers, despite how IP lists are normally only meant to block malware, E-mail spam, or port scanners.
-! Version: 05July2021v1-Alpha
-104.197.0.0/16
-104.198.0.0/16
-130.211.0.0/16
+! Version: 05August2021v1-Alpha
 142.91.159.0/24
 213.32.115.0/24
-216.21.0.0/16
 217.182.11.0/24
-51.158.0.0/16
 51.195.31.0/24
 35.232.188.118
 51.77.227.100
@@ -141,4 +136,4 @@
 37.59.72.131
 46.151.209.69
 104.154.237.193
-35.188.59.75
+35.188.59.75