From df575a40ad6239f6e1944c021a64e1640285d397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Wr=C3=B3blewski?= Date: Wed, 13 Dec 2023 14:04:44 +0100 Subject: [PATCH] Upd #164615 amazon.com --- BaseFilter/sections/general_extensions.txt | 2 ++ BaseFilter/sections/replace.txt | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/BaseFilter/sections/general_extensions.txt b/BaseFilter/sections/general_extensions.txt index 5a13b473e4c..7431c863955 100644 --- a/BaseFilter/sections/general_extensions.txt +++ b/BaseFilter/sections/general_extensions.txt @@ -125,6 +125,8 @@ mangakita.net,westmanga.info#%#//scriptlet("set-constant", "puShown1", "true") ! ! https://github.com/AdguardTeam/AdguardFilters/issues/164615 amazon.co.jp,amazon.com#%#//scriptlet('json-prune', 'cuepointPlaylist') +! TODO: Remove hint when apps will support xpath in xml-prune scriptlet +!+ NOT_PLATFORM(windows, mac, android) amazon.co.jp,amazon.com#%#//scriptlet('xml-prune', 'xpath(//*[name()="Period"][.//*[@value="Ad"]] | //*[name()="Period"]/@start)', '[value="Ad"]', '.mpd') ! ! go.oclasrv.com clickunder/ads ('zfgloaded') diff --git a/BaseFilter/sections/replace.txt b/BaseFilter/sections/replace.txt index e533309ac59..1972f8a21f8 100644 --- a/BaseFilter/sections/replace.txt +++ b/BaseFilter/sections/replace.txt @@ -16,9 +16,8 @@ ! https://github.com/AdguardTeam/AdguardFilters/issues/164615 ! https://github.com/AdguardTeam/AdguardFilters/issues/150836 ! https://github.com/AdguardTeam/AdguardFilters/issues/148543 -! It's fixed by scriptlet and rules below cause issue (desync) with subtitles, probably second rule needs changes -! .mpd$replace=///,xmlhttprequest,domain=amazon.com|amazon.co.jp -! .mpd$replace=/start="[0-9A-Z]+?">/>/,xmlhttprequest,domain=amazon.com|amazon.co.jp +.mpd$replace=///,xmlhttprequest,domain=amazon.com|amazon.co.jp +.mpd$replace=/start="[0-9A-Z.]+?">/>/,xmlhttprequest,domain=amazon.com|amazon.co.jp ! https://github.com/AdguardTeam/AdguardFilters/issues/152366 ||pluto.tv/*/dash/*/*.mpd$replace=/.{1\,100}\.plutotv\.net\/.{1\,50}_ad\/.*?<\/BaseURL>[\s\S]*?<\/Period>// ||pluto.tv/*/session.json$jsonprune=\$.adBreak.*