From 5ffb9397a7e1685bcb398a1e5de2bb1e37743291 Mon Sep 17 00:00:00 2001
From: Minoplhy <hej@aspoblourib.1w1.one>
Date: Mon, 18 Oct 2021 20:56:39 +0700
Subject: [PATCH] maker merge (#3)

https://github.com/minoplhy/filters-maker/pull/2
---
 action.py | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/action.py b/action.py
index 6f95a90..0c19d5a 100644
--- a/action.py
+++ b/action.py
@@ -3,12 +3,7 @@ sys.path.append('/filters-maker')
 
 import os
 import crawler
-import maker_rpz
-import maker_hosts
-import maker_abp
-import maker_domains
-import maker_unbound
-import maker_dnsmasq
+import maker
 
 incoming = "/reprwiki/Private-build/ucate/domains.txt"
 excluded = "/repros/Resources/excluded.txt"
@@ -44,12 +39,12 @@ crawler.IP_URL_FILTERING(incoming)
 crawler.excluded(excluded, incoming)
 crawler.blankremover(incoming)
 crawler.sort(incoming)
-maker_rpz.RPZbuilding(excluded, incoming, rpz_locat ,Version)
-maker_hosts.hostsbuilding(excluded, incoming, hosts_locat ,Version)
-maker_abp.ABPbuilding(excluded, incoming, abp_locat ,Version)
-maker_unbound.UNBbuilding(excluded, incoming, unb_locat ,Version)
-maker_dnsmasq.DNQbuilding(excluded, incoming, dnq_locat ,Version)
-maker_domains.domainsbuilding(excluded, incoming ,Version)
+maker.RPZBlocklist(excluded, incoming, rpz_locat ,Version)
+maker.HOSTBlocklist(excluded, incoming, hosts_locat ,Version)
+maker.ABPBlocklist(excluded, incoming, abp_locat ,Version)
+maker.UNBOUNDBlocklist(excluded, incoming, unb_locat ,Version)
+maker.DNSMASQBlocklist(excluded, incoming, dnq_locat ,Version)
+maker.DOMAINBlocklist(excluded, incoming ,Version)
 
 incoming = "/reprwiki/Private-build/veneto/domains.txt"
 excluded = "/repros/Resources/excluded.txt"
@@ -77,12 +72,12 @@ crawler.IP_URL_FILTERING(incoming)
 crawler.excluded(excluded, incoming)
 crawler.blankremover(incoming)
 crawler.sort(incoming)
-maker_rpz.RPZbuilding(excluded, incoming, rpz_locat ,Version)
-maker_hosts.hostsbuilding(excluded, incoming, hosts_locat ,Version)
-maker_abp.ABPbuilding(excluded, incoming, abp_locat ,Version)
-maker_unbound.UNBbuilding(excluded, incoming, unb_locat ,Version)
-maker_dnsmasq.DNQbuilding(excluded, incoming, dnq_locat ,Version)
-maker_domains.domainsbuilding(excluded, incoming ,Version)
+maker.RPZBlocklist(excluded, incoming, rpz_locat ,Version)
+maker.HOSTBlocklist(excluded, incoming, hosts_locat ,Version)
+maker.ABPBlocklist(excluded, incoming, abp_locat ,Version)
+maker.UNBOUNDBlocklist(excluded, incoming, unb_locat ,Version)
+maker.DNSMASQBlocklist(excluded, incoming, dnq_locat ,Version)
+maker.DOMAINBlocklist(excluded, incoming ,Version)
                       
 excluded = "/repros/Resources/excluded.txt"
 os.makedirs('/reprwiki/Private-build/Allowlist',exist_ok=True)
@@ -90,9 +85,9 @@ Version = "Allowlist"
 rpz_locat = "/reprwiki/Private-build/Allowlist/rpz.txt"
 abp_locat = "/reprwiki/Private-build/Allowlist/adblock.txt"
 domains_locat = "/reprwiki/Private-build/Allowlist/domains.txt"
-maker_rpz.RPZallowlist(excluded, rpz_locat ,Version)
-maker_abp.ABPallowlist(excluded, abp_locat ,Version)
-maker_domains.DMallowlist(excluded ,domains_locat ,Version)
+maker.RPZAllowlist(excluded, rpz_locat ,Version)
+maker.ABPAllowlist(excluded, abp_locat ,Version)
+maker.DOMAINAllowlist(excluded ,domains_locat ,Version)
                       
 import version
 het = "/repros/version.md"