From 4a1373748753564e8521c601f2d5ec334d66124d Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 15 Dec 2020 23:28:43 +0100 Subject: [PATCH] Add files via upload --- .../NordicFiltersABP-Inclusion.txt | 2 +- .../NordicFiltersABP.txt | 2 +- .../XYZPrepareFilters.py | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index e7711d8c7..dc8be6323 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1485,7 +1485,7 @@ viafree.no,viafree.dk##.pause-ad viafree.no,viafree.dk##.pause-ad-container ||viafree.*/collect$xmlhttprequest ||client-stream-events.mtg-api.com^$domain=viafree.no|viafree.dk -||freewheel-mtgx-tv.akamaized.net^$media,mp4,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 @@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 0ab8f40c2..58936de66 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1494,7 +1494,7 @@ viafree.no,viafree.dk##.pause-ad viafree.no,viafree.dk##.pause-ad-container ||viafree.*/collect$xmlhttprequest ||client-stream-events.mtg-api.com^$domain=viafree.no|viafree.dk -||freewheel-mtgx-tv.akamaized.net^$media,mp4,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 @@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 8efa4194f..df2eab1dc 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -757,6 +757,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r",mp4", + r"", + line + ) + if is_supported_abp(line): text += line + '\r\n' @@ -2568,6 +2574,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r",mp4", + r"", + line + ) + if is_supported_abp(line): text += line + '\r\n'