d3cim
/
block
mirror of https://github.com/d3cim/block.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[REVERT] - Merge pull request '[UPDATE] Fix parsing remote files containing wildcards' 

3964cf2622
This commit is contained in:
quindecim 2021-07-23 15:12:35 +02:00
parent 3964cf2622
commit 5428003236
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/generate-domains-blocklist.py Executable file → Normal file
View File

@ -20,7 +20,7 @@ except (ImportError, ModuleNotFoundError):
def parse_time_restricted_list(content): def parse_time_restricted_list(content):
rx_comment = re.compile(r"^(#|$)") rx_comment = re.compile(r"^(#|$)")
rx_inline_comment = re.compile(r"\s*#\s*[a-z0-9-].*$") rx_inline_comment = re.compile(r"\s*#\s*[a-z0-9-].*$")
rx_trusted = re.compile(r"^(=?[*a-z0-9.\-\[\]\?\:]+)\s*(@\S+)?$") rx_trusted = re.compile(r"^([*a-z0-9.-]+)\s*(@\S+)?$")
rx_timed = re.compile(r".+\s*(@\S+)?$") rx_timed = re.compile(r".+\s*(@\S+)?$")
names = set() names = set()
@ -61,15 +61,13 @@ def parse_list(content, trusted=False):
rx_mdl = re.compile(r'^"[^"]+","([a-z0-9][a-z0-9.-]*[.][a-z]{2,})",') rx_mdl = re.compile(r'^"[^"]+","([a-z0-9][a-z0-9.-]*[.][a-z]{2,})",')
rx_b = re.compile(r"^([a-z0-9][a-z0-9.-]*[.][a-z]{2,}),.+,[0-9: /-]+,") rx_b = re.compile(r"^([a-z0-9][a-z0-9.-]*[.][a-z]{2,}),.+,[0-9: /-]+,")
rx_dq = re.compile(r"^address=/([a-z0-9][a-z0-9.-]*[.][a-z]{2,})/.") rx_dq = re.compile(r"^address=/([a-z0-9][a-z0-9.-]*[.][a-z]{2,})/.")
rx_trusted = re.compile(r"^(=?[*a-z0-9.\-\[\]\?\:]+)\s*(@\S+)?$")
if trusted: if trusted:
return parse_trusted_list(content) return parse_trusted_list(content)
names = set() names = set()
time_restrictions = {} time_restrictions = {}
rx_set = [rx_u, rx_l, rx_h, rx_mdl, rx_b, rx_dq, rx_trusted] rx_set = [rx_u, rx_l, rx_h, rx_mdl, rx_b, rx_dq]
for line in content.splitlines(): for line in content.splitlines():
line = str.lower(str.strip(line)) line = str.lower(str.strip(line))
if rx_comment.match(line): if rx_comment.match(line):
@ -81,12 +79,6 @@ def parse_list(content, trusted=False):
continue continue
name = matches.group(1) name = matches.group(1)
names.add(name) names.add(name)
try:
time_restriction = matches.group(2)
if time_restriction:
time_restrictions[name] = time_restriction
except IndexError as e:
pass
return names, time_restrictions return names, time_restrictions