Add files via upload

AdGuard Home Compilation List/AGHtest.py

@@ -1,10 +1,10 @@
 import requests
 import re
 
-SOURCES = ['https://gitlab.com/DandelionSprout/adfilt/raw/master/AdGuard%20Home%20Compilation%20List/TopDescription.notlist', 'https://easylist-downloads.adblockplus.org/easylist_noelemhide.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt', 'https://raw.githubusercontent.com/NanoAdblocker/NanoFilters/master/NanoMirror/NanoDefender.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt', 'https://easylist-downloads.adblockplus.org/liste_fr.txt', 'https://www.i-dont-care-about-cookies.eu/abp/', 'https://easylist-downloads.adblockplus.org/easylistgermany.txt', 'https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt']
+SOURCES = ['https://gitlab.com/DandelionSprout/adfilt/raw/master/AdGuard%20Home%20Compilation%20List/TopDescription.notlist', 'https://easylist-downloads.adblockplus.org/easylist_noelemhide.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt', 'https://raw.githubusercontent.com/NanoAdblocker/NanoFilters/master/NanoMirror/NanoDefender.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt', 'https://easylist-downloads.adblockplus.org/liste_fr.txt', 'https://www.i-dont-care-about-cookies.eu/abp/', 'https://easylist-downloads.adblockplus.org/easylistgermany.txt', 'https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt', 'https://easylist-downloads.adblockplus.org/antiadblockfilters.txt', 'https://raw.githubusercontent.com/AdguardTeam/AdguardFilters/master/AnnoyancesFilter/sections/push-notifications.txt']
 
-UNSUPPORTED_AGH = ['##', '@#', '#?#', 'domain=', 'generichide', '$csp', 'xmlhttprequest', '$xhr', '$stylesheet', '~image', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#']
-UNSUPPORTED_IP = ['##', '@#', '#?#', 'domain=', 'generichide', '$csp', 'badfilter', 'xmlhttprequest', '$xhr', '$stylesheet', '~image', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#']
+UNSUPPORTED_AGH = ['##', '@#', '#?#', '#%#', '!+', 'domain=', 'generichide', '$csp', 'xmlhttprequest', '$xhr', '$stylesheet', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#', '$domain', ',domain' ]
+UNSUPPORTED_IP = ['##', '@#', '#?#', '#%#', 'domain=', 'generichide', '$csp', 'badfilter', 'xmlhttprequest', '$xhr', '$stylesheet', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#', '!+']
 
 OUTPUT = 'xyzzyx.txt'
 OUTPUT_AGH = 'AdGuardHomeCompilationList.txt'
@@ -108,12 +108,6 @@ def prepare_agh(lines) -> str:
            line
         )
 
-        line = re.sub(
-           r"([$,])~subdocument", 
-           "", 
-           line
-        )
-
         line = re.sub(
            r"([$,])object", 
            "", 
@@ -138,12 +132,6 @@ def prepare_agh(lines) -> str:
            line
         )
 
-        line = re.sub(
-           r"([$,])~stylesheet", 
-           "", 
-           line
-        )
-
         line = re.sub(
            r",important", 
            "$important", 
@@ -270,12 +258,6 @@ def prepare_agh(lines) -> str:
            line
         )
 
-        line = re.sub(
-           r"^://", 
-           r"||", 
-           line
-        )
-
         line = re.sub(
            r"^\|\|.*/.*", 
            r"", 
@@ -283,7 +265,31 @@ def prepare_agh(lines) -> str:
         )
 
         line = re.sub(
-           r".*\*[&?].*", 
+           r".*\*[&?@].*", 
+           r"", 
+           line
+        )
+
+        line = re.sub(
+           r"^!$", 
+           r"", 
+           line
+        )
+
+        line = re.sub(
+           r"^@@/.*", 
+           r"", 
+           line
+        )
+
+        line = re.sub(
+           r".*\*/[a-z0-9]*", 
+           r"", 
+           line
+        )
+
+        line = re.sub(
+           r"^[,=^/?~].*", 
            r"", 
            line
         )

AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt

@@ -3,7 +3,7 @@
 ! 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: 11December2019v1-Alpha
+! Version: 26December2019v1-Alpha
 104.154.237.93
 174.142.194.177
 194.71.107.25