* Fix panic on empty inclusion attribute, rule loss in selective inclusion and other bugs
* Exercise domain/list-name validators in tests
* Consolidate parsed list state into ParsedList and simplify inclusion parsing
Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
* main.go: fix handling for empty list
The length of plMap and finalMap are not equal in this case.
* main.go: avoid resolving empty lists repeatedly
When there's an empty list and included by n lists,
the empty list would be resolved (n+1) times.
Add a bool key to ParsedList to avoid this.
ParsedList.Name is not used, so remove it.
This allows to remove any unwanted lists without modifying the domains
data, and you can generate multiple custom v2ray dat files in a single
command.
As long as the source data is consistent, any list remains in the trimed
dat contains the same rules comparing to the list in full dat.
Use the new option `datprofile` to specify the config json file path.
`outputname` will be ignored when `datprofile` is set.
Co-authored-by: database64128 <free122448@hotmail.com>
* Feat: add a new datdump tool
* Refactor: address code review comments
* Refactor: remove export all from main program
use datdump instead
* Refactor: allow spaces in exportlists
e.g. `--exportlists="lista, listb"`
* all: cleanup
* apply review suggestion
---------
Co-authored-by: database64128 <free122448@hotmail.com>
* Refactor: improve deduplicate
* Feat: support to export all lists to a plain yml
use: `--exportlists=_all_`
* Docs: add links for dlc plain yml
[skip ci]
* Refactor: reduce the use of strings.TrimSpace
* Refactor: use string attr before toProto
* Refactor parseEntry
- add value/attribute checker(check missing space)
- allow multiple spaces
- sort attributes
- improve readablity
* Refactor exportPlainTextList
- remove unnecessary variable
- improve readablity
* Remove support for partial include
This reverts e640ac27834550c9182c486ea180bbd3b0d4ba75
It is problematic and I will implement a new one
* Refactor: promote refMap
* Feat: add support for partial include
- refactor inclusion logic
- add basic deduplicate
* Refactor exporting plaintext list
* Feat: add support for affiliation
A domain rule is always added to the list corresponding to the filename
it resides in. Additionally, you can now add affiliations to a domain
rule, and the rule will be added to the list specified by the
affiliation. Each affiliation begins with `&` and followed by the name
of the affiliation.
This helps us to reduce the number of data files without compromising
functionality, and avoid writing a same rule in different files.
* Feat: add advanced deduplicate for subdomains
only for domain/full subdomains without attr
* Refactor: import and use slices
* Refactor: improve code
