diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 069535c81..edf14d8e7 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 17December2019v2-Beta +# Version: 27December2019v1-Beta # Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -109,7 +109,7 @@ contentMarketing # https://nyheder.tv2.dk/samfund/2019-11-04-vold-fanget-paa-video-gerningsmand-fik-lov-at-gaa-fri-i-tre-aar # bobilverden.no - annonse- -# norskenettsider.no +# norskenettsider.no, sva.no # πŸ‡³πŸ‡΄: β€”β€”β€” Tomme restebokser som EasyList har etterlatt β€”β€”β€” # πŸ‡©πŸ‡°: β€”β€”β€” Tomme restebokser, som EasyList har efterladt β€”β€”β€” # πŸ‡¬πŸ‡§: β€”β€”β€” Leftover empty spaces that EasyList have left behind β€”β€”β€” @@ -147,6 +147,8 @@ contentMarketing -d services.api.no bazaar # aftenbladet.no # avisalofoten.no +# blv.no nyheter kan-bruke-23-millioner-pa-the-whale-undersokelsene +# https://www.aftenposten.no/sport/sjakk/i/4qKxMg/carlsen-overbeviste-verdensmestertakter # πŸ‡³πŸ‡΄: β€”β€”β€” Tomme skillebokser β€”β€”β€” # πŸ‡©πŸ‡°: β€”β€”β€” Tomme adskillerbokser β€”β€”β€” # πŸ‡¬πŸ‡§: β€”β€”β€” Empty divider spaces β€”β€”β€” @@ -189,9 +191,9 @@ contentMarketing -d elderlyscissors.com -d imasdk.googleapis.com pal.js -d vg.no AdblockModal +-d aftenposten.no ads- +d bildeler.name +d reservedele.name -+d eurosport.no,eurosport.dk # πŸ‡³πŸ‡΄: β€”β€”β€” Vindusviskere for betalte artikler (sΓ₯nn at de nederste linjene i en forhΓ₯ndsvisning ikke toner ut) β€”β€”β€” # Takk til THEtomaso (https://github.com/THEtomaso)/for/de/fleste/av/disse/oppfΓΈringene. # πŸ‡©πŸ‡°: β€”β€”β€” Vinduesviskere for betalte artikler (sΓ₯ de sidste par linjer i en forhΓ₯ndsvisning ikke falder ud) β€”β€”β€” diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index ad952c5c1..d2ed0228d 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 171220192 +! Version: 271220191 ! Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and Adblock Plus) ! Expires: 12 hours @@ -17,7 +17,6 @@ ##.ad_mobil_API ##.ads__grid-item ##.am-page-ad -##.annonsetag ##.midtbanner ##.mvp-feat1-list-ad ##.rotating-junglebogen @@ -268,7 +267,7 @@ nettavisen.no#?#.rel-article:-abp-has(span:-abp-contains(Reklame)) ! bobilverden.no /annonse-$image ##img[alt^=Annonse] -! norskenettsider.no +! norskenettsider.no, sva.no ##a[href*="online.adservicemedia.dk"] ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme restebokser som EasyList har etterlatt β€”β€”β€” @@ -347,7 +346,7 @@ dv.is##.adbox_310x400 dv.is##.ticker e24.no###main > div:nth-of-type(1) e24.no###main > div:nth-of-type(3) -e24.no##[id^=adPlacement_] +e24.no,aftenbladet.no##[id^=adPlacement_] eavisa.com##.custom-a-ds eavisa.com##.post-content > p:-abp-has(.adsbygoogle) eavisa.com##.post-content > p:-abp-has(a[onclick^="javascript:window.open("]) @@ -551,6 +550,10 @@ tidssonen.no##.widget_custom_html finn.no#?#div[class^=ads__unit]:-abp-has(:scope > div[id^=ad-stream__google]) mbl.is#?#.col-sm-6.col-12:-abp-has(.augl):not(:-abp-has(.fluid)) gulesider.no,degulesider.dk,krak.dk##.e-banner +##.annonsetag +eavisa.com##.post-content > .items-container +sva.no##section:not(:has(a)) +sva.no##.widget_text:not(:has(a)) ! β€” β€” β€” β€” β€” @@ -626,6 +629,12 @@ vafo.dk##.adform-flexblock ##.ad[data-config-name] ! avisalofoten.no ##.ad.text-center +! blv.no/nyheter/kan-bruke-23-millioner-pa-the-whale-undersokelsene +##div[id*=html-embedded-ad] +! https://www.aftenposten.no/sport/sjakk/i/4qKxMg/carlsen-overbeviste-verdensmestertakter +##.ad[id^=netboard_] +##.ad[id^=skyscraper] +##.ad.topBanner ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme skillebokser β€”β€”β€” ! πŸ‡©πŸ‡°: β€”β€”β€” Tomme adskillerbokser β€”β€”β€” @@ -663,11 +672,11 @@ pensjonistferie.no#@##adsense ! πŸ‡¬πŸ‡§: Unbreaks significant content breakage when using "Fanboy's Social Blocking List", if I recall correctly krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk -@@||api.instagram.com^$domain=www.samiteahter.org +@@||api.instagram.com^$domain=samiteahter.org ! Attempting to fix a problem with voting online on Idol Norway when using "EasyPrivacy" @@||tv2.no/*/config/analytics.json$xmlhttprequest,~third-party ! Attempts to resolve how some frontpage articles are hard to open when using "EasyPrivacy". -@@||schibsted.com/autoTracker$domain=www.vg.no +@@||schibsted.com/autoTracker$domain=vg.no ! https://github.com/easylist/easylist/issues/1861 @@_prebid_$domain=seher.no ! πŸ‡³πŸ‡΄: Solcellespesialisten, innlastingsproblem @@ -705,11 +714,12 @@ minmote.no,godt.no##.adblock-info ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party @@/js/ads.js$~third-party,domain=tvkampen.com|tvsporten.dk @@||www.tv2.no/s/js/ads.js$script,~third-party +||aftenposten.no/seksjon/dist/ads-$script +aftenposten.no##div[style*="width: 10"][style*="z-index: 2147"] @@||bildeler.name$generichide @@||reservedele.name$generichide 1800kcalkostplan.dk,1200kcalkostplan.dk##div[class*=-container][class$=-hide] -@@||eurosport.no,eurosport.dk^$generichide ! πŸ‡³πŸ‡΄: β€”β€”β€” Vindusviskere for betalte artikler (sΓ₯nn at de nederste linjene i en forhΓ₯ndsvisning ikke toner ut) β€”β€”β€” @@ -788,7 +798,7 @@ gamereactor.no,gamereactor.dk#@#.afs_ads ||media.gamereactor.dk/prerolls/*$media,rewrite=abp-resource:blank-mp3,domain=gamereactor.no|gamereactor.dk ||openx.gamereactor.dk/multi.php?,script ||ssl.p.jwpcdn.com^*/gapro.js$script,domain=gamereactor.no|gamereactor.dk -@@||fwmrm.net/ad/$image,xmlhttprequest,domain=viafree.no|viafree.dk +@@||fwmrm.net/ad/$image,xmlhttprequest$script,domain=viafree.no|viafree.dk @@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk viafree.no,viafree.dk##.ad-click-through viafree.no,viafree.dk##.pause-ad diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 1dd63ea77..c84f81196 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 17December2019v2 +! Version: 27December2019v1 ! Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 12 hours @@ -16,7 +16,6 @@ ##.ad_mobil_API ##.ads__grid-item ##.am-page-ad -##.annonsetag ##.midtbanner ##.mvp-feat1-list-ad ##.rotating-junglebogen @@ -275,7 +274,7 @@ nettavisen.no#?#.rel-article:-abp-has(span:-abp-contains(Reklame)) ! bobilverden.no /annonse-$image ##img[alt^=Annonse] -! norskenettsider.no +! norskenettsider.no, sva.no ##a[href*="online.adservicemedia.dk"] ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme restebokser som EasyList har etterlatt β€”β€”β€” @@ -357,7 +356,7 @@ dv.is##.ticker e24.no###main > div:nth-of-type(1) e24.no###main > div:nth-of-type(3) e24.no##.rightColumn:style(margin-top: 10px !important) -e24.no##[id^=adPlacement_] +e24.no,aftenbladet.no##[id^=adPlacement_] eavisa.com##.custom-a-ds eavisa.com##.post-content > p:-abp-has(.adsbygoogle) eavisa.com##.post-content > p:-abp-has(a[onclick^="javascript:window.open("]) @@ -570,6 +569,10 @@ tidssonen.no##.widget_custom_html finn.no#?#div[class^=ads__unit]:-abp-has(:scope > div[id^=ad-stream__google]) mbl.is#?#.col-sm-6.col-12:-abp-has(.augl):not(:-abp-has(.fluid)) gulesider.no,degulesider.dk,krak.dk##.e-banner +##.annonsetag +eavisa.com##.post-content > .items-container +sva.no##section:not(:has(a)) +sva.no##.widget_text:not(:has(a)) ! β€” β€” β€” β€” β€” !#if !env_mobile seher.no##.content-marketing-ribbon:style(margin-top: 20px !important) @@ -646,6 +649,12 @@ vafo.dk##.adform-flexblock ##.ad[data-config-name] ! avisalofoten.no ##.ad.text-center +! blv.no/nyheter/kan-bruke-23-millioner-pa-the-whale-undersokelsene +##div[id*=html-embedded-ad] +! https://www.aftenposten.no/sport/sjakk/i/4qKxMg/carlsen-overbeviste-verdensmestertakter +##.ad[id^=netboard_] +##.ad[id^=skyscraper] +##.ad.topBanner ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme skillebokser β€”β€”β€” ! πŸ‡©πŸ‡°: β€”β€”β€” Tomme adskillerbokser β€”β€”β€” @@ -684,11 +693,11 @@ pensjonistferie.no#@##adsense ! πŸ‡¬πŸ‡§: Unbreaks significant content breakage when using "Fanboy's Social Blocking List", if I recall correctly krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk -@@||api.instagram.com^$domain=www.samiteahter.org +@@||api.instagram.com^$domain=samiteahter.org ! Attempting to fix a problem with voting online on Idol Norway when using "EasyPrivacy" @@||tv2.no/*/config/analytics.json$xmlhttprequest,~third-party ! Attempts to resolve how some frontpage articles are hard to open when using "EasyPrivacy". -@@||schibsted.com/autoTracker$domain=www.vg.no +@@||schibsted.com/autoTracker$domain=vg.no ! https://github.com/easylist/easylist/issues/1861 @@_prebid_$domain=seher.no ! πŸ‡³πŸ‡΄: Solcellespesialisten, innlastingsproblem @@ -731,11 +740,12 @@ vg.no##+js(addEventListener-defuser.js, load, concat) ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party @@/js/ads.js$~third-party,domain=tvkampen.com|tvsporten.dk @@||www.tv2.no/s/js/ads.js$script,~third-party +||aftenposten.no/seksjon/dist/ads-$script +aftenposten.no##div[style*="width: 10"][style*="z-index: 2147"] !#if !ext_ublock @@||bildeler.name$generichide @@||reservedele.name$generichide 1800kcalkostplan.dk,1200kcalkostplan.dk##div[class*=-container][class$=-hide] -@@||eurosport.no,eurosport.dk^$generichide !#endif ! πŸ‡³πŸ‡΄: β€”β€”β€” Vindusviskere for betalte artikler (sΓ₯nn at de nederste linjene i en forhΓ₯ndsvisning ikke toner ut) β€”β€”β€” @@ -820,7 +830,7 @@ gamereactor.no,gamereactor.dk#@#.afs_ads ||media.gamereactor.dk/prerolls/*$media,redirect=noopmp3-0.1s,domain=gamereactor.no|gamereactor.dk ||openx.gamereactor.dk/multi.php?$important,script ||ssl.p.jwpcdn.com^*/gapro.js$important,script,domain=gamereactor.no|gamereactor.dk -@@||fwmrm.net/ad/$image,xmlhttprequest,domain=viafree.no|viafree.dk +@@||fwmrm.net/ad/$image,xmlhttprequest,script,domain=viafree.no|viafree.dk @@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk viafree.no,viafree.dk##.ad-click-through viafree.no,viafree.dk##.pause-ad diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index ed9f69a91..58a5abf8b 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 17December2019v2 +! Version: 27December2019v1 ! Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 12 hours @@ -16,7 +16,6 @@ ##.ad_mobil_API ##.ads__grid-item ##.am-page-ad -##.annonsetag ##.midtbanner ##.mvp-feat1-list-ad ##.rotating-junglebogen @@ -47,7 +46,7 @@ borsen.dk##[href*="://borsen.dk/sponsoreret"] byggebolig.no##.maestro-resize byggfakta.no##.sponsor-row computerworld.dk##.candis-spot -contentMarketing$xmlhttprequest,domain=sol.no +contentMarketing$xhr,domain=sol.no dagens.dk##.col-sticky > div > p dagens.dk##.col-sticky > p dailyrush.dk,karfan.is##.td-header-rec-wrap @@ -275,7 +274,7 @@ nettavisen.no#?#.rel-article:-abp-has(span:-abp-contains(Reklame)) ! bobilverden.no /annonse-$image ##img[alt^=Annonse] -! norskenettsider.no +! norskenettsider.no, sva.no ##a[href*="online.adservicemedia.dk"] ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme restebokser som EasyList har etterlatt β€”β€”β€” @@ -357,7 +356,7 @@ dv.is##.ticker e24.no###main > div:nth-of-type(1) e24.no###main > div:nth-of-type(3) e24.no##.rightColumn:style(margin-top: 10px !important) -e24.no##[id^=adPlacement_] +e24.no,aftenbladet.no##[id^=adPlacement_] eavisa.com##.custom-a-ds eavisa.com##.post-content > p:-abp-has(.adsbygoogle) eavisa.com##.post-content > p:-abp-has(a[onclick^="javascript:window.open("]) @@ -570,6 +569,10 @@ tidssonen.no##.widget_custom_html finn.no#?#div[class^=ads__unit]:-abp-has(:scope > div[id^=ad-stream__google]) mbl.is#?#.col-sm-6.col-12:-abp-has(.augl):not(:-abp-has(.fluid)) gulesider.no,degulesider.dk,krak.dk##.e-banner +##.annonsetag +eavisa.com##.post-content > .items-container +sva.no##section:not(:has(a)) +sva.no##.widget_text:not(:has(a)) ! β€” β€” β€” β€” β€” !#if !env_mobile seher.no##.content-marketing-ribbon:style(margin-top: 20px !important) @@ -646,6 +649,12 @@ vafo.dk##.adform-flexblock ##.ad[data-config-name] ! avisalofoten.no ##.ad.text-center +! blv.no/nyheter/kan-bruke-23-millioner-pa-the-whale-undersokelsene +##div[id*=html-embedded-ad] +! https://www.aftenposten.no/sport/sjakk/i/4qKxMg/carlsen-overbeviste-verdensmestertakter +##.ad[id^=netboard_] +##.ad[id^=skyscraper] +##.ad.topBanner ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme skillebokser β€”β€”β€” ! πŸ‡©πŸ‡°: β€”β€”β€” Tomme adskillerbokser β€”β€”β€” @@ -684,7 +693,7 @@ pensjonistferie.no#@##adsense ! πŸ‡¬πŸ‡§: Unbreaks significant content breakage when using "Fanboy's Social Blocking List", if I recall correctly krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk -@@||api.instagram.com^$domain=www.samiteahter.org +@@||api.instagram.com^$domain=samiteahter.org ! Attempting to fix a problem with voting online on Idol Norway when using "EasyPrivacy" ! Attempts to resolve how some frontpage articles are hard to open when using "EasyPrivacy". @@ -704,7 +713,7 @@ krom.is#@#.share-container ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid ! https://github.com/ryanbr/fanboy-adblock/issues/1261 -@@||cookieinformation.com^$third-party,domain=kart.gulesider.no|map.krak.dk|kort.degulesider.dk|kartor.eniro.se +@@||cookieinformation.com^$3p,domain=kart.gulesider.no|map.krak.dk|kort.degulesider.dk|kartor.eniro.se ! πŸ‡³πŸ‡΄/πŸ‡©πŸ‡°: β€”β€”β€” Anti-anti-reklameblokkering β€”β€”β€” ! πŸ‡¬πŸ‡§: β€”β€”β€” Anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion β€”β€”β€” @@ -731,11 +740,12 @@ vg.no##+js(addEventListener-defuser.js, load, concat) ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,1p @@/js/ads.js$1p,domain=tvkampen.com|tvsporten.dk @@||www.tv2.no/s/js/ads.js$script,1p +||aftenposten.no/seksjon/dist/ads-$script +aftenposten.no##div[style*="width: 10"][style*="z-index: 2147"] !#if !ext_ublock @@||bildeler.name$generichide @@||reservedele.name$generichide 1800kcalkostplan.dk,1200kcalkostplan.dk##div[class*=-container][class$=-hide] -@@||eurosport.no,eurosport.dk^$generichide !#endif ! πŸ‡³πŸ‡΄: β€”β€”β€” Vindusviskere for betalte artikler (sΓ₯nn at de nederste linjene i en forhΓ₯ndsvisning ikke toner ut) β€”β€”β€” @@ -820,7 +830,7 @@ gamereactor.*#@#.afs_ads ||media.gamereactor.dk/prerolls/*$media,redirect=noopmp3-0.1s,domain=gamereactor.no|gamereactor.dk ||openx.gamereactor.dk/multi.php?$important,script ||ssl.p.jwpcdn.com^*/gapro.js$important,script,domain=gamereactor.no|gamereactor.dk -@@||fwmrm.net/ad/$image,xhr,domain=viafree.no|viafree.dk +@@||fwmrm.net/ad/$image,xhr,script,domain=viafree.no|viafree.dk @@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.no|viafree.dk viafree.*##.ad-click-through viafree.*##.pause-ad diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index f94219475..bd7f6829d 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 17December2019v2-Alpha +# Version: 27December2019v1-Alpha # Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Expires: 12 hours @@ -129,7 +129,7 @@ contentMarketing # https://nyheder.tv2.dk/samfund/2019-11-04-vold-fanget-paa-video-gerningsmand-fik-lov-at-gaa-fri-i-tre-aar # bobilverden.no /annonse- -# norskenettsider.no +# norskenettsider.no, sva.no # # πŸ‡³πŸ‡΄: β€”β€”β€” Tomme restebokser som EasyList har etterlatt β€”β€”β€” # πŸ‡©πŸ‡°: β€”β€”β€” Tomme restebokser, som EasyList har efterladt β€”β€”β€” @@ -170,6 +170,8 @@ contentMarketing .services.api.no/api/bazaar # aftenbladet.no # avisalofoten.no +# blv.no/nyheter/kan-bruke-23-millioner-pa-the-whale-undersokelsene +# https://www.aftenposten.no/sport/sjakk/i/4qKxMg/carlsen-overbeviste-verdensmestertakter # # πŸ‡³πŸ‡΄: β€”β€”β€” Tomme skillebokser β€”β€”β€” # πŸ‡©πŸ‡°: β€”β€”β€” Tomme adskillerbokser β€”β€”β€” @@ -209,6 +211,7 @@ contentMarketing .elderlyscissors.com .imasdk.googleapis.com/pal/sdkloader/pal.js .vg.no/cnp-assets/src/sites/vg/components/AdblockModal +.aftenposten.no/seksjon/dist/ads- # # # diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index c41a365f7..8b9259c5e 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -2724,6 +2724,7 @@ UNSUPPORTED_DOMAINS = ['/', '##', '#.', '#@', '#?', '!#', '[', '!'] OUTPUT = 'Domeneversjoner/xyzzyxbrowsewebsites.txt' OUTPUT_DOMAINS = 'Domeneversjoner/BrowseWebsitesWithoutLoggingInDomains.txt' +OUTPUT_AGH = 'Domeneversjoner/BrowseWebsitesWithoutLoggingInAGH.txt' # function that downloads the filter list def download_filters() -> str: @@ -2810,6 +2811,81 @@ def prepare_domains(lines) -> str: return text +def prepare_agh(lines) -> str: + text = '' + + previous_line = None + + for line in lines: + + if line == previous_line: + continue + + line = re.sub( + r"[$,]document.*", + r"", + line + ) + + line = re.sub( + r"\^$", + r"", + line + ) + + line = re.sub( + r"^\|\|", + r"", + line + ) + + line = re.sub( + r"! (Title: .*)", + r"# \1 (for AdGuard Home)", + line + ) + + line = re.sub( + r"!(.*:)", + r"#\1", + line + ) + + line = re.sub( + r"/\*", + r"", + line + ) + + line = re.sub( + r"\*", + r"", + line + ) + + line = re.sub( + r"/\?meter", + r"", + line + ) + + line = re.sub( + r"[$,]third-party.*", + r"", + line + ) + + line = re.sub( + r"^([a-z0-9].*)", + r"||\1^", + line + ) + + if is_supported_domains(line) and not line == '': + text += line + '\r\n' + + return text + if __name__ == "__main__": print('Starting the script') text = download_filters() @@ -2817,6 +2893,7 @@ if __name__ == "__main__": print('Total number of rules: ' + str(len(lines))) domains_filter = prepare_domains(lines) + agh_filter = prepare_agh(lines) with open(OUTPUT, "w") as text_file: text_file.write(text) @@ -2824,6 +2901,9 @@ if __name__ == "__main__": with open(OUTPUT_DOMAINS, "w") as text_file: text_file.write(domains_filter) + with open(OUTPUT_AGH, "w") as text_file: + text_file.write(agh_filter) + print('The list versions have been generated.') import requests