Update AGH_filters.py

Deci8BelioS · Oct 18, 2024 · 782618b · 782618b
1 parent c3b257a
commit 782618b
Showing 1 changed file with 13 additions and 36 deletions.
diff --git a/AGH/AGH_filters.py b/AGH/AGH_filters.py
@@ -1,6 +1,6 @@
 import requests, re
 
-from regex import REGEX, LIST_WHITELIST, DOMAIN_LIST, SUBDOMAIN_DUPLICATE, SUBDOMAIN_DUPLICATE2, SUBDOMAIN_DUPLICATE3, SUBDOMAIN_DUPLICATE4, SUBDOMAIN_DUPLICATE5, SUBDOMAIN_DUPLICATE6, SUBDOMAIN_DUPLICATE7, SUBDOMAIN_DUPLICATE8, SUBDOMAIN_DUPLICATE9, SUBDOMAIN_DUPLICATE10
+from regex import REGEX, LIST_WHITELIST, DOMAIN_LIST, SUBDOMAIN_PATTERNS
 
 output_file = r'hosts.txt'
 l1n3 = ['#', '!', '-', '*', '/', '.', '&', '%', '~', '?', '[', ']', '^', ':', '@', '<', 'fe80::', 'ff00::', 'ff02::']
@@ -31,37 +31,18 @@ def filter_lines(lines):
         line = clean_line(line)
         if line.startswith(tuple(l1n3)) or not line:
             continue
-        if line.endswith(SUBDOMAIN_DUPLICATE2):
-            normal_domains.add(f"*.{SUBDOMAIN_DUPLICATE2}")
+        if line.endswith("r2.dev"):
+            normal_domains.add("*.r2.dev")
             continue
-        if line.endswith(SUBDOMAIN_DUPLICATE4):
-            normal_domains.add(f"{SUBDOMAIN_DUPLICATE4}")
+        if line.endswith("aomg5bzv7.com"):
+            normal_domains.add("aomg5bzv7.com")
             continue
-        if line.startswith(SUBDOMAIN_DUPLICATE):
-            normal_domains.add(f"{SUBDOMAIN_DUPLICATE}*.*")
-            continue
-        if line.startswith(SUBDOMAIN_DUPLICATE3):
-            normal_domains.add(f"{SUBDOMAIN_DUPLICATE3}*.*")
-            continue
-        if line.startswith(SUBDOMAIN_DUPLICATE5):
-            normal_domains.add(f"{SUBDOMAIN_DUPLICATE5}*")
-            continue
-        if line.startswith(SUBDOMAIN_DUPLICATE6):
-            normal_domains.add(f"{SUBDOMAIN_DUPLICATE6}*")
-            continue
-        if line.startswith(SUBDOMAIN_DUPLICATE7):
-            normal_domains.add(f"{SUBDOMAIN_DUPLICATE7}*")
-            continue
-        if line.startswith(SUBDOMAIN_DUPLICATE8):
-            normal_domains.add(f"{SUBDOMAIN_DUPLICATE8}*.*")
-            continue
-        if line.startswith(SUBDOMAIN_DUPLICATE9):
-            normal_domains.add(f"{SUBDOMAIN_DUPLICATE9}*")
-            continue
-        if line.startswith(SUBDOMAIN_DUPLICATE10):
-            normal_domains.add(f"{SUBDOMAIN_DUPLICATE10}*.*")
-            continue
-        normal_domains.add(line.strip())
+        for subdomain, pattern in SUBDOMAIN_PATTERNS.items():
+            if line.startswith(subdomain):
+                normal_domains.add(f"{subdomain}{pattern}")
+                break
+        else:
+            normal_domains.add(line.strip())
     return normal_domains
 
 unified_content = set()
@@ -95,12 +76,8 @@ def filter_lines(lines):
             continue
         if domain.endswith(tuple(DOMAIN_LIST)) and not domain.startswith(tuple(DOMAIN_LIST)) or not domain:
             continue
-        if domain.startswith('@@'):
-            domain = f'{domain}^'.replace('|^', '^|')
-        if not domain.startswith('||') and not domain.startswith('@@') and not domain.startswith('|') and not domain.startswith('<'):
-            domain = f'||{domain}'
-        if not domain.endswith('^') and not domain.endswith('^|') and not domain.endswith('^$important') and not domain.startswith('<'):
-            domain = f'{domain}^'.replace('$important^', '^$important')
+        if not domain.startswith('||') and not domain.startswith('@@') and not domain.startswith('|') and not domain.startswith('<') and not domain.endswith('^'):
+            domain = f'||{domain}^'
         f.write(f"{domain}\n")
 
 print(f"File '{output_file}' generated successfully.")