From e45c8fd2138928fd0e9519748915f454ebe4176e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 24 Jan 2021 10:29:06 +0100 Subject: [PATCH] Add files via upload --- .../NordicFiltersAdGuard.txt | 2 +- .../XYZPrepareFilters.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index d0ca42f3a..c921d1861 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1744,7 +1744,7 @@ sofabold.dk##.centerMgfx ||finn.no.$document ||posten.no.$document ||postnord.no.$document -/finn.no/finno.htm$doc,domain=~facebook.com +/finn.no/finno.htm$document,domain=~facebook.com ||dnb.no.$document ||sparebank1.no.$document ||nordea.no.$document diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index c3b3f4d96..2cbab9b90 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -148,8 +148,8 @@ def prepare_ag(lines) -> str: ) line = re.sub( - r"\$doc$", - r"$document", + r"\$doc(,|$)", + r"$document\1", line ) @@ -3782,7 +3782,7 @@ def prepare_ag(lines) -> str: line = re.sub( "\[Adblock Plus 3.4\]", - "[AdGuard ≥6]", + "[AdGuard versions from ≥2019]", line ) @@ -3900,6 +3900,12 @@ def prepare_ag(lines) -> str: line ) + line = re.sub( + r"\$doc(,|$)", + r"$document\1", + line + ) + text += line + '\r\n' return text