From 3fe28dc918db2eb8dc2883c014f3a21beddbf7ca Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 13 Oct 2020 23:10:53 +0200 Subject: [PATCH] Add files via upload --- .../NordicFiltersABP-Inclusion.txt | 22 +++++++-------- .../NordicFiltersABP.txt | 22 +++++++-------- .../XYZPrepareFilters.py | 28 +++++++++---------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 2673daf15..3b9c40e85 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -422,9 +422,9 @@ contentMarketing$xmlhttprequest,domain=sol.no @@||storfjordnytt.no/wp-content/uploads/2*/2*.jpg^ @@||storfjordnytt.no/wp-content/uploads/2*/3*.jpg^ ||ssl.p.jwpcdn.com^*/freewheel.js$script,domain=eurosport.no|eurosport.dk -||ssl.p.jwpcdn.com^*/jwpsrv.js$script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk|vg.no -||ssl.p.jwpcdn.com^*/sharing.js$script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk -||ssl.p.jwpcdn.com^*/vast.js$script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk|vg.no +||ssl.p.jwpcdn.com^*/jwpsrv.js$script,domain=eurosport.no|eurosport.dk|gamereactor.*|vg.no +||ssl.p.jwpcdn.com^*/sharing.js$script,domain=eurosport.no|eurosport.dk|gamereactor.* +||ssl.p.jwpcdn.com^*/vast.js$script,domain=eurosport.no|eurosport.dk|gamereactor.*|vg.no ||track.adform.net^$domain=118.dk ||track.adform.net/Banners/ ||travservice.dk/wp-content^$image @@ -1377,13 +1377,13 @@ gamereactor.no,gamereactor.dk#?#article.rwd_row:-abp-has(a[href$="/sponsoredcont gamereactor.no,gamereactor.dk##div[class^="ad300"] gamereactor.no,gamereactor.dk##div[style*="width:300px;height:600px;"] gamereactor.no,gamereactor.dk##div[style="min-height: 600px; margin-bottom: 20px;"] -||gamereactor.no|gamereactor.dk/lay/ad-video-stats.$script -||gamereactor.no|gamereactor.dk/lay/dfp_$script -||gamereactor.no|gamereactor.dk/lay/js/adblock_desktop.$script -||gamereactor.no|gamereactor.dk/lay/js/background.$script -||gamereactor.no|gamereactor.dk/lay/js/banners_config.$script -||gamereactor.no|gamereactor.dk/lay/js/manageBanners.$script -||gamereactor.no|gamereactor.dk/media/eventad/$image +||gamereactor.*/lay/ad-video-stats.$script +||gamereactor.*/lay/dfp_$script +||gamereactor.*/lay/js/adblock_desktop.$script +||gamereactor.*/lay/js/background.$script +||gamereactor.*/lay/js/banners_config.$script +||gamereactor.*/lay/js/manageBanners.$script +||gamereactor.*/media/eventad/$image ||media.gamereactor.dk/*Promo$media,rewrite=abp-resource:blank-mp3,domain=gamereactor.no|gamereactor.dk ||media.gamereactor.dk/prerolls$media,rewrite=abp-resource:blank-mp3,domain=gamereactor.no|gamereactor.dk ||openx.gamereactor.dk/multi.php?$script @@ -1396,7 +1396,7 @@ viafree.no,viafree.dk#?#*:-abp-has(> .vjs-playing) ~ .no-autoplay-overlay viafree.no,viafree.dk##.ad-click-through viafree.no,viafree.dk##.pause-ad viafree.no,viafree.dk##.pause-ad-container -||viafree.no|viafree.dk/collect$xmlhttprequest +||viafree.*/collect$xmlhttprequest ||client-stream-events.mtg-api.com^$domain=viafree.no|viafree.dk ||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk @@||fwmrm.net/ad/$image,xmlhttprequest,domain=viafree.no|viafree.dk diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 563fa26da..caceabd9d 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -425,9 +425,9 @@ contentMarketing$xmlhttprequest,domain=sol.no @@||storfjordnytt.no/wp-content/uploads/2*/2*.jpg^ @@||storfjordnytt.no/wp-content/uploads/2*/3*.jpg^ ||ssl.p.jwpcdn.com^*/freewheel.js$script,domain=eurosport.no|eurosport.dk -||ssl.p.jwpcdn.com^*/jwpsrv.js$script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk|vg.no -||ssl.p.jwpcdn.com^*/sharing.js$script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk -||ssl.p.jwpcdn.com^*/vast.js$script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk|vg.no +||ssl.p.jwpcdn.com^*/jwpsrv.js$script,domain=eurosport.no|eurosport.dk|gamereactor.*|vg.no +||ssl.p.jwpcdn.com^*/sharing.js$script,domain=eurosport.no|eurosport.dk|gamereactor.* +||ssl.p.jwpcdn.com^*/vast.js$script,domain=eurosport.no|eurosport.dk|gamereactor.*|vg.no ||track.adform.net^$domain=118.dk ||track.adform.net/Banners/ ||travservice.dk/wp-content^$image @@ -1390,13 +1390,13 @@ gamereactor.no,gamereactor.dk#?#article.rwd_row:-abp-has(a[href$="/sponsoredcont gamereactor.no,gamereactor.dk##div[class^="ad300"] gamereactor.no,gamereactor.dk##div[style*="width:300px;height:600px;"] gamereactor.no,gamereactor.dk##div[style="min-height: 600px; margin-bottom: 20px;"] -||gamereactor.no|gamereactor.dk/lay/ad-video-stats.$script -||gamereactor.no|gamereactor.dk/lay/dfp_$script -||gamereactor.no|gamereactor.dk/lay/js/adblock_desktop.$script -||gamereactor.no|gamereactor.dk/lay/js/background.$script -||gamereactor.no|gamereactor.dk/lay/js/banners_config.$script -||gamereactor.no|gamereactor.dk/lay/js/manageBanners.$script -||gamereactor.no|gamereactor.dk/media/eventad/$image +||gamereactor.*/lay/ad-video-stats.$script +||gamereactor.*/lay/dfp_$script +||gamereactor.*/lay/js/adblock_desktop.$script +||gamereactor.*/lay/js/background.$script +||gamereactor.*/lay/js/banners_config.$script +||gamereactor.*/lay/js/manageBanners.$script +||gamereactor.*/media/eventad/$image ||media.gamereactor.dk/*Promo$media,rewrite=abp-resource:blank-mp3,domain=gamereactor.no|gamereactor.dk ||media.gamereactor.dk/prerolls$media,rewrite=abp-resource:blank-mp3,domain=gamereactor.no|gamereactor.dk ||openx.gamereactor.dk/multi.php?$script @@ -1409,7 +1409,7 @@ viafree.no,viafree.dk#?#*:-abp-has(> .vjs-playing) ~ .no-autoplay-overlay viafree.no,viafree.dk##.ad-click-through viafree.no,viafree.dk##.pause-ad viafree.no,viafree.dk##.pause-ad-container -||viafree.no|viafree.dk/collect$xmlhttprequest +||viafree.*/collect$xmlhttprequest ||client-stream-events.mtg-api.com^$domain=viafree.no|viafree.dk ||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk @@||fwmrm.net/ad/$image,xmlhttprequest,domain=viafree.no|viafree.dk diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index e010de13c..e5a4f6e40 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -680,43 +680,43 @@ def prepare_abp(lines) -> str: ) line = re.sub( - r"([=|])viafree\.\*", + r"([a-z][=|])viafree\.\*", r"\1viafree.no|viafree.dk", line ) line = re.sub( - r"([=|])dplay\.\*\|~dplay.it\|~dplay.es", + r"([a-z][=|])dplay\.\*\|~dplay.it\|~dplay.es", r"\1dplay.no|dplay.dk", line ) line = re.sub( - r"([=|])auth.dplay\.\*\|~auth.dplay.it\|~auth.dplay.es", + r"([a-z][=|])auth.dplay\.\*\|~auth.dplay.it\|~auth.dplay.es", r"\1auth.dplay.no|auth.dplay.dk", line ) line = re.sub( - r"([=|])gamereactor\.\*", + r"([a-z][=|])gamereactor\.\*", r"\1gamereactor.no|gamereactor.dk", line ) line = re.sub( - r"([=|])eurosport\.\*", + r"([a-z][=|])eurosport\.\*", r"\1eurosport.no|eurosport.dk", line ) line = re.sub( - r"([=|])eniro\.\*", + r"([a-z][=|])eniro\.\*", r"\1eniro.no|eniro.dk", line ) line = re.sub( - r"([=|])proff\.\*", + r"([a-z][=|])proff\.\*", r"\1proff.no|proff.dk", line ) @@ -2389,43 +2389,43 @@ def prepare_abp(lines) -> str: ) line = re.sub( - r"([=|])viafree\.\*", + r"([a-z][=|])viafree\.\*", r"\1viafree.no|viafree.dk", line ) line = re.sub( - r"([=|])dplay\.\*\|~dplay.it\|~dplay.es", + r"([a-z][=|])dplay\.\*\|~dplay.it\|~dplay.es", r"\1dplay.no|dplay.dk", line ) line = re.sub( - r"([=|])auth.dplay\.\*\|~auth.dplay.it\|~auth.dplay.es", + r"([a-z][=|])auth.dplay\.\*\|~auth.dplay.it\|~auth.dplay.es", r"\1auth.dplay.no|auth.dplay.dk", line ) line = re.sub( - r"([=|])gamereactor\.\*", + r"([a-z][=|])gamereactor\.\*", r"\1gamereactor.no|gamereactor.dk", line ) line = re.sub( - r"([=|])eurosport\.\*", + r"([a-z][=|])eurosport\.\*", r"\1eurosport.no|eurosport.dk", line ) line = re.sub( - r"([=|])eniro\.\*", + r"([a-z][=|])eniro\.\*", r"\1eniro.no|eniro.dk", line ) line = re.sub( - r"([=|])proff\.\*", + r"([a-z][=|])proff\.\*", r"\1proff.no|proff.dk", line )