Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Read lists from adblock-resources #161

Merged
merged 2 commits into from
Jul 22, 2020
Merged

Conversation

antonok-edm
Copy link
Collaborator

@antonok-edm antonok-edm commented Jul 20, 2020

As of brave/adblock-resources#4 we are moving to host filter lists in the adblock-resources repository, instead of in adblock-rust.

This change updates the DAT builder to pull lists from filter_lists/default.json and filter_lists/regional.json in the master branch of that repository.

adblock-resources has a verification script to ensure that these files always contain valid content in any PRs merged against master.

In addition, this change produces a new file called regional_catalog.json in the build/ad-block-updater/default folder, which is essentially filter_lists/regional.json from the adblock-resources repo. When shipped alongside the default DAT, brave-core will be able to always show the most recently available selection of regional filter lists.

@antonok-edm antonok-edm requested a review from bbondy July 20, 2020 21:18
@antonok-edm antonok-edm self-assigned this Jul 20, 2020
Copy link
Contributor

@jumde jumde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@antonok-edm antonok-edm merged commit ae9dd11 into master Jul 22, 2020
@antonok-edm antonok-edm deleted the lists-from-adblock-resources branch July 22, 2020 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants