From c57cde5796564414ea692c322db413b4769e34bf Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 1 Dec 2019 01:56:42 +0100 Subject: [PATCH] Add files via upload --- .../NordicFiltersABP.txt | 2 +- .../NordicFiltersAdGuard.txt | 2 +- .../XYZPrepareFilters.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index f8b605b9f..d4ad2fab1 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -357,7 +357,7 @@ ebcontent.dk###ebcontentMegaboard ehandel.com##aside ekstrabladet.dk###manipulate_monster eurogamer.dk###leaderboard -eurogamer.*,nhi.no##.advert +eurogamer.dk,nhi.no##.advert euroinvestor.dk,valutakurser.dk###ctl00_BannerContainerTop eyjar.net##.hausad eyjar.net#?#.col-sm-12.col-md-8:-abp-has(a[href^="/ad/"]) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 113459b38..cdf20c580 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -369,7 +369,7 @@ ebcontent.dk###ebcontentMegaboard ehandel.com##aside ekstrabladet.dk###manipulate_monster eurogamer.dk###leaderboard -eurogamer.*,nhi.no##.advert +eurogamer.dk,nhi.no##.advert euroinvestor.dk,valutakurser.dk###ctl00_BannerContainerTop eyjar.net##.hausad eyjar.net#?#.col-sm-12.col-md-8:-abp-has(a[href^="/ad/"]) diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 389640cf6..2a041291c 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -93,8 +93,8 @@ def prepare_ag(lines) -> str: ) line = re.sub( - "eurogamer.\*#", - "eurogamer.dk#", + r"eurogamer\.\*([#,])", + r"eurogamer.dk\1", line ) @@ -259,8 +259,8 @@ def prepare_abp(lines) -> str: ) line = re.sub( - "eurogamer.\*#", - "eurogamer.dk#", + r"eurogamer\.\*([#,])", + r"eurogamer.dk\1", line )