Update easylist.txt #2154
Merged
Update easylist.txt #2154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mjethani
force-pushed
the
update-easylist
branch
from
f1e462a
to
54ec1f7
Compare
mjethani
commented
Aug 11, 2021
| @@ -87,6 +87,11 @@ function loadLists() { | |||
| const filename = HOSTS_ONLY ? 'hosts.txt' : 'easylist.txt'; | |||
| let content = fs.readFileSync(path.resolve(__dirname, filename), { encoding: 'utf-8' }); | |||
|
|
|||
| if (!HOSTS_ONLY) { | |||
| content += fs.readFileSync(path.resolve(__dirname, 'easyprivacy.txt'), { encoding: 'utf-8' }) | |||
| .replace(/^\[Adblock\b.*\n/, ''); | |||
There was a problem hiding this comment.
Since we're concatenating lists we need to remove the "[Adblock Plus x.x]" at the top, lest it be interpreted as a filter.
There was a problem hiding this comment.
By the way, the proper way to do this would be to pass each list on its own to the engine, but that would require changes in multiple places and might open another Pandora's box. I'd like to do it properly, but not in this patch.
mjethani
force-pushed
the
update-easylist
branch
2 times, most recently
from
efbcb4a
to
0b181e6
Compare
mjethani
force-pushed
the
update-easylist
branch
from
0b181e6
to
2902fb2
Compare
mjethani
commented
Aug 11, 2021
|
|
||
| // We still use old versions of EasyList and EasyPrivacy whereas current |
There was a problem hiding this comment.
These transformations are no longer necessary.
remusao
reviewed
Aug 11, 2021
| // https://github.com/cliqz-oss/adblocker/discussions/2114#discussioncomment-1133958 | ||
| content = content.replace(/(?!$.*)\bdomain=\|/gm, 'domain='); | ||
| if (!HOSTS_ONLY) { | ||
| content += fs.readFileSync(path.resolve(__dirname, 'easyprivacy.txt'), { encoding: 'utf-8' }) |
There was a problem hiding this comment.
Why only in non-hosts mode?
There was a problem hiding this comment.
The hosts.txt we are using already includes hosts for both ads and trackers (privacy). It's a different concept there.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
easylist.txtandeasyprivacy.txtare copied from../adblocker/assets/…and now we're reading both files and concatenating them at runtime.