From 7af5759f413208acad81440bbfa6509cf05c3454 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 27 Apr 2022 21:36:08 +0700 Subject: [PATCH] source : relocate filters and add YousList, uBlock filters+2020-2021-2022 and uBlock privacy | tasks.yaml : Bump filters-maker to v1.0.4 --- .github/workflows/tasks.yaml | 2 +- action.py | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tasks.yaml b/.github/workflows/tasks.yaml index d15fa76..853cbde 100644 --- a/.github/workflows/tasks.yaml +++ b/.github/workflows/tasks.yaml @@ -12,7 +12,7 @@ jobs: env: API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} - name: build - uses: minoplhy/filters-maker@v1.0.2 + uses: minoplhy/filters-maker@v1.0.4 env: API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} with: diff --git a/action.py b/action.py index 9a74680..70623be 100644 --- a/action.py +++ b/action.py @@ -19,20 +19,19 @@ os.makedirs('/reprwiki/Private-build/ucate',exist_ok=True) UCATE_SOURCE = [ 'https://badmojr.github.io/1Hosts/Pro/rpz.txt', 'https://github.com/minoplhy/filters/releases/download/filters-build/Adguard-dns_rpz.txt', -'https://github.com/minoplhy/filters/releases/download/filters-build/Adguard-cname-tracker_rpz.txt', -'https://github.com/minoplhy/filters/releases/download/filters-build/Adguard-cname-original_rpz.txt', 'https://github.com/minoplhy/filters/releases/download/filters-build/stevenblack-f_rpz.txt', 'https://github.com/minoplhy/filters/releases/download/filters-build/someonewhocares_rpz.txt', 'https://github.com/minoplhy/filters/releases/download/filters-build/hostsVN-all_rpz.txt', -'https://urlhaus.abuse.ch/downloads/rpz/', 'https://github.com/minoplhy/filters/raw/main/Resources/blocked.txt', -'https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt', -'https://github.com/DandelionSprout/adfilt/raw/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareDomains.txt', 'https://block.energized.pro/basic/formats/filter', 'https://hblock.molinero.dev/hosts_unbound.conf', 'https://github.com/minoplhy/filters/releases/download/filters-build/Adguard-Base_rpz.txt', 'https://github.com/minoplhy/filters/releases/download/filters-build/Adguard-Mobile_rpz.txt', -'https://github.com/minoplhy/filters/releases/download/filters-build/Adguard-Tracking_rpz.txt' +'https://github.com/yous/YousList/raw/master/youslist.txt', +'https://github.com/uBlockOrigin/uAssets/raw/master/filters/filters.txt', +'https://github.com/uBlockOrigin/uAssets/raw/master/filters/filters-2020.txt', +'https://github.com/uBlockOrigin/uAssets/raw/master/filters/filters-2021.txt', +'https://github.com/uBlockOrigin/uAssets/raw/master/filters/filters-2022.txt' ] crawler.clear_old_files(incoming) @@ -69,7 +68,14 @@ VENETO_SOURCE = [ 'https://energized.pro/extensions/xtreme/formats/rpz.txt', 'https://curben.gitlab.io/malware-filter/phishing-filter-agh.txt', 'https://curben.gitlab.io/malware-filter/pup-filter-agh.txt', -'https://phishing.army/download/phishing_army_blocklist_extended.txt' +'https://phishing.army/download/phishing_army_blocklist_extended.txt', +'https://github.com/minoplhy/filters/releases/download/filters-build/Adguard-Tracking_rpz.txt', +'https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt', +'https://github.com/DandelionSprout/adfilt/raw/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareDomains.txt', +'https://github.com/minoplhy/filters/releases/download/filters-build/Adguard-cname-tracker_rpz.txt', +'https://github.com/minoplhy/filters/releases/download/filters-build/Adguard-cname-original_rpz.txt', +'https://urlhaus.abuse.ch/downloads/rpz/', +'https://github.com/uBlockOrigin/uAssets/raw/master/filters/privacy.txt' ] crawler.clear_old_files(incoming)