From 71cd7eae25dad244f7b7d39910f4065f96d77a07 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 1 Oct 2022 11:14:57 +0200 Subject: [PATCH] Add files via upload --- AdGuard Home Compilation List/AGHtest.py | 42 +++++++++++++++++++ .../AdGuardHomeCompilationList.txt | 38 ++--------------- 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/AdGuard Home Compilation List/AGHtest.py b/AdGuard Home Compilation List/AGHtest.py index 2f9bdd695..d5ee08b1a 100644 --- a/AdGuard Home Compilation List/AGHtest.py +++ b/AdGuard Home Compilation List/AGHtest.py @@ -852,6 +852,48 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"^! !.*", + r"", + line + ) + + line = re.sub( + r".*\.htm\^$", + r"", + line + ) + + line = re.sub( + r"^!.*[Éé]lément.*", + r"", + line + ) + + line = re.sub( + r"^!.* property.*", + r"", + line + ) + + line = re.sub( + r"^!.*General hid.*", + r"", + line + ) + + line = re.sub( + r".*#\$\?#.*", + r"", + line + ) + + line = re.sub( + r"^\|\|.*[#,].*", + r"", + line + ) + # $badfilter-ed entries, as Sublime Text kept complaining about "Ran out of stack space" when I tried to semi-automate it with RegEx. line = re.sub( diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt index 8c6ca29c6..fa674ed2f 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt @@ -1,6 +1,6 @@ [Adblock Plus 3.4] ! Title: Dandelion Sprout's AdGuard Home Compilation List -! Version: 01October2022v2-Beta +! Version: 01October2022v1-Beta ! Expires: 14 days ! Licence: In accordance with the Dandelicence, all of the borrowed lists' contents are to be treated as GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html), except for Liste FR's and Liste AR's entries which are to be treated as CC BY-NC-SA 3.0 (https://creativecommons.org/licenses/by-nc-sa/3.0/), and RU AdList whose loose CC BY 3.0 seems to me to enable me to relicence them under the Dandelicence. Known credits in accordance with attribution requirements, are The EasyList Authors (EasyList^³, Adblock Warning Removal List), Raymond Hill (uBlock Filters^²), AdGuard Software Limited (AdGuard Base Filter, AdGuard French Filter), smed79 (Liste AR), Daniel Kladnik (I Don't Care About Cookies), monztA & friends (ABP Filters), and Lain13 & Dimisa (RU AdList). ! Description: AdGuard Home is one of the tools for the future, or at least it is for those who know how to set up and use a Raspberry Pi. However, its current internal structure discards virtually every $-using block rule (e.g. EasyList), which makes EasyList and similar lists virtually useless in AdGuard Home, despite how many of the entries would be ≥90% as functional without them. So until the AdGuard Home team implements a better way to deal with $ values, here's my intermissional list to work around it. @@ -13,9 +13,9 @@ ! To seemingly unbreak Nintendo Switch online games @@||104.198.251.169 ! ———————————————————————————————————— -! Version: 202210010821 +! Version: 202210010841 ! Title: EasyList without element hiding rules -! Last modified: 01 Oct 2022 08:21 UTC +! Last modified: 01 Oct 2022 08:41 UTC ! Homepage: https://easylist.to/ ! Licence: https://easylist.to/pages/licence.html ! Please report any unblocked adverts or problems @@ -26631,12 +26631,8 @@ ! License: https://github.com/AdguardTeam/AdguardFilters/blob/master/LICENSE ! Examples: AG_removeCookie('/REGEX/') or AG_removeCookie('part of the cookie name') ! See https://github.com/AdguardTeam/deep-override -! Aborts execution of a script when it attempts to write the specified property. ! Based on AG_defineProperty (https://github.com/AdguardTeam/deep-override) ! Examples: -! @param property property or properties chain -! Aborts execution of a script when it attempts to read the specified property. -! Aborts execution of an inline script when it attempts to access the specified property ! AND content of the