Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: MIOG_MIOG <[email protected]>
  • Loading branch information
JuLi0n21 and MIOGMIOG committed Sep 30, 2024
1 parent f9eeca4 commit 2af0542
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def generate_blocklist(output_file, format, is_sitelist_plus: bool = False, filt
num_entries = 0
with open(sitelist_file, 'r') as f_filtered:
num_entries += countUncommentedLines(sitelist_file)
if(is_sitelist_plus):
if (is_sitelist_plus):
num_entries += countUncommentedLines(sitelist_file_plus)
if format == 'ublock':
num_entries += countUncommentedLines(filterlist_file_ublock_only)
Expand Down Expand Up @@ -45,7 +45,7 @@ def generate_blocklist(output_file, format, is_sitelist_plus: bool = False, filt

# Add proper filterlist formatting
domains_lines = formatFile(sitelist_file, format)
if(is_sitelist_plus):
if (is_sitelist_plus):
domains_lines_plus = formatFile(sitelist_file_plus, format)

# Write modified header and filtered content
Expand All @@ -54,7 +54,7 @@ def generate_blocklist(output_file, format, is_sitelist_plus: bool = False, filt
f_combined.writelines(header_lines)
f_combined.writelines("\n")
f_combined.writelines(domains_lines)
if(is_sitelist_plus):
if (is_sitelist_plus):
if format == 'domains' or format == 'hosts' or format == 'wildcard_domains':
f_combined.writelines("\n")
f_combined.writelines(domains_lines_plus)
Expand Down Expand Up @@ -97,11 +97,11 @@ def countUncommentedLines(filename: str) -> int:
print("Generating filterlist.")
# Generate Plus version filterlist files
generate_blocklist("filterlist.txt", "ublock", True, "filters-ublock-only.txt")
generate_blocklist("filterlist-abp.txt", "abp", True, "sitelist-plus.txt")
generate_blocklist("filterlist-domains.txt", "domains", True, "sitelist-plus.txt")
generate_blocklist("filterlist-wildcard-domains.txt", "wildcard_domains", True, "sitelist-plus.txt")
generate_blocklist("filterlist-wildcard-urls.txt", "wildcard_urls", True, "sitelist-plus.txt")
generate_blocklist("filterlist-hosts.txt", "hosts", True, "sitelist-plus.txt")
generate_blocklist("filterlist-abp.txt", "abp", True)
generate_blocklist("filterlist-domains.txt", "domains", True)
generate_blocklist("filterlist-wildcard-domains.txt", "wildcard_domains", True)
generate_blocklist("filterlist-wildcard-urls.txt", "wildcard_urls", True)
generate_blocklist("filterlist-hosts.txt", "hosts", True)
# Generate Basic version filterlist files
generate_blocklist("filterlist-basic.txt", "ublock", False, "filters-ublock-only.txt")
generate_blocklist("filterlist-basic-abp.txt", "abp")
Expand Down

0 comments on commit 2af0542

Please sign in to comment.