category-entertainment-cn: add anitabi.cn (#3244)

* main.go: improve code

* main.go: move refMap from global variable to local

* main.go: allow tld to be a parent domain

* datdump: improve code

.github/workflows/build.yml

@@ -33,15 +33,17 @@ jobs:
           echo "TAG_NAME=$(date +%Y%m%d%H%M%S)" >> $GITHUB_ENV
         shell: bash
 
-      - name: Build dlc.dat file
+      - name: Build dlc.dat and plain lists
         run: |
           cd code || exit 1
           go run ./ --outputdir=../ --exportlists=category-ads-all,tld-cn,cn,tld-\!cn,geolocation-\!cn,apple,icloud
+          go run ./cmd/datdump/main.go --inputdata=../dlc.dat --outputdir=../ --exportlists=_all_
           cd ../ && rm -rf code
 
       - name: Generate dlc.dat sha256 hash
         run: |
           sha256sum dlc.dat > dlc.dat.sha256sum
+          sha256sum dlc.dat_plain.yml > dlc.dat_plain.yml.sha256sum
 
       - name: Generate Zip
         run: |
@@ -66,6 +68,6 @@ jobs:
 
       - name: Release and upload assets
         run: |
-          gh release create ${{ env.TAG_NAME }} --generate-notes --latest --title ${{ env.RELEASE_NAME }} ./dlc.dat ./dlc.dat.*
+          gh release create ${{ env.TAG_NAME }} --generate-notes --latest --title ${{ env.RELEASE_NAME }} ./dlc.dat ./dlc.dat.* ./dlc.dat_plain.yml ./dlc.dat_plain.yml.*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -8,4 +8,5 @@
 dlc.dat
 
 # Exported plaintext lists.
+/*.yml
 /*.txt

README.md

@@ -10,6 +10,14 @@ This project is not opinionated. In other words, it does NOT endorse, claim or i
 
 - **dlc.dat**：[https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat](https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat)
 - **dlc.dat.sha256sum**：[https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat.sha256sum](https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat.sha256sum)
+- **dlc.dat_plain.yml**：[https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat_plain.yml](https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat_plain.yml)
+- **dlc.dat_plain.yml.sha256sum**：[https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat_plain.yml.sha256sum](https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat_plain.yml.sha256sum)
+
+## Notice
+
+Rules with `@!cn` attribute has been cast out from cn lists. `geosite:geolocation-cn@!cn` is no longer available. Check [#390](https://github.com/v2fly/domain-list-community/issues/390), [#3119](https://github.com/v2fly/domain-list-community/pull/3119) and [#3198](https://github.com/v2fly/domain-list-community/pull/3198) for more information.
+
+Please report if you have any problems or questions.
 
 ## Usage example
 
@@ -85,38 +93,45 @@ All data are under `data` directory. Each file in the directory represents a sub
 # comments
 include:another-file
 domain:google.com @attr1 @attr2
+full:analytics.google.com @ads
 keyword:google
-regexp:www\.google\.com$
-full:www.google.com
+regexp:^odd[1-7]\.example\.org(\.[a-z]{2})?$
 ```
 
 **Syntax:**
 
+> [!NOTE]
+> Adding new `regexp` and `keyword` rules is discouraged because it is easy to use them incorrectly, and proxy software cannot efficiently match these types of rules.
+
+> [!NOTE]
 > The following types of rules are **NOT** fully compatible with the ones that defined by user in V2Ray config file. Do **Not** copy and paste directly.
 
 - Comment begins with `#`. It may begin anywhere in the file. The content in the line after `#` is treated as comment and ignored in production.
-- Inclusion begins with `include:`, followed by the file name of an existing file in the same directory.
 - Subdomain begins with `domain:`, followed by a valid domain name. The prefix `domain:` may be omitted.
-- Keyword begins with `keyword:`, followed by a string.
-- Regular expression begins with `regexp:`, followed by a valid regular expression (per Golang's standard).
 - Full domain begins with `full:`, followed by a complete and valid domain name.
-- Domains (including `domain`, `keyword`, `regexp` and `full`) may have one or more attributes. Each attribute begins with `@` and followed by the name of the attribute.
-
-> **Note:** Adding new `regexp` and `keyword` rules is discouraged because it is easy to use them incorrectly, and proxy software cannot efficiently match these types of rules.
+- Keyword begins with `keyword:`, followed by a substring of a valid domain name.
+- Regular expression begins with `regexp:`, followed by a valid regular expression (per Golang's standard).
+- Domain rules (including `domain`, `full`, `keyword`, and `regexp`) may have none, one or more attributes. Each attribute begins with `@` and followed by the name of the attribute. Attributes will remain available in final lists and `dlc.dat`.
+- Domain rules may have none, one or more affiliations, which additionally adds the domain rule into the affiliated target list. Each affiliation begins with `&` and followed by the name of the target list (nomatter whether the target has a dedicated file in data path). This is a method for data management, and will not remain in the final lists or `dlc.dat`.
+- Inclusion begins with `include:`, followed by the name of another valid domain list. A simple `include:listb` in file `lista` means adding all domain rules of `listb` into `lista`. Inclusions with attributes stands for selective inclusion. `include:listb @attr1 @-attr2` means only adding those domain rules *with* `@attr1` **and** *without* `@attr2`. This is a special type for data management, and will not remain in the final lists or `dlc.dat`.
 
 ## How it works
 
 The entire `data` directory will be built into an external `geosite` file for Project V. Each file in the directory represents a section in the generated file.
 
-To generate a section:
+**General steps:**
 
-1. Remove all the comments in the file.
-2. Replace `include:` lines with the actual content of the file.
-3. Omit all empty lines.
-4. Generate each `domain:` line into a [sub-domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L21).
-5. Generate each `full:` line into a [full domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L23).
-6. Generate each `keyword:` line into a [plain domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L17).
-7. Generate each `regexp:` line into a [regex domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L19).
+1. Read files in the data path (ignore all comments and empty lines).
+2. Parse and resolve source data, turn affiliations and inclusions into actual domain rules in proper lists.
+3. Deduplicate and sort rules in every list.
+4. Export desired plain text lists.
+5. Generate `dlc.dat`:
+   - turn each `domain:` line into a [sub-domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L21).
+   - turn each `full:` line into a [full domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L23).
+   - turn each `keyword:` line into a [plain domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L17).
+   - turn each `regexp:` line into a [regex domain routing rule](https://github.com/v2fly/v2ray-core/blob/master/app/router/routercommon/common.proto#L19).
+
+Read [main.go](./main.go) for details.
 
 ## How to organize domains
 
@@ -126,7 +141,7 @@ Theoretically any string can be used as the name, as long as it is a valid file
 
 ### Attributes
 
-Attribute is useful for sub-group of domains, especially for filtering purpose. For example, the list of `google` domains may contains its main domains, as well as domains that serve ads. The ads domains may be marked by attribute `@ads`, and can be used as `geosite:google@ads` in V2Ray routing.
+Attribute is useful for sub-group of domains, especially for filtering purpose. For example, the list of `google` may contains its main domains, as well as domains that serve ads. The ads domains may be marked by attribute `@ads`, and can be used as `geosite:google@ads` in V2Ray routing. Domains and services that originate from outside China mainland but have access point in China mainland, may be marked by attribute `@cn`.
 
 ## Contribution guideline
 

cmd/datdump/main.go

@@ -0,0 +1,169 @@
+package main
+
+import (
+	"bufio"
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/v2fly/domain-list-community/internal/dlc"
+	router "github.com/v2fly/v2ray-core/v5/app/router/routercommon"
+	"google.golang.org/protobuf/proto"
+)
+
+var (
+	inputData   = flag.String("inputdata", "dlc.dat", "Name of the geosite dat file")
+	outputDir   = flag.String("outputdir", "./", "Directory to place all generated files")
+	exportLists = flag.String("exportlists", "", "Lists to be exported, separated by ',' (empty for _all_)")
+)
+
+type DomainRule struct {
+	Type  string
+	Value string
+	Attrs []string
+}
+
+type DomainList struct {
+	Name  string
+	Rules []DomainRule
+}
+
+func (d *DomainRule) domain2String() string {
+	var dstr strings.Builder
+	dstr.Grow(len(d.Type) + len(d.Value) + 10)
+	fmt.Fprintf(&dstr, "%s:%s", d.Type, d.Value)
+	if len(d.Attrs) != 0 {
+		fmt.Fprintf(&dstr, ":@%s", strings.Join(d.Attrs, ",@"))
+	}
+	return dstr.String()
+}
+
+func loadGeosite(path string) ([]DomainList, map[string]*DomainList, error) {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to read geosite file: %w", err)
+	}
+	vgeositeList := new(router.GeoSiteList)
+	if err := proto.Unmarshal(data, vgeositeList); err != nil {
+		return nil, nil, fmt.Errorf("failed to unmarshal: %w", err)
+	}
+	domainLists := make([]DomainList, len(vgeositeList.Entry))
+	domainListByName := make(map[string]*DomainList, len(vgeositeList.Entry))
+	for i, vsite := range vgeositeList.Entry {
+		rules := make([]DomainRule, 0, len(vsite.Domain))
+		for _, vdomain := range vsite.Domain {
+			rule := DomainRule{Value: vdomain.Value}
+			switch vdomain.Type {
+			case router.Domain_RootDomain:
+				rule.Type = dlc.RuleTypeDomain
+			case router.Domain_Regex:
+				rule.Type = dlc.RuleTypeRegexp
+			case router.Domain_Plain:
+				rule.Type = dlc.RuleTypeKeyword
+			case router.Domain_Full:
+				rule.Type = dlc.RuleTypeFullDomain
+			default:
+				return nil, nil, fmt.Errorf("invalid rule type: %+v", vdomain.Type)
+			}
+			for _, vattr := range vdomain.Attribute {
+				rule.Attrs = append(rule.Attrs, vattr.Key)
+			}
+			rules = append(rules, rule)
+		}
+		domainLists[i] = DomainList{
+			Name:  strings.ToUpper(vsite.CountryCode),
+			Rules: rules,
+		}
+		domainListByName[domainLists[i].Name] = &domainLists[i]
+	}
+	return domainLists, domainListByName, nil
+}
+
+func exportSite(name string, domainListByName map[string]*DomainList) error {
+	domainList, ok := domainListByName[strings.ToUpper(name)]
+	if !ok {
+		return fmt.Errorf("list %q does not exist", name)
+	}
+	if len(domainList.Rules) == 0 {
+		return fmt.Errorf("list %q is empty", name)
+	}
+	file, err := os.Create(filepath.Join(*outputDir, name+".yml"))
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	w := bufio.NewWriter(file)
+	fmt.Fprintf(w, "%s:\n", name)
+	for _, domain := range domainList.Rules {
+		fmt.Fprintf(w, "  - %q\n", domain.domain2String())
+	}
+	return w.Flush()
+}
+
+func exportAll(filename string, domainLists []DomainList) error {
+	file, err := os.Create(filepath.Join(*outputDir, filename))
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	w := bufio.NewWriter(file)
+	w.WriteString("lists:\n")
+	for _, domainList := range domainLists {
+		fmt.Fprintf(w, "  - name: %s\n", strings.ToLower(domainList.Name))
+		fmt.Fprintf(w, "    length: %d\n", len(domainList.Rules))
+		w.WriteString("    rules:\n")
+		for _, domain := range domainList.Rules {
+			fmt.Fprintf(w, "      - %q\n", domain.domain2String())
+		}
+	}
+	return w.Flush()
+}
+
+func run() error {
+	// Make sure output directory exists
+	if err := os.MkdirAll(*outputDir, 0755); err != nil {
+		return fmt.Errorf("failed to create output directory: %w", err)
+	}
+
+	fmt.Printf("loading source data %q...\n", *inputData)
+	domainLists, domainListByName, err := loadGeosite(*inputData)
+	if err != nil {
+		return fmt.Errorf("failed to loadGeosite: %w", err)
+	}
+
+	var exportListSlice []string
+	for raw := range strings.SplitSeq(*exportLists, ",") {
+		if trimmed := strings.TrimSpace(raw); trimmed != "" {
+			exportListSlice = append(exportListSlice, trimmed)
+		}
+	}
+	if len(exportListSlice) == 0 {
+		exportListSlice = []string{"_all_"}
+	}
+
+	for _, eplistname := range exportListSlice {
+		if strings.EqualFold(eplistname, "_all_") {
+			if err := exportAll(filepath.Base(*inputData)+"_plain.yml", domainLists); err != nil {
+				fmt.Printf("failed to exportAll: %v\n", err)
+				continue
+			}
+		} else {
+			if err := exportSite(eplistname, domainListByName); err != nil {
+				fmt.Printf("failed to exportSite: %v\n", err)
+				continue
+			}
+		}
+		fmt.Printf("list: %q has been exported successfully.\n", eplistname)
+	}
+	return nil
+}
+
+func main() {
+	flag.Parse()
+	if err := run(); err != nil {
+		fmt.Printf("Fatal error: %v\n", err)
+		os.Exit(1)
+	}
+}

data/adcolony-ads

@@ -1 +0,0 @@
-adcolony.com @ads

data/adjust

@@ -1,4 +1,4 @@
 adjust.com @ads
-adjust.net.in @ads
 adjust.io @ads
+adjust.net.in @ads
 adjust.world @ads

data/apple

@@ -756,6 +756,7 @@ full:amp-api-edge.apps.apple.com @cn
 full:amp-api-search-edge.apps.apple.com @cn
 full:amp-api.apps.apple.com @cn
 full:amp-api.music.apple.com @cn
+full:aod-ssl.itunes.apple.com @cn
 full:aod.itunes.apple.com @cn
 full:api-edge.apps.apple.com @cn
 full:apptrailers.itunes.apple.com @cn

data/applovin-ads

@@ -1,2 +0,0 @@
-applovin.com @ads
-applvn.com @ads

data/atlassian

@@ -1,7 +1,11 @@
+include:trello
+
+atl-paas.net
+atlassian-dev.net
 atlassian.com
 atlassian.net
 bitbucket.io
 bitbucket.org
+jira.com
+ss-inf.net
 statuspage.io
-
-include:trello

data/atom-data-ads

@@ -1,3 +0,0 @@
-atom-data.io @ads
-analytics-data.io @ads
-ironbeast.io @ads

data/binance

@@ -28,8 +28,10 @@ binancezh.top
 
 # API
 binanceapi.com
+binanceru.net
 bnbstatic.com
 bntrace.com
+bsappapi.com
 nftstatic.com
 
 # saas

data/bohemia

@@ -0,0 +1,9 @@
+arma3.com
+armaplatform.com
+bistudio.com
+bohemia.net
+dayz.com
+makearmanotwar.com
+silicagame.com
+vigorgame.com
+ylands.com

data/category-ads

@@ -1,29 +1,21 @@
 # This file contains domains that clearly serving ads
 
 include:acfun-ads
-include:adcolony-ads
-include:adjust-ads
 include:adobe-ads
 include:alibaba-ads
 include:amazon-ads
 include:apple-ads
-include:applovin-ads
-include:atom-data-ads
 include:baidu-ads
 include:bytedance-ads
 include:category-ads-ir
 include:cctv @ads
-include:clearbit-ads
+include:disney @ads
 include:dmm-ads
 include:duolingo-ads
-include:emogi-ads
-include:flurry-ads
+include:gamersky @ads
 include:google-ads
-include:growingio-ads
-include:hiido-ads
-include:hotjar-ads
+include:hetzner @ads
 include:hunantv-ads
-include:inner-active-ads
 include:iqiyi-ads
 include:jd-ads
 include:kuaishou-ads
@@ -31,30 +23,25 @@ include:kugou-ads
 include:letv-ads
 include:meta-ads
 include:microsoft-ads
-include:mopub-ads
-include:mxplayer-ads
 include:netease-ads
-include:newrelic-ads
-include:ogury-ads
 include:ookla-speedtest-ads
-include:openx-ads
+include:openai @ads
 include:picacg @ads
-include:pocoiq-ads
-include:pubmatic-ads
+include:pikpak @ads
+include:pixiv @ads
 include:qihoo360-ads
-include:segment-ads
+include:samsung @ads
 include:sina-ads
+include:snap @ads
 include:sohu-ads
 include:spotify-ads
-include:supersonic-ads
-include:tagtic-ads
-include:tappx-ads
 include:television-ads
 include:tencent-ads
 include:tendcloud @ads
-include:uberads-ads
+include:twitter @ads
 include:umeng-ads
-include:unity-ads
+include:unity @ads
+include:unitychina @ads
 include:xhamster-ads
 include:xiaomi-ads
 include:ximalaya-ads
@@ -77,26 +64,32 @@ adservice.sigmob.cn
 adtechus.com
 adtrue.com
 adxprtz.com
+assets.growingio.com
 cdn.advertserve.com
 cdn.banclip.com
 cfts1tifqr.com
 contentabc.com
 cretgate.com
+data.flurry.com
 decide.mixpanel.com
+emogi.com
 ero-advertising.com
 eroadvertising.com
+evt.mxplay.com
 exoclick.com
 exosrv.com
 go2.global
 gozendata.com
-gzads.com
 gz-data.com
+gzads.com
 img-bss.csdn.net
 imglnkc.com
 imglnkd.com
+inner-active.mobi
 innovid.com
 jads.co
 jl3.yjaxa.top
+js-agent.newrelic.com
 juicyads.com
 kepler-37b.com
 leanplum.com
@@ -104,22 +97,26 @@ lqc006.com
 moat.com
 moatads.com
 mobwithad.com
+mopub.com
 onesignal.com
 realsrv.com
 s4yxaqyq95.com
 shhs-ydd8x2.yjrmss.cn
+ssp.api.tappx.com
+static.hotjar.com
 static.javhd.com
 tm-banners.gamingadult.com
 trafficfactory.biz
 tsyndicate.com
+uberads.com
 wwads.cn
 
-# 36Kr
-adx.36kr.com
-
 # 12306
 ad.12306.cn
 
+# 36Kr
+adx.36kr.com
+
 # AdHub
 hubcloud.com.cn
 
@@ -130,6 +127,10 @@ beizi.biz
 click.ali213.net
 pbmp.ali213.net
 
+# AppLovin
+applovin.com
+applvn.com
+
 # Caixin
 # regexp:^pinggai\d\.caixin\.com$
 full:pinggai0.caixin.com
@@ -147,12 +148,29 @@ full:pinggai9.caixin.com
 adq.chinaso.com
 stat.chinaso.com
 
+# hiido
+mlog.hiido.com
+ylog.hiido.com
+
 # Httpool
 toboads.com
 
+# ironSource Atom
+analytics-data.io
+atom-data.io
+ironbeast.io
+
+# pocoiq
+cdn.pocoiq.cn
+oct.pocoiq.cn
+
 # Qiniu
 dn-growing.qbox.me
 
+# tagtic
+g1.tagtic.cn
+xy-log.tagtic.cn
+
 # UNI Marketing
 ad.unimhk.com
 

data/category-ads-all

@@ -1,30 +1,34 @@
 # This file contains domains of all ads providers, including both the domains that serves ads, and the domains of providers themselves.
+include:category-ads
 
+include:adjust
+include:clearbit
+include:ogury
+include:openx
+include:pubmatic
+include:segment
+include:supersonic
+include:taboola
 
+1rx.io @ads
 7box.vip @ads
 ad-delivery.net @ads
+adcolony.com @ads
 adinplay.com @ads
 adnxs.com @ads
-adview.cn @ads
 ads.trafficjunky.net @ads
 advertserve.com @ads
+adview.cn @ads
 casalemedia.com @ads
 contextual.media.net @ads
 cpmstar.com @ads
 demdex.net @ads
 httpool.com @ads
 lijit.com @ads
-1rx.io @ads
 mfadsrvr.com @ads
 mgid.com @ads
 ns1p.net @ads
-pubmatic.com @ads
 sigmob.com @ads
-snapads.com @ads
 spotxchange.com @ads
 unimhk.com @ads
 upapi.net @ads
-
-
-include:taboola
-include:category-ads

data/category-bank-cn

@@ -1,9 +1,9 @@
-include:boc
-include:ccb
-include:citic
-include:cmb
+include:boc @-!cn
+include:ccb @-!cn
+include:citic @-!cn
+include:cmb @-!cn
 include:hsbc-cn
-include:icbc
+include:icbc @-!cn
 include:unionpay
 
 abchina.com

data/category-companies

@@ -48,6 +48,7 @@ include:kakao
 include:kaspersky
 include:lg
 include:logitech
+include:louisvuitton
 include:mailru-group
 include:meta
 include:microsoft

data/category-dev-cn

@@ -4,7 +4,7 @@ include:apipost
 include:baltamatica
 include:cnblogs
 include:csdn
-include:deepin
+include:deepin @-!cn
 include:gitee
 include:goproxy
 include:huawei-dev
@@ -18,6 +18,7 @@ include:segmentfault
 include:sxl
 include:tencent-dev
 include:ubuntukylin
+include:unitychina
 
 jinrishici.com
 openvela.com

data/category-education-cn

@@ -142,3 +142,5 @@ ystbds.com
 zhan.com
 # 智慧树
 zhihuishu.com
+# 浙江省教育考试院
+zjzs.net

data/category-enhance-gaming

@@ -2,6 +2,9 @@ include:playcover
 include:fflogs
 include:trackernetwork
 
+# Anti-Cheat
+battleye.com
+
 # Android Emulator
 bluestacks.com
 ldmnq.com @cn
@@ -16,5 +19,5 @@ prts.plus
 heavenlywind.cc @cn
 poi.moe
 
-
+# Steam++ / Watt Toolkit
 steampp.net @cn

data/category-entertainment-cn

@@ -6,7 +6,7 @@ include:aamgame
 include:acfun
 include:acplay
 include:bestv
-include:bilibili
+include:bilibili @-!cn
 include:ciweimao
 include:dedao
 include:douyin
@@ -18,7 +18,7 @@ include:gamersky
 include:gitv
 include:hunantv
 include:huya
-include:iqiyi
+include:iqiyi @-!cn
 include:ku6
 include:kuaikan
 include:kuaishou
@@ -50,6 +50,8 @@ yeshen.com
 51zmt.top
 # 广东南方新媒体
 aisee.tv
+# 动画巡礼
+anitabi.cn
 # 暴风影音
 baofeng.com
 baofeng.net

data/category-games-!cn

@@ -1,10 +1,12 @@
 include:2kgames
 include:blizzard
 include:bluearchive
+include:bohemia
 include:curseforge
 include:cygames
 include:ea
 include:embark
+include:eneba
 include:epicgames
 include:escapefromtarkov
 include:faceit

data/category-games-cn

@@ -9,13 +9,15 @@ include:mihoyo-cn
 include:tencent-games
 include:tiancity
 include:vrzwk
-include:xd
+include:xd @-!cn
 include:yokaverse
 
 # 北京奇客创想科技有限公司
 7k7k.com
 # 刀锋盒子 皖B2-20190103-4
 9xgame.com
+# 韵律谱面研究站 桂ICP备20001846号-3
+arcaea.cn
 # 《异象回声》游戏官网 沪ICP备2023010411号-1
 astral-vector.com
 # 九九互动 粤ICP备19068416号

data/category-hospital-cn

@@ -10,3 +10,6 @@ yctdyy.com
 
 # 南方医科大学深圳医院
 smuszh.com
+
+# 四川大学华西医院
+cd120.com

data/category-social-media-cn

@@ -6,7 +6,7 @@ include:gracg
 include:hupu
 include:meipian
 include:okjike
-include:sina
+include:sina @-!cn
 include:xiaohongshu
 include:yy
 include:zhihu

data/cloudflare

@@ -41,6 +41,9 @@ cloudflarewarp.com
 cloudflareworkers.com
 encryptedsni.com
 every1dns.net
+foundationdns.com
+foundationdns.net
+foundationdns.org
 imagedelivery.net
 isbgpsafeyet.com
 one.one.one

data/emogi-ads

@@ -1 +0,0 @@
-emogi.com @ads

data/eneba

@@ -0,0 +1,2 @@
+eneba.com
+eneba.games

data/flurry-ads

@@ -1 +0,0 @@
-data.flurry.com @ads

data/geolocation-!cn

@@ -102,6 +102,8 @@ include:w3schools
 include:zotero
 
 chemequations.com # 线上化学方程式！
+geogebra.org
+wolframalpha.com
 
 # Entertainment & Games & Music & Podcasts & Videos
 include:category-entertainment
@@ -269,6 +271,8 @@ ldoceonline.com
 immersivetranslate.com # 沉浸式翻译 (国际版)
 ## OriginLab (Graphing for Science and Engineering)
 originlab.com
+## OsmAnd
+osmand.net
 
 # Software development
 include:category-dev
@@ -300,6 +304,7 @@ include:wikimedia
 
 atwiki.jp
 touhouwiki.net
+wiki.gg
 
 # Others
 include:avaxhome

data/geolocation-cn

@@ -24,7 +24,6 @@ include:category-social-media-cn
 # Advertisment & Analytics
 include:getui
 include:jiguang
-include:umeng
 
 # 神策数据
 sensorsdata.cn
@@ -38,9 +37,9 @@ include:category-httpdns-cn
 # Bank & Finance & Insurance & Securities
 include:category-bank-cn
 include:category-securities-cn
-include:eastmoney
+include:eastmoney @-!cn
 include:everbright
-include:pingan
+include:pingan @-!cn
 include:taikang
 
 ## 航财通·校园付
@@ -92,11 +91,11 @@ pkoplink.com
 
 # E-commerce
 include:58tongcheng
-include:ctrip
+include:ctrip @-!cn
 include:dangdang
-include:dewu
+include:dewu @-!cn
 include:dongjiao
-include:jd
+include:jd @-!cn
 include:lianjia
 include:meituan
 include:miaomiaozhe
@@ -411,19 +410,19 @@ zhaopin.cn
 # Tech companies & Orginations
 include:aisiku # 北京艾斯酷科技有限公司
 include:akiko # 秋子酱科技
-include:alibaba
+include:alibaba @-!cn
 include:baidu
 include:beisen
 include:bluepoch
-include:bytedance
-include:didi
+include:bytedance @-!cn
+include:didi @-!cn
 include:dingdatech # 叮哒出行(杭州金通互联科技有限公司)
 include:dji
 include:gree
 include:haier
 include:hikvision
 include:honor
-include:huawei
+include:huawei @-!cn
 include:hupun # 杭州湖畔网络技术有限公司
 include:iflytek
 include:ishumei # 北京数美时代科技有限公司
@@ -435,14 +434,14 @@ include:meizu
 include:midea
 include:narwal # 云鲸科技
 include:netease
-include:oppo
+include:oppo @-!cn
 include:qihoo360
 include:sumkoo #北京尚古创新科技有限公司
 include:tcl
-include:tencent
+include:tencent @-!cn
 include:tongfang
-include:vivo
-include:xiaomi
+include:vivo @-!cn
+include:xiaomi @-!cn
 include:xunlei
 include:youquan # 祐全科技
 include:yuanbei # 上海圆贝信息科技有限公司
@@ -479,13 +478,20 @@ xsbapp.cn
 
 # Telecommunication
 include:chinabroadnet
-include:chinamobile
-include:chinatelecom
+include:chinamobile @-!cn
+include:chinatelecom @-!cn
 include:chinatower
-include:chinaunicom
+include:chinaunicom @-!cn
 
 # 在线工具
-include:ipip # IPIP ip地理位置数据库
+## IPIP ip地理位置数据库
+include:ipip @-!cn
+
+## 白描
+baimiao.tech
+baimiaoapp.com
+shinescan.tech
+uzero.cn
 
 chaziyu.com # 滇ICP备2024035496号
 fofa.info # Fofa网站测绘（华顺信安）

data/growingio-ads

@@ -1 +0,0 @@
-assets.growingio.com @ads

data/hiido-ads

@@ -1,2 +0,0 @@
-mlog.hiido.com @ads
-ylog.hiido.com @ads

data/hotjar-ads

@@ -1 +0,0 @@
-static.hotjar.com @ads

data/inner-active-ads

@@ -1 +0,0 @@
-inner-active.mobi @ads

data/kinopub

@@ -6,4 +6,9 @@ gfw.ovh # sub domains mirror
 mos-gorsud.co # kinopub domain to generate a mirror site through gfw.ovh
 
 # kinopub CDN servers
+cdn-service.space
+cdn2cdn.com
+cdn2site.com
+pushbr.com # poster images CDN
+
 regexp:(\w+)-static-[0-9]+\.cdntogo\.net$

data/louisvuitton

@@ -0,0 +1,5 @@
+louisvuitton.cn @cn
+louisvuitton.com
+lvcampaign.com @cn
+
+full:tp.louisvuitton.com @cn

data/microsoft-dev

@@ -60,6 +60,7 @@ full:default.exp-tas.com
 full:developer.microsoft.com
 full:download.visualstudio.microsoft.com
 full:dtlgalleryint.cloudapp.net
+full:packages.microsoft.com
 full:poshtestgallery.cloudapp.net
 full:psg-int-centralus.cloudapp.net
 full:psg-int-eastus.cloudapp.net

data/mopub-ads

@@ -1 +0,0 @@
-mopub.com @ads

data/mxplayer-ads

@@ -1 +0,0 @@
-evt.mxplay.com @ads

data/newrelic-ads

@@ -1 +0,0 @@
-js-agent.newrelic.com @ads

data/ogury

@@ -1,3 +1,3 @@
+ogury.co @ads
 ogury.com @ads
 presage.io @ads
-ogury.co @ads

data/okx

@@ -1,8 +1,9 @@
 okex.com
-okx.com
 okx-dns.com
 okx-dns1.com
 okx-dns2.com
+okx.cab
+okx.com
 
 # OKC Browser
 oklink.com @cn

data/openai

@@ -1,6 +1,7 @@
 # Main domain
-chatgpt.com
 chat.com
+chatgpt.com
+crixet.com
 oaistatic.com
 oaiusercontent.com
 openai.com
@@ -10,13 +11,13 @@ sora.com
 openai.com.cdn.cloudflare.net
 full:openaiapi-site.azureedge.net
 full:openaicom-api-bdcpf8c6d2e9atf6.z01.azurefd.net
+full:openaicom.imgix.net
 full:openaicomproductionae4b.blob.core.windows.net
 full:production-openaicom-storage.azureedge.net
 regexp:^chatgpt-async-webps-prod-\S+-\d+\.webpubsub\.azure\.com$
 
 # tracking
 full:o33249.ingest.sentry.io @ads
-full:openaicom.imgix.net @ads
 full:browser-intake-datadoghq.com @ads
 
 # Advanced Voice

data/pocoiq-ads

@@ -1,2 +0,0 @@
-cdn.pocoiq.cn @ads
-oct.pocoiq.cn @ads

data/projectsekai

@@ -1 +1,2 @@
 sekai.colorfulpalette.org
+pjsekai.sega.jp

data/pubmatic

@@ -2,5 +2,3 @@
 
 pubmatic.com
 pubmatic.co.jp
-
-include:pubmatic-ads

data/pubmatic-ads

@@ -1 +0,0 @@
-ads.pubmatic.com @ads

data/qcloud

@@ -44,6 +44,7 @@ dnsv1.com.cn
 dothework.cn
 ectencent.cn
 ectencent.com.cn
+edgeone.cool
 edgeonedy1.com
 essurl.com
 exmailgz.com

data/salesforce

@@ -24,6 +24,7 @@ pardot.com
 quotable.com
 radian6.com
 relateiq.com
+salesforce-setup.com
 salesforce.com
 salesforce.org
 salesforceiq.com

data/samsung

@@ -8,6 +8,7 @@ galaxyappstore.com
 galaxymobile.jp
 game-platform.net
 knoxemm.com
+ospserver.net
 samsung.com
 samsungads.com @ads
 samsungapps.com

data/supersonic

@@ -1,4 +1,5 @@
+ssacdn.com @ads
 supersonic.com @ads
 supersonicads.com @ads
-ssacdn.com @ads
+
 supersonicads-a.akamaihd.net @ads

data/tagtic-ads

@@ -1,2 +0,0 @@
-g1.tagtic.cn @ads
-xy-log.tagtic.cn @ads

data/tappx-ads

@@ -1 +0,0 @@
-ssp.api.tappx.com @ads

data/terabox

@@ -1,2 +1,7 @@
+1024terabox.com
+bestclouddrive.com
+freeterabox.com
+nephobox.com
 terabox.com
+terabox1024.com
 teraboxcdn.com

data/uberads-ads

@@ -1 +0,0 @@
-uberads.com @ads

data/unity

@@ -1,4 +1,6 @@
 unity.com
 unity3d.com
 
-include:unity-ads
+# Ads/tracking
+iads.unity3d.com @ads
+unityads.unity3d.com @ads

data/unitychina

@@ -1,6 +1,11 @@
+# 优三缔 / 优美缔 / 团结引擎
+u3d.cn
+unity.cn
+unitychina.cn
+
+# Ads/tracking
 ads.unitychina.cn @ads
 splash-ads.cdn.unity.cn @ads
 splash-ads.unitychina.cn @ads
 unityads.unity.cn @ads
-unityads.unity3d.com @ads
 unityads.unitychina.cn @ads

data/xiaohongshu

@@ -1,5 +1,6 @@
 include:askdiandian
 
+rednotecdn.com
 xhscdn.com
 xhscdn.net
 xhslink.com

internal/dlc/dlc.go

@@ -0,0 +1,9 @@
+package dlc
+
+const (
+	RuleTypeDomain     string = "domain"
+	RuleTypeFullDomain string = "full"
+	RuleTypeKeyword    string = "keyword"
+	RuleTypeRegexp     string = "regexp"
+	RuleTypeInclude    string = "include"
+)

main.go

@@ -10,6 +10,7 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/v2fly/domain-list-community/internal/dlc"
 	router "github.com/v2fly/v2ray-core/v5/app/router/routercommon"
 	"google.golang.org/protobuf/proto"
 )
@@ -21,23 +22,7 @@ var (
 	exportLists = flag.String("exportlists", "", "Lists to be flattened and exported in plaintext format, separated by ',' comma")
 )
 
-const (
-	RuleTypeDomain     string = "domain"
-	RuleTypeFullDomain string = "full"
-	RuleTypeKeyword    string = "keyword"
-	RuleTypeRegexp     string = "regexp"
-	RuleTypeInclude    string = "include"
-)
-
 var (
-	TypeChecker  = regexp.MustCompile(`^(domain|full|keyword|regexp|include)$`)
-	ValueChecker = regexp.MustCompile(`^[a-z0-9!\.-]+$`)
-	AttrChecker  = regexp.MustCompile(`^[a-z0-9!-]+$`)
-	SiteChecker  = regexp.MustCompile(`^[A-Z0-9!-]+$`)
-)
-
-var (
-	refMap    = make(map[string][]*Entry)
 	plMap     = make(map[string]*ParsedList)
 	finalMap  = make(map[string][]*Entry)
 	cirIncMap = make(map[string]bool) // Used for circular inclusion detection
@@ -66,7 +51,7 @@ type ParsedList struct {
 func makeProtoList(listName string, entries []*Entry) (*router.GeoSite, error) {
 	site := &router.GeoSite{
 		CountryCode: listName,
-		Domain: make([]*router.Domain, 0, len(entries)),
+		Domain:      make([]*router.Domain, 0, len(entries)),
 	}
 	for _, entry := range entries {
 		pdomain := &router.Domain{Value: entry.Value}
@@ -78,13 +63,13 @@ func makeProtoList(listName string, entries []*Entry) (*router.GeoSite, error) {
 		}
 
 		switch entry.Type {
-		case RuleTypeDomain:
+		case dlc.RuleTypeDomain:
 			pdomain.Type = router.Domain_RootDomain
-		case RuleTypeRegexp:
+		case dlc.RuleTypeRegexp:
 			pdomain.Type = router.Domain_Regex
-		case RuleTypeKeyword:
+		case dlc.RuleTypeKeyword:
 			pdomain.Type = router.Domain_Plain
-		case RuleTypeFullDomain:
+		case dlc.RuleTypeFullDomain:
 			pdomain.Type = router.Domain_Full
 		}
 		site.Domain = append(site.Domain, pdomain)
@@ -92,18 +77,14 @@ func makeProtoList(listName string, entries []*Entry) (*router.GeoSite, error) {
 	return site, nil
 }
 
-func writePlainList(exportedName string) error {
-	targetList, exist := finalMap[strings.ToUpper(exportedName)]
-	if !exist || len(targetList) == 0 {
-		return fmt.Errorf("'%s' list does not exist or is empty.", exportedName)
-	}
-	file, err := os.Create(filepath.Join(*outputDir, strings.ToLower(exportedName) + ".txt"))
+func writePlainList(listname string, entries []*Entry) error {
+	file, err := os.Create(filepath.Join(*outputDir, strings.ToLower(listname)+".txt"))
 	if err != nil {
 		return err
 	}
 	defer file.Close()
 	w := bufio.NewWriter(file)
-	for _, entry := range targetList {
+	for _, entry := range entries {
 		fmt.Fprintln(w, entry.Plain)
 	}
 	return w.Flush()
@@ -112,83 +93,126 @@ func writePlainList(exportedName string) error {
 func parseEntry(line string) (Entry, error) {
 	var entry Entry
 	parts := strings.Fields(line)
+	if len(parts) == 0 {
+		return entry, fmt.Errorf("empty line")
+	}
 
 	// Parse type and value
-	rawTypeVal := parts[0]
-	kv := strings.Split(rawTypeVal, ":")
-	if len(kv) == 1 {
-		entry.Type = RuleTypeDomain // Default type
-		entry.Value = strings.ToLower(rawTypeVal)
-	} else if len(kv) == 2 {
-		entry.Type = strings.ToLower(kv[0])
-		if entry.Type == RuleTypeRegexp {
-			entry.Value = kv[1]
-		} else {
-			entry.Value = strings.ToLower(kv[1])
+	v := parts[0]
+	colonIndex := strings.Index(v, ":")
+	if colonIndex == -1 {
+		entry.Type = dlc.RuleTypeDomain // Default type
+		entry.Value = strings.ToLower(v)
+		if !validateDomainChars(entry.Value) {
+			return entry, fmt.Errorf("invalid domain: %q", entry.Value)
 		}
 	} else {
-		return entry, fmt.Errorf("invalid format: %s", line)
-	}
-	// Check type and value
-	if !TypeChecker.MatchString(entry.Type) {
-		return entry, fmt.Errorf("invalid type: %s", entry.Type)
-	}
-	if entry.Type == RuleTypeRegexp {
-		if _, err := regexp.Compile(entry.Value); err != nil {
-			return entry, fmt.Errorf("invalid regexp: %s", entry.Value)
+		typ := strings.ToLower(v[:colonIndex])
+		val := v[colonIndex+1:]
+		switch typ {
+		case dlc.RuleTypeRegexp:
+			if _, err := regexp.Compile(val); err != nil {
+				return entry, fmt.Errorf("invalid regexp %q: %w", val, err)
+			}
+			entry.Type = dlc.RuleTypeRegexp
+			entry.Value = val
+		case dlc.RuleTypeInclude:
+			entry.Type = dlc.RuleTypeInclude
+			entry.Value = strings.ToUpper(val)
+			if !validateSiteName(entry.Value) {
+				return entry, fmt.Errorf("invalid include list name: %q", entry.Value)
+			}
+		case dlc.RuleTypeDomain, dlc.RuleTypeFullDomain, dlc.RuleTypeKeyword:
+			entry.Type = typ
+			entry.Value = strings.ToLower(val)
+			if !validateDomainChars(entry.Value) {
+				return entry, fmt.Errorf("invalid domain: %q", entry.Value)
+			}
+		default:
+			return entry, fmt.Errorf("invalid type: %q", typ)
 		}
-	} else if !ValueChecker.MatchString(entry.Value) {
-		return entry, fmt.Errorf("invalid value: %s", entry.Value)
 	}
 
-	// Parse/Check attributes and affiliations
+	// Parse attributes and affiliations
 	for _, part := range parts[1:] {
 		if strings.HasPrefix(part, "@") {
 			attr := strings.ToLower(part[1:]) // Trim attribute prefix `@` character
-			if !AttrChecker.MatchString(attr) {
-				return entry, fmt.Errorf("invalid attribute key: %s", attr)
+			if !validateAttrChars(attr) {
+				return entry, fmt.Errorf("invalid attribute: %q", attr)
 			}
 			entry.Attrs = append(entry.Attrs, attr)
 		} else if strings.HasPrefix(part, "&") {
 			aff := strings.ToUpper(part[1:]) // Trim affiliation prefix `&` character
-			if !SiteChecker.MatchString(aff) {
-				return entry, fmt.Errorf("invalid affiliation key: %s", aff)
+			if !validateSiteName(aff) {
+				return entry, fmt.Errorf("invalid affiliation: %q", aff)
 			}
 			entry.Affs = append(entry.Affs, aff)
 		} else {
-			return entry, fmt.Errorf("invalid attribute/affiliation: %s", part)
+			return entry, fmt.Errorf("invalid attribute/affiliation: %q", part)
 		}
 	}
 	// Sort attributes
 	slices.Sort(entry.Attrs)
 	// Formated plain entry: type:domain.tld:@attr1,@attr2
-	entry.Plain = entry.Type + ":" + entry.Value
+	var plain strings.Builder
+	plain.Grow(len(entry.Type) + len(entry.Value) + 10)
+	fmt.Fprintf(&plain, "%s:%s", entry.Type, entry.Value)
 	if len(entry.Attrs) != 0 {
-		entry.Plain = entry.Plain + ":@" + strings.Join(entry.Attrs, ",@")
+		fmt.Fprintf(&plain, ":@%s", strings.Join(entry.Attrs, ",@"))
 	}
+	entry.Plain = plain.String()
 
 	return entry, nil
 }
 
-func loadData(path string) error {
+func validateDomainChars(domain string) bool {
+	for i := range domain {
+		c := domain[i]
+		if (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '.' || c == '-' {
+			continue
+		}
+		return false
+	}
+	return true
+}
+
+func validateAttrChars(attr string) bool {
+	for i := range attr {
+		c := attr[i]
+		if (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '!' || c == '-' {
+			continue
+		}
+		return false
+	}
+	return true
+}
+
+func validateSiteName(name string) bool {
+	for i := range name {
+		c := name[i]
+		if (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '!' || c == '-' {
+			continue
+		}
+		return false
+	}
+	return true
+}
+
+func loadData(path string) ([]*Entry, error) {
 	file, err := os.Open(path)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	defer file.Close()
 
-	listName := strings.ToUpper(filepath.Base(path))
-	if !SiteChecker.MatchString(listName) {
-		return fmt.Errorf("invalid list name: %s", listName)
-	}
+	var entries []*Entry
 	scanner := bufio.NewScanner(file)
 	lineIdx := 0
 	for scanner.Scan() {
 		line := scanner.Text()
 		lineIdx++
-		// Remove comments
 		if idx := strings.Index(line, "#"); idx != -1 {
-			line = line[:idx]
+			line = line[:idx] // Remove comments
 		}
 		line = strings.TrimSpace(line)
 		if line == "" {
@@ -196,11 +220,11 @@ func loadData(path string) error {
 		}
 		entry, err := parseEntry(line)
 		if err != nil {
-			return fmt.Errorf("error in %s at line %d: %v", path, lineIdx, err)
+			return entries, fmt.Errorf("error in %q at line %d: %w", path, lineIdx, err)
 		}
-		refMap[listName] = append(refMap[listName], &entry)
+		entries = append(entries, &entry)
 	}
-	return nil
+	return entries, nil
 }
 
 func parseList(refName string, refList []*Entry) error {
@@ -210,11 +234,11 @@ func parseList(refName string, refList []*Entry) error {
 		plMap[refName] = pl
 	}
 	for _, entry := range refList {
-		if entry.Type == RuleTypeInclude {
+		if entry.Type == dlc.RuleTypeInclude {
 			if len(entry.Affs) != 0 {
-				return fmt.Errorf("affiliation is not allowed for include:%s", entry.Value)
+				return fmt.Errorf("affiliation is not allowed for include:%q", entry.Value)
 			}
-			inc := &Inclusion{Source: strings.ToUpper(entry.Value)}
+			inc := &Inclusion{Source: entry.Value}
 			for _, attr := range entry.Attrs {
 				if strings.HasPrefix(attr, "-") {
 					inc.BanAttrs = append(inc.BanAttrs, attr[1:]) // Trim attribute prefix `-` character
@@ -238,24 +262,44 @@ func parseList(refName string, refList []*Entry) error {
 	return nil
 }
 
-func polishList(roughMap *map[string]*Entry) []*Entry {
-	finalList := make([]*Entry, 0, len(*roughMap))
-	queuingList := make([]*Entry, 0, len(*roughMap)) // Domain/full entries without attr
+func isMatchAttrFilters(entry *Entry, incFilter *Inclusion) bool {
+	if len(incFilter.MustAttrs) == 0 && len(incFilter.BanAttrs) == 0 {
+		return true
+	}
+	if len(entry.Attrs) == 0 {
+		return len(incFilter.MustAttrs) == 0
+	}
+	for _, m := range incFilter.MustAttrs {
+		if !slices.Contains(entry.Attrs, m) {
+			return false
+		}
+	}
+	for _, b := range incFilter.BanAttrs {
+		if slices.Contains(entry.Attrs, b) {
+			return false
+		}
+	}
+	return true
+}
+
+func polishList(roughMap map[string]*Entry) []*Entry {
+	finalList := make([]*Entry, 0, len(roughMap))
+	queuingList := make([]*Entry, 0, len(roughMap)) // Domain/full entries without attr
 	domainsMap := make(map[string]bool)
-	for _, entry := range *roughMap {
+	for _, entry := range roughMap {
 		switch entry.Type { // Bypass regexp, keyword and "full/domain with attr"
-		case RuleTypeRegexp:
+		case dlc.RuleTypeRegexp:
 			finalList = append(finalList, entry)
-		case RuleTypeKeyword:
+		case dlc.RuleTypeKeyword:
 			finalList = append(finalList, entry)
-		case RuleTypeDomain:
+		case dlc.RuleTypeDomain:
 			domainsMap[entry.Value] = true
 			if len(entry.Attrs) != 0 {
 				finalList = append(finalList, entry)
 			} else {
 				queuingList = append(queuingList, entry)
 			}
-		case RuleTypeFullDomain:
+		case dlc.RuleTypeFullDomain:
 			if len(entry.Attrs) != 0 {
 				finalList = append(finalList, entry)
 			} else {
@@ -266,12 +310,16 @@ func polishList(roughMap *map[string]*Entry) []*Entry {
 	// Remove redundant subdomains for full/domain without attr
 	for _, qentry := range queuingList {
 		isRedundant := false
-		pd := qentry.Value // Parent domain
+		pd := qentry.Value // To be parent domain
+		if qentry.Type == dlc.RuleTypeFullDomain {
+			pd = "." + pd // So that `domain:example.org` overrides `full:example.org`
+		}
 		for {
 			idx := strings.Index(pd, ".")
-			if idx == -1 { break }
+			if idx == -1 {
+				break
+			}
 			pd = pd[idx+1:] // Go for next parent
-			if !strings.Contains(pd, ".") { break } // Not allow tld to be a parent
 			if domainsMap[pd] {
 				isRedundant = true
 				break
@@ -289,27 +337,16 @@ func polishList(roughMap *map[string]*Entry) []*Entry {
 }
 
 func resolveList(pl *ParsedList) error {
-	if _, pldone := finalMap[pl.Name]; pldone { return nil }
+	if _, pldone := finalMap[pl.Name]; pldone {
+		return nil
+	}
 
 	if cirIncMap[pl.Name] {
-		return fmt.Errorf("circular inclusion in: %s", pl.Name)
+		return fmt.Errorf("circular inclusion in: %q", pl.Name)
 	}
 	cirIncMap[pl.Name] = true
 	defer delete(cirIncMap, pl.Name)
 
-	isMatchAttrFilters := func(entry *Entry, incFilter *Inclusion) bool {
-		if len(incFilter.MustAttrs) == 0 && len(incFilter.BanAttrs) == 0 { return true }
-		if len(entry.Attrs) == 0 { return len(incFilter.MustAttrs) == 0 }
-
-		for _, m := range incFilter.MustAttrs {
-			if !slices.Contains(entry.Attrs, m) { return false }
-		}
-		for _, b := range incFilter.BanAttrs {
-			if slices.Contains(entry.Attrs, b) { return false }
-		}
-		return true
-	}
-
 	roughMap := make(map[string]*Entry) // Avoid basic duplicates
 	for _, dentry := range pl.Entries { // Add direct entries
 		roughMap[dentry.Plain] = dentry
@@ -317,7 +354,7 @@ func resolveList(pl *ParsedList) error {
 	for _, inc := range pl.Inclusions {
 		incPl, exist := plMap[inc.Source]
 		if !exist {
-			return fmt.Errorf("list '%s' includes a non-existent list: '%s'", pl.Name, inc.Source)
+			return fmt.Errorf("list %q includes a non-existent list: %q", pl.Name, inc.Source)
 		}
 		if err := resolveList(incPl); err != nil {
 			return err
@@ -328,67 +365,66 @@ func resolveList(pl *ParsedList) error {
 			}
 		}
 	}
-	finalMap[pl.Name] = polishList(&roughMap)
+	finalMap[pl.Name] = polishList(roughMap)
 	return nil
 }
 
-func main() {
-	flag.Parse()
-
+func run() error {
 	dir := *dataPath
-	fmt.Println("Use domain lists in", dir)
+	fmt.Printf("using domain lists data in %q\n", dir)
 
 	// Generate refMap
-	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
+	refMap := make(map[string][]*Entry)
+	err := filepath.WalkDir(dir, func(path string, d os.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
-		if info.IsDir() {
+		if d.IsDir() {
 			return nil
 		}
-		if err := loadData(path); err != nil {
-			return err
+		listName := strings.ToUpper(filepath.Base(path))
+		if !validateSiteName(listName) {
+			return fmt.Errorf("invalid list name: %q", listName)
 		}
-		return nil
+		refMap[listName], err = loadData(path)
+		return err
 	})
 	if err != nil {
-		fmt.Println("Failed to loadData:", err)
-		os.Exit(1)
+		return fmt.Errorf("failed to loadData: %w", err)
 	}
 
 	// Generate plMap
 	for refName, refList := range refMap {
 		if err := parseList(refName, refList); err != nil {
-			fmt.Println("Failed to parseList:", err)
-			os.Exit(1)
+			return fmt.Errorf("failed to parseList %q: %w", refName, err)
 		}
 	}
 
 	// Generate finalMap
-	for _, pl := range plMap {
+	for plname, pl := range plMap {
 		if err := resolveList(pl); err != nil {
-			fmt.Println("Failed to resolveList:", err)
-			os.Exit(1)
+			return fmt.Errorf("failed to resolveList %q: %w", plname, err)
 		}
 	}
 
-	// Create output directory if not exist
-	if _, err := os.Stat(*outputDir); os.IsNotExist(err) {
-		if mkErr := os.MkdirAll(*outputDir, 0755); mkErr != nil {
-			fmt.Println("Failed:", mkErr)
-			os.Exit(1)
-		}
+	// Make sure output directory exists
+	if err := os.MkdirAll(*outputDir, 0755); err != nil {
+		return fmt.Errorf("failed to create output directory: %w", err)
 	}
 
 	// Export plaintext list
-	if *exportLists != "" {
-		exportedListSlice := strings.Split(*exportLists, ",")
-		for _, exportedList := range exportedListSlice {
-			if err := writePlainList(exportedList); err != nil {
-				fmt.Println("Failed to write list:", err)
+	for rawEpList := range strings.SplitSeq(*exportLists, ",") {
+		if epList := strings.TrimSpace(rawEpList); epList != "" {
+			entries, exist := finalMap[strings.ToUpper(epList)]
+			if !exist || len(entries) == 0 {
+				fmt.Printf("list %q does not exist or is empty\n", epList)
 				continue
 			}
-			fmt.Printf("list: '%s' has been generated successfully.\n", exportedList)
+			if err := writePlainList(epList, entries); err != nil {
+				fmt.Printf("failed to write list %q: %v\n", epList, err)
+				continue
+			}
+			fmt.Printf("list %q has been generated successfully.\n", epList)
 		}
 	}
 
@@ -397,8 +433,7 @@ func main() {
 	for siteName, siteEntries := range finalMap {
 		site, err := makeProtoList(siteName, siteEntries)
 		if err != nil {
-			fmt.Println("Failed:", err)
-			os.Exit(1)
+			return fmt.Errorf("failed to makeProtoList %q: %w", siteName, err)
 		}
 		protoList.Entry = append(protoList.Entry, site)
 	}
@@ -409,13 +444,19 @@ func main() {
 
 	protoBytes, err := proto.Marshal(protoList)
 	if err != nil {
-		fmt.Println("Failed to marshal:", err)
-		os.Exit(1)
+		return fmt.Errorf("failed to marshal: %w", err)
 	}
 	if err := os.WriteFile(filepath.Join(*outputDir, *outputName), protoBytes, 0644); err != nil {
-		fmt.Println("Failed to write output:", err)
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	fmt.Printf("%q has been generated successfully.\n", *outputName)
+	return nil
+}
+
+func main() {
+	flag.Parse()
+	if err := run(); err != nil {
+		fmt.Printf("Fatal error: %v\n", err)
 		os.Exit(1)
-	} else {
-		fmt.Println(*outputName, "has been generated successfully.")
 	}
 }