From f5e415e8f53ac3cf6adf2dc669d036843a4f5261 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 15 Dec 2022 10:51:57 +0100 Subject: [PATCH] Add files via upload Fine tuning is complicated --- AdGuard Home Compilation List/AGHtest.py | 6 ++++++ .../AdGuardHomeCompilationList.txt | 19 ++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/AdGuard Home Compilation List/AGHtest.py b/AdGuard Home Compilation List/AGHtest.py index 62fab0aa1..aa074c3dc 100644 --- a/AdGuard Home Compilation List/AGHtest.py +++ b/AdGuard Home Compilation List/AGHtest.py @@ -938,6 +938,12 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"^(:/)?/[b-z]([a-z]{1,2})?\.$", + r"", + line + ) + if is_supported_agh(line) and not line == '': text += line + '\r\n' diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt index b972c9ec5..f4e0c45bd 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: 15December2022v2-Beta +! Version: 15December2022v3-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: 202212150903 +! Version: 202212150921 ! Title: EasyList without element hiding rules -! Last modified: 15 Dec 2022 09:03 UTC +! Last modified: 15 Dec 2022 09:21 UTC ! Homepage: https://easylist.to/ ! Licence: https://easylist.to/pages/licence.html ! in the forums (https://forums.lanik.us/) @@ -1493,6 +1493,8 @@ /advlink. /popout. /popunder. +://ads. +://adv. !---Third-party advertisers---! ! *** easylist:easylist/easylist_adservers.txt *** ! Non-flagged (Generic blocks) @@ -5161,6 +5163,7 @@ ||briticatederfd.site^ ||britonswime.website^ ||brkkqaqcgn.com^ +||bro.kim^ ||bro1.biz^ ||bro4.biz^ ||broadlystipulate.com^ @@ -8815,6 +8818,7 @@ ||geruksom.net^ ||get-me-wow. ||get-my-prize-n1w.live^ +||get-statics.live^ ||get-things-done.net^ ||get2m5sgstohne.com^ ||get2nesoft1.ru^ @@ -25044,8 +25048,8 @@ ||morewhobomb.live^ ! Title: AdGuard Base filter ! Description: This filter is necessary for quality ad blocking. -! Version: 2.2.59.89 -! TimeUpdated: 2022-12-15T08:31:35+00:00 +! Version: 2.2.59.90 +! TimeUpdated: 2022-12-15T09:31:37+00:00 ! Homepage: https://github.com/AdguardTeam/AdGuardFilters ! License: https://github.com/AdguardTeam/AdguardFilters/blob/master/LICENSE ! Examples: AG_removeCookie('/REGEX/') or AG_removeCookie('part of the cookie name') @@ -28136,8 +28140,8 @@ Banner468x60 ! *** CAUTION: all rules are wrapped by AG directive. Don't remove it, and don't add another directives*** ! Title: AdGuard French filter ! Description: Liste FR + AdGuard French filter. Filter list that specifically removes ads on websites in French language. -! Version: 2.0.36.61 -! TimeUpdated: 2022-12-15T03:30:52+00:00 +! Version: 2.0.36.62 +! TimeUpdated: 2022-12-15T09:30:54+00:00 ||xydestygre.com^ ||kz.cateredjapish.com^ ||adserver.icimedias.ca^ @@ -28903,6 +28907,7 @@ Banner468x60 ://adsadmin. ://adspaces. ://adss. +://adx. ://afflight. ://ar.ads. ://ashot.