Feat: add support for partial include

Refactor: promote refMap
Remove support for partial include
2026-01-01 20:40:31 +07:00 · 2025-12-31 21:42:35 +08:00 · 2025-12-31 20:30:16 +08:00 · 2025-12-31 20:29:54 +08:00 · 2025-12-31 20:25:58 +08:00 · 2025-12-31 20:24:51 +08:00
42 changed files with 338 additions and 242 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,6 +5,11 @@ on:
      - master
    paths-ignore:
      - "**/README.md"
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: false
 jobs:
  build:
    name: Build
--- a/data/archive
+++ b/data/archive
@@ -1,8 +1,2 @@
-include:4plebs
+# For compatibility only
-
+include:category-web-archive
 archive-it.org
 archive.md
 archive.org
 archive.ph
 archive.today
 openlibrary.org
--- a/data/archivetoday
+++ b/data/archivetoday
@@ -0,0 +1,8 @@
 archive.today
 archive.fo
 archive.is
 archive.li
 archive.md
 archive.ph
 archive.vn
--- a/data/archlinux
+++ b/data/archlinux
@@ -1,2 +1,5 @@
 archlinux.org
 archlinuxarm.org
 # Unofficial
 archlinuxcn.org
--- a/data/askdiandian
+++ b/data/askdiandian
@@ -0,0 +1,3 @@
 # 点点 Ai
 askdiandian.com
 diandianlife.top
--- a/data/avito
+++ b/data/avito
@@ -0,0 +1,2 @@
 avito.ru
 avito.st
--- a/data/baidu-ads
+++ b/data/baidu-ads
@@ -1,3 +1,5 @@
 include:zuoyebang-ads
 adscdn.baidu.com @ads
 adx.xiaodutv.com @ads
 afd.baidu.com @ads
--- a/data/category-ai-cn
+++ b/data/category-ai-cn
@@ -1,3 +1,4 @@
 include:askdiandian
 include:deepseek
 include:doubao
 include:trae # MarsCode
--- a/data/category-companies
+++ b/data/category-companies
@@ -24,6 +24,7 @@ include:comodo
 include:corel
 include:dell
 include:digitalocean
 include:dmit
 include:drweb
 include:duolingo
 include:faronics
--- a/data/category-dev
+++ b/data/category-dev
@@ -70,10 +70,7 @@ apache.org
 artixlinux.org
 atom.io
 badgen.net
 # Bitvise official website.
 bitvise.com
 cdnjs.com
 centos.org
 chocolatey.org
@@ -94,6 +91,7 @@ getcomposer.org
 getzola.org
 git-scm.com
 gnu.org
 godbolt.org
 # PuTTY and some software official websites.
 greenend.org.uk
@@ -112,13 +110,11 @@ lua.org
 macports.org
 mariadb.org
 mingw.org
 # Mobatek official website.
 mobatek.net
 mpv.io
 mysql.com
 neovim.io
 newpipe.net
 nixos.org
 nodesource.com
 notepad-plus-plus.org
@@ -129,11 +125,8 @@ packagist.org
 pcre.org
 phantomjs.org
 php.net
 # PuTTY unofficial website, owned by Bitvise.
 putty.org
 postgresql.org
 putty.org
 r-project.org
 raspberrypi.org
 raspbian.org
@@ -145,15 +138,14 @@ shellcheck.net
 shields.io
 sqlite.org
 sublimetext.com
 # Termius official website.
 termius.com
 unpkg.com
 videojs.com
 videolan.org
 wapm.io
 wasmer.io
 webflow.com
 weblate.org
 wireshark.org
 x.org
 xposed.info
--- a/data/category-education-cn
+++ b/data/category-education-cn
@@ -83,6 +83,22 @@ dearedu.com
 dgjy.net
 # 在职研究生教育信息网
 eduei.com
 # 中公
 eoffcn.com
 jinrongren.net
 offcn.com
 zggqzp.com
 zgsydw.com
 # 高考100
 gk100.com
 # 华图
 huatu.com
 sydw8.com
 # 中科大数据研究院，豫ICP备19023555号
 ictbda.cn
 ictbda.com
 modex.com.cn
 xir.cn
 # 日语测试
 j-test.com
 nattest-china.com
--- a/data/category-entertainment
+++ b/data/category-entertainment
@@ -19,6 +19,7 @@ include:copymanga
 include:dailymotion
 include:dandanzan
 include:dazn
 include:deezer
 include:deviantart
 include:discoveryplus
 include:disney
--- a/data/category-entertainment-cn
+++ b/data/category-entertainment-cn
@@ -48,6 +48,8 @@ yeshen.com
 17k.com
 # https://github.com/supzhang/epg
 51zmt.top
 # 广东南方新媒体
 aisee.tv
 # 暴风影音
 baofeng.com
 baofeng.net
--- a/data/category-games-!cn
+++ b/data/category-games-!cn
@@ -33,6 +33,7 @@ include:steam
 include:steamunlocked
 include:supercell
 include:ubisoft
 include:vrchat
 include:wbgames
 include:xbox
 include:ynoproject
--- a/data/category-media-cn
+++ b/data/category-media-cn
@@ -96,6 +96,9 @@ iresearch.cn
 jianyuweb.com
 wallstcn.com
 wallstreetcn.com
 # 上观新闻/解放日报
 jfdaily.com
 shobserver.com
 # 机器之心
 jiqizhixin.com
 # 金融界
@@ -144,6 +147,8 @@ ql1d.com
 qingdaonews.com
 # 前瞻网
 qianzhan.com
 # 青岛之窗
 qingdaochina.org
 # 四川手机报
 scsjb.cn
 # 安全内参
@@ -154,6 +159,8 @@ sfccn.com
 shangyexinzhi.com
 # 奇客资讯网
 solidot.org
 # 南方新闻网
 southcn.com
 # 少数派
 sspai.com
 # 证券之星
--- a/data/category-orgs
+++ b/data/category-orgs
@@ -1,6 +1,5 @@
 # This list contains organizations outside China mainland.
 include:archive
 include:creativecommons
 include:csis
 include:emojipedia
--- a/data/category-ru
+++ b/data/category-ru
@@ -18,7 +18,7 @@ ru.net
 include:category-gov-ru
-include:habr
+include:avito
 include:mailru-group
 include:okko
 include:ozon
--- a/data/category-scholar-cn
+++ b/data/category-scholar-cn
@@ -11,7 +11,11 @@ ancientbooks.cn # 籍合网
 apabi.com
 bjinfobank.com # 高校数据财经库
-blyun.com # 百链
+
 # 北京百链网源信息技术有限公司
 blyun.com # 百链云图书馆
 medalink.cn # 百链学术搜索
 chinabooktrading.com # 中国历代典籍总目
 cidp.com.cn # CIDP制造业数字资源平台
 cnbksy.com # 全国报刊索引
--- a/data/category-web-archive
+++ b/data/category-web-archive
@@ -0,0 +1,10 @@
 include:4plebs
 include:archivetoday
 include:internet-archive
 eotarchive.org
 ghostarchive.org
 megalodon.jp
 mementoweb.org
 perma.cc
 webcitation.org
--- a/data/cctv
+++ b/data/cctv
@@ -1,22 +1,24 @@
 cctv.cn
 cctv.com
 cctvlib.cn
 cctvlib.com.cn
 cctvlibrary.cn
 cctvlibrary.com.cn
 cctvpic.com
 cctvpro.cn
 cctvpro.com.cn
 chinaepg.cn
 chinalive.com
 chinaott.com
 citv.net.cn
 cnms.net.cn
 cntv.cn
 cntv.com.cn
 cctvlib.cn
 cctvlibrary.cn
 cctvlib.com.cn
 cctvlibrary.com.cn
 cctvpro.cn
 cctvpro.com.cn
 cntvwb.cn
 gjgbdszt.cn
 gjgbdszt.com.cn
 gjgbdszt.net.cn
 icntvcdn.com
 ipanda.cn
 ipanda.com
 ipanda.com.cn
@@ -24,11 +26,12 @@ ipanda.net
 livechina.cn
 livechina.com
 olympicchannelchina.cn
 ottcn.com
 tvcc.cn
 tvcc.com.cn
 xn--fiq53l6wcx3kp9bc7joo6apn8a.cn # 中国广播电视总台.cn
 xn--fiq53l90et9fpncc7joo6apn8a.cn # 中央广播电视总台.cn
 xn--fiq53l6wcx3kp9bc7joo6apn8a.xn--fiqs8s # 中国广播电视总台.中国
 xn--fiq53l90et9fpncc7joo6apn8a.cn # 中央广播电视总台.cn
 xn--kprv4ewxfr9cpxcc7joo6apn8a.cn # 国家广播电视总台.cn
 xn--kprv4ewxfr9cpxcc7joo6apn8a.xn--fiqs8s # 国家广播电视总台.中国
 yangshipin.cn
--- a/data/chinamobile
+++ b/data/chinamobile
@@ -6,9 +6,11 @@ speedtest.hk.chinamobile.com @!cn
 speedtestbb.hk.chinamobile.com @!cn
 # Migu
-migucloud.com
+cmread.com
 migu.cn
 cmvideo.cn
 migu.cn
 migucloud.com
 migufun.com
 miguvideo.com
 # 中移互联
--- a/data/chinaunicom
+++ b/data/chinaunicom
@@ -6,6 +6,7 @@ xn--8y0a063a
 10010.com
 10010.com.cn
 10155.com
 114menhu.com
 169ol.com
 chinaunicom.cn
--- a/data/connectivity-check
+++ b/data/connectivity-check
@@ -1,11 +1,9 @@
 # ArchLinux
 ping.archlinux.org
 # Apple
 captive.apple.com
-# Android
+# Arch Linux
-connectivitycheck.gstatic.com
+full:ping.archlinux.org
 full:redirect.archlinux.org # Canonical Name of ping.archlinux.org
 # Cloudflare
 cp.cloudflare.com
@@ -16,6 +14,9 @@ network-test.debian.org
 # Firefox
 detectportal.firefox.com
 # Google
 connectivitycheck.gstatic.com
 # Honor
 full:connectivitycheck.platform.hihonorcloud.com
@@ -28,6 +29,9 @@ networkcheck.kde.org
 # MIUI
 full:connect.rom.miui.com
 # Ubuntu
 full:connectivity-check.ubuntu.com
 # Windows
 msftconnecttest.com
 msftncsi.com
--- a/data/deezer
+++ b/data/deezer
@@ -0,0 +1,2 @@
 deezer.com
 dzcdn.net
--- a/data/dmit
+++ b/data/dmit
@@ -0,0 +1,2 @@
 dmit.io
 dmit.sh
--- a/data/futu
+++ b/data/futu
@@ -1,12 +1,13 @@
 # 富途证券
-futuesop.com
+futuesop.com @cn
 futufin.com
 futuhk.com
 futuhkapp.com
 futuhn.com
 futuholdings.com
-futuniuniu.com
+futuniuniu.com @cn
-futunn.com
+futunn.com @cn
-futustatic.com
+futustatic.com @cn
 # 富途 moomoo 证券
 moomoo.com
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@@ -60,6 +60,7 @@ include:pagecdn
 include:quantil
 include:scaleflex
 include:stackpath
 include:vrcdn
 include:wistia
 # Certificate authorities
@@ -163,6 +164,7 @@ include:category-enhance-gaming
 include:category-mobile-repair
 include:category-ntp
 include:category-password-management
 include:category-web-archive
 include:decryptipastore # iOS
 include:rsshub
@@ -207,7 +209,6 @@ include:jwplayer
 include:kindle4rss
 include:kodi
 include:liberapay
 include:linguee
 include:localizejs
 include:madshi
 include:mapbox
@@ -246,7 +247,6 @@ include:trello
 include:tumblr
 include:tutanota
 include:vercel
 include:webflow
 include:wix
 include:wordpress
 include:zendesk
@@ -263,6 +263,13 @@ originlab.com
 cloudlatex.io
 overleaf.com
 # Translator & Dictionary
 include:linguee
 collinsdictionary.com
 ldoceonline.com
 immersivetranslate.com # 沉浸式翻译 (国际版)
 # Aurora Open Source Software (https://gitlab.com/AuroraOSS)
 auroraoss.com
@@ -284,6 +291,7 @@ include:demonoid
 include:nyaa
 include:piratebay
 include:rarbg
 dmhy.org
 # User scripts
 greasyfork.org
@@ -321,6 +329,3 @@ include:tsquare
 include:windy
 include:xdty
 include:xingrz
 # 沉浸式翻译
 immersivetranslate.com
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -48,6 +48,8 @@ hsqh.net
 lu.com
 lufax.com
 lufaxcdn.com
 ## 银豹收银系统
 pospal.cn
 # CDN or SDWAN
 include:aws-cn
@@ -87,6 +89,8 @@ yunaq.com
 ## 即刻雾联（北京）
 ## https://github.com/v2fly/domain-list-community/pull/1352#issuecomment-1345476790
 jikeiot.cloud
 ## JSDMirror前端公共资源站
 jsdmirror.com
 ## 开普云
 kaipuyun.cn
 kaipuyun.com
@@ -196,6 +200,8 @@ winos.me # WINOS 精简社区
 # Healthcare
 include:category-hospital-cn
 ## 安徽药品人才网
 ahfda.com
 ## 丁香园
 biomart.cn
 dxy.com
@@ -328,6 +334,8 @@ bblmw.com
 ## BOSS 直聘
 bosszhipin.com
 zhipin.com
 ## 天润融通 AI外呼 客服
 clink.cn
 ## 当贝
 dangbei.com
 dangbei.net
@@ -348,6 +356,8 @@ i8tq.com
 tq121.com.cn
 weather.com.cn
 weatherdt.com
 ## 沉浸式翻译 (中国版)
 immersivetranslate.cn
 ## 掌阅
 ireader.com
 zhangyue.com
@@ -392,6 +402,7 @@ include:dingdatech # 叮哒出行(杭州金通互联科技有限公司)
 include:dji
 include:gree
 include:haier
 include:hikvision
 include:honor
 include:huawei
 include:hupun # 杭州湖畔网络技术有限公司
@@ -420,12 +431,17 @@ include:zte
 51togic.com # 泰捷WEBOX
 avlyun.com # 安天移动安全
 dreame.tech # 追觅科技
 hisensehitachi.com # 海信日立官网
 insta360.com # 影石Insta360
 jamcz.com # 晨钟网络科技
 jmgo.com # 坚果投影
 mediastory.cc # 闪电分镜
 roborock.com # 石头科技
 socpk.com # 极客湾移动芯片排行
 suzuki-china.com # 铃木中国官网
 udesk.cn # 沃丰科技
 ysjf.com # 影视飓风
 # 稿定（厦门）信息服务有限公司
 ## 花瓣网 闽ICP备2021013850号
@@ -629,7 +645,6 @@ aiops.com
 aipai.com
 airchangan.com
 airguilin.com
 aisee.tv # 粤ICP备10217959号-12
 aiskycn.com
 aizhan.com
 aldwx.com # 京ICP备17030349号-1
@@ -925,7 +940,6 @@ houdao.com
 houyuantuan.com
 hteacher.net
 huashengdaili.com
 huatu.com
 huize.com
 hujia.org
 huochepiao.com
@@ -976,7 +990,6 @@ jiazhao.com
 jiemeng8.com
 jikexueyuan.com
 jinianbi.com
 jinrongren.net
 jinse.com
 jinti.com
 jisuxia.com
@@ -1119,7 +1132,6 @@ nxog.top # 湘ICP备2022006601号-1
 nzbdw.com
 oadz.com
 oeeee.com
 offcn.com
 officese.com
 oicq88.com
 okooo.com
@@ -1132,7 +1144,6 @@ onlinedown.net
 onlinesjtu.com
 onlylady.com
 opdown.com
 ottcn.com # 津ICP备12004891号-2
 oupeng.com
 p2peye.com
 p5w.net
@@ -1164,7 +1175,6 @@ qiaobutang.com
 qie.tv
 qifeiye.com
 qijiayoudao.net
 qingdaochina.org
 qingsongchou.com
 qiumibao.com
 qizuang.com
--- a/data/google-ads
+++ b/data/google-ads
@@ -7,11 +7,13 @@ adsense.com @ads
 adsensecustomsearchads.com @ads
 adsenseformobileapps.com @ads
 adservice.google.com @ads
 adtrafficquality.google @ads
 advertisercommunity.com @ads
 advertiserscommunity.com @ads
 adwords-community.com @ads
 adwords.com @ads
 adwordsexpress.com @ads
 analytics-alv.google.com @ads
 app-analytics-services.com @ads
 app-analytics-services-att.com @ads
 app-measurement-cn.com @ads
@@ -20,6 +22,7 @@ doubleclick-cn.net @ads
 doubleclick.cn @ads
 doubleclick.com @ads
 doubleclick.net @ads
 fcmatch.google.com @ads
 google-analytics-cn.com @ads
 google-analytics.com @ads
 googleadapis.com @ads
--- a/data/hetzner
+++ b/data/hetzner
@@ -1,4 +1,5 @@
 first-ns.de
 hetzner-cloud.de
 hetzner.cloud
 hetzner.com
 hetzner.company
--- a/data/hikvision
+++ b/data/hikvision
@@ -0,0 +1,11 @@
 # 海康威视
 hik-cloud.com
 hik-express.com
 hikiot.com
 hikmall.com
 hikvision.com
 # 萤石
 eziot.com
 ezviz.com
 ys7.com
--- a/data/internet-archive
+++ b/data/internet-archive
@@ -0,0 +1,3 @@
 archive-it.org
 archive.org
 openlibrary.org
--- a/data/litv
+++ b/data/litv
@@ -1,7 +1,13 @@
 # TGC Taiwan Inc.
 litv.tv
 litvfreepc.akamaized.net
 full:ntdfreemobile-tgc.cdn.hinet.net
 full:ntdfreepc-tgc.cdn.hinet.net
 full:ntdfreetv-tgc.cdn.hinet.net
 full:ntdfreevcpc-tgc.cdn.hinet.net
 ofiii.com
 full:ntdofifreemobile-tgc.cdn.hinet.net
 full:ntdofifreepc-tgc.cdn.hinet.net
 full:ntdofifreetv-tgc.cdn.hinet.net
 full:ntdofifreevcpc-tgc.cdn.hinet.net
--- a/data/tiktok
+++ b/data/tiktok
@@ -24,6 +24,11 @@ ttlivecdn.com @!cn
 ttoverseaus.net @!cn
 ttwstatic.com @!cn
 tiktokcdn-us.com.edgesuite.net @!cn
 tiktokcdn.com.akamaized.net @!cn
 tiktokcdn.com.edgesuite.net @!cn
 tiktokv.com.edgekey.net @!cn
 tiktokv.com.edgesuite.net @!cn
 full:p16-tiktokcdn-com.akamaized.net @!cn
 full:roovza-launches.appsflyersdk.com @!cn
 full:roovza.inapps.appsflyersdk.com @!cn
--- a/data/vrcdn
+++ b/data/vrcdn
@@ -0,0 +1,3 @@
 vrcdn.cloud
 vrcdn.live
 vrcdn.video
--- a/data/vrchat
+++ b/data/vrchat
@@ -0,0 +1,3 @@
 vrchat.cloud
 vrchat.com
 vrchat.net
--- a/data/webflow
+++ b/data/webflow
@@ -1 +0,0 @@
 webflow.com
--- a/data/xiaohongshu
+++ b/data/xiaohongshu
@@ -1,3 +1,6 @@
 include:askdiandian
 xhscdn.com
 xhscdn.net
 xhslink.com
 xiaohongshu.com
--- a/data/xiaomi-ads
+++ b/data/xiaomi-ads
@@ -6,8 +6,12 @@ ad1.xiaomi.com @ads
 admob.xiaomi.com @ads
 adv.sec.intl.miui.com @ads
 adv.sec.miui.com @ads
 data.mistat.india.xiaomi.com @ads
 data.mistat.intl.xiaomi.com @ads
 data.mistat.rus.xiaomi.com @ads
 data.mistat.xiaomi.com @ads
 logupdate.avlyun.sec.miui.com @ads
 misc.in.duokanbox.com @ads
 mistat.xiaomi.com @ads
 sentry.d.mi.com @ads
 sentry.d.xiaomi.net @ads
 tjqonline.cn @ads
--- a/data/zuoyebang
+++ b/data/zuoyebang
@@ -1,3 +1,5 @@
 include:zuoyebang-ads
 zuoyebang.cc
 zuoyebang.com
 zybang.com
--- a/data/zuoyebang-ads
+++ b/data/zuoyebang-ads
@@ -0,0 +1 @@
 syh.zybang.com @ads
--- a/main.go
+++ b/main.go
@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"regexp"
 	"sort"
 	"strconv"
 	"strings"
 	router "github.com/v2fly/v2ray-core/v5/app/router/routercommon"
@@ -30,6 +29,19 @@ const (
 	RuleTypeInclude    string = "include"
 )
 var (
 	TypeChecker  = regexp.MustCompile(`^(domain|full|keyword|regexp|include)$`)
 	ValueChecker = regexp.MustCompile(`^[a-z0-9!\.-]+$`)
 	AttrChecker  = regexp.MustCompile(`^[a-z0-9!-]+$`)
 )
 var (
 	refMap    = make(map[string]*List)
 	plMap     = make(map[string]*ParsedList)
 	finalMap  = make(map[string]*List)
 	cirIncMap = make(map[string]bool) // Used for circular inclusion detection
 )
 type Entry struct {
 	Type  string
 	Value string
@@ -41,15 +53,21 @@ type List struct {
 	Entry []Entry
 }
-type ParsedList struct {
+type Inclusion struct {
-	Name      string
+	Source      string
-	Inclusion map[string]bool
+	MustAttrs   []*router.Domain_Attribute
-	Entry     []Entry
+	BannedAttrs []*router.Domain_Attribute
 }
-func (l *ParsedList) toPlainText(listName string) error {
+type ParsedList struct {
 	Name       string
 	Inclusions []Inclusion
 	Entry      []Entry
 }
 func (entryList *List) toPlainText() error {
 	var entryBytes []byte
-	for _, entry := range l.Entry {
+	for _, entry := range entryList.Entry {
 		var attrString string
 		if entry.Attrs != nil {
 			for _, attr := range entry.Attrs {
@@ -60,13 +78,13 @@ func (l *ParsedList) toPlainText(listName string) error {
 		// Entry output format is: type:domain.tld:@attr1,@attr2
 		entryBytes = append(entryBytes, []byte(entry.Type+":"+entry.Value+attrString+"\n")...)
 	}
-	if err := os.WriteFile(filepath.Join(*outputDir, listName+".txt"), entryBytes, 0644); err != nil {
+	if err := os.WriteFile(filepath.Join(*outputDir, strings.ToLower(entryList.Name)+".txt"), entryBytes, 0644); err != nil {
 		return err
 	}
 	return nil
 }
-func (l *ParsedList) toProto() (*router.GeoSite, error) {
+func (l *List) toProto() (*router.GeoSite, error) {
 	site := &router.GeoSite{
 		CountryCode: l.Name,
 	}
@@ -80,11 +98,6 @@ func (l *ParsedList) toProto() (*router.GeoSite, error) {
 			})
 		case RuleTypeRegexp:
 			// check regexp validity to avoid runtime error
 			_, err := regexp.Compile(entry.Value)
 			if err != nil {
 				return nil, fmt.Errorf("invalid regexp in list %s: %s", l.Name, entry.Value)
 			}
 			site.Domain = append(site.Domain, &router.Domain{
 				Type:      router.Domain_Regex,
 				Value:     entry.Value,
@@ -104,100 +117,72 @@ func (l *ParsedList) toProto() (*router.GeoSite, error) {
 				Value:     entry.Value,
 				Attribute: entry.Attrs,
 			})
 		default:
 			return nil, fmt.Errorf("unknown domain type: %s", entry.Type)
 		}
 	}
 	return site, nil
 }
-func exportPlainTextList(list []string, refName string, pl *ParsedList) {
+func exportPlainTextList(exportFiles []string, entryList *List) {
-	for _, listName := range list {
+	for _, exportfilename := range exportFiles {
-		if strings.EqualFold(refName, listName) {
+		if strings.EqualFold(entryList.Name, exportfilename) {
-			if err := pl.toPlainText(strings.ToLower(refName)); err != nil {
+			if err := entryList.toPlainText(); err != nil {
-				fmt.Println("Failed:", err)
+				fmt.Println("Failed to exportPlainTextList:", err)
 				continue
 			}
-			fmt.Printf("'%s' has been generated successfully.\n", listName)
+			fmt.Printf("'%s' has been generated successfully.\n", exportfilename)
 		}
 	}
 }
-func removeComment(line string) string {
+func parseEntry(line string) (Entry, error) {
-	idx := strings.Index(line, "#")
+	var entry Entry
-	if idx == -1 {
+	parts := strings.Fields(line)
 		return line
 	}
 	return strings.TrimSpace(line[:idx])
 }
-func parseDomain(domain string, entry *Entry) error {
+	// Parse/Check type and value
-	kv := strings.Split(domain, ":")
+	rawTypeVal := parts[0]
 	kv := strings.Split(rawTypeVal, ":")
 	if len(kv) == 1 {
-		entry.Type = RuleTypeDomain
+		entry.Type = RuleTypeDomain // Default type
-		entry.Value = strings.ToLower(kv[0])
+		entry.Value = strings.ToLower(rawTypeVal)
-		return nil
+	} else if len(kv) == 2 {
 	}
 	if len(kv) == 2 {
 		entry.Type = strings.ToLower(kv[0])
-
+		if entry.Type == RuleTypeRegexp {
 		if strings.EqualFold(entry.Type, RuleTypeRegexp) {
 			entry.Value = kv[1]
 		} else {
 			entry.Value = strings.ToLower(kv[1])
 		}
 		return nil
 	}
 	return fmt.Errorf("invalid format: %s", domain)
 }
 func parseAttribute(attr string) (*router.Domain_Attribute, error) {
 	var attribute router.Domain_Attribute
 	if len(attr) == 0 || attr[0] != '@' {
 		return &attribute, fmt.Errorf("invalid attribute: %s", attr)
 	}
 	// Trim attribute prefix `@` character
 	attr = attr[1:]
 	parts := strings.Split(attr, "=")
 	if len(parts) == 1 {
 		attribute.Key = strings.ToLower(parts[0])
 		attribute.TypedValue = &router.Domain_Attribute_BoolValue{BoolValue: true}
 	} else {
-		attribute.Key = strings.ToLower(parts[0])
+		return entry, fmt.Errorf("invalid format: %s", line)
-		intv, err := strconv.Atoi(parts[1])
+	}
-		if err != nil {
+	if !TypeChecker.MatchString(entry.Type) {
-			return &attribute, fmt.Errorf("invalid attribute: %s: %v", attr, err)
+		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)
 		}
-		attribute.TypedValue = &router.Domain_Attribute_IntValue{IntValue: int64(intv)}
+	} else if !ValueChecker.MatchString(entry.Value) {
-	}
+		return entry, fmt.Errorf("invalid value: %s", entry.Value)
 	return &attribute, nil
 }
 func parseEntry(line string) (Entry, error) {
 	line = strings.TrimSpace(line)
 	parts := strings.Split(line, " ")
 	var entry Entry
 	if len(parts) == 0 {
 		return entry, fmt.Errorf("empty entry")
 	}
-	if err := parseDomain(parts[0], &entry); err != nil {
+	// Parse/Check attributes
-		return entry, err
+	for _, part := range parts[1:] {
-	}
+		if !strings.HasPrefix(part, "@") {
-
+			return entry, fmt.Errorf("invalid attribute: %s", part)
 	for i := 1; i < len(parts); i++ {
 		attr, err := parseAttribute(parts[i])
 		if err != nil {
 			return entry, err
 		}
-		entry.Attrs = append(entry.Attrs, attr)
+		attrKey := strings.ToLower(part[1:]) // Trim attribute prefix `@` character
 		if !AttrChecker.MatchString(attrKey) {
 			return entry, fmt.Errorf("invalid attribute key: %s", attrKey)
 		}
 		entry.Attrs = append(entry.Attrs, &router.Domain_Attribute{
 			Key:        attrKey,
 			TypedValue: &router.Domain_Attribute_BoolValue{BoolValue: true},
 		})
 	}
 	// Sort attributes
 	sort.Slice(entry.Attrs, func(i, j int) bool {
 		return entry.Attrs[i].Key < entry.Attrs[j].Key
 	})
 	return entry, nil
 }
@@ -214,9 +199,13 @@ func Load(path string) (*List, error) {
 	}
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
+		line := scanner.Text()
-		line = removeComment(line)
+		// Remove comments
-		if len(line) == 0 {
+		if idx := strings.Index(line, "#"); idx != -1 {
 			line = line[:idx]
 		}
 		line = strings.TrimSpace(line)
 		if line == "" {
 			continue
 		}
 		entry, err := parseEntry(line)
@@ -229,108 +218,77 @@ func Load(path string) (*List, error) {
 	return list, nil
 }
-func isMatchAttr(Attrs []*router.Domain_Attribute, includeKey string) bool {
+func ParseList(refList *List) (*ParsedList, error) {
-	isMatch := false
+	pl := &ParsedList{Name: refList.Name}
-	mustMatch := true
+	for _, entry := range refList.Entry {
-	matchName := includeKey
+		if entry.Type == RuleTypeInclude {
-	if strings.HasPrefix(includeKey, "!") {
+			inc := Inclusion{Source: strings.ToUpper(entry.Value)}
-		isMatch = true
+			for _, attr := range entry.Attrs {
-		mustMatch = false
+				if strings.HasPrefix(attr.Key, "-") {
-		matchName = strings.TrimLeft(includeKey, "!")
+					inc.BannedAttrs = append(inc.BannedAttrs, &router.Domain_Attribute{
-	}
+						Key:        attr.Key[1:], // Trim attribute prefix `-` character
-
+						TypedValue: &router.Domain_Attribute_BoolValue{BoolValue: true},
-	for _, Attr := range Attrs {
+					})
 		attrName := Attr.Key
 		if mustMatch {
 			if matchName == attrName {
 				isMatch = true
 				break
 			}
 		} else {
 			if matchName == attrName {
 				isMatch = false
 				break
 			}
 		}
 	}
 	return isMatch
 }
 func createIncludeAttrEntrys(list *List, matchAttr *router.Domain_Attribute) []Entry {
 	newEntryList := make([]Entry, 0, len(list.Entry))
 	matchName := matchAttr.Key
 	for _, entry := range list.Entry {
 		matched := isMatchAttr(entry.Attrs, matchName)
 		if matched {
 			newEntryList = append(newEntryList, entry)
 		}
 	}
 	return newEntryList
 }
 func ParseList(list *List, ref map[string]*List) (*ParsedList, error) {
 	pl := &ParsedList{
 		Name:      list.Name,
 		Inclusion: make(map[string]bool),
 	}
 	entryList := list.Entry
 	for {
 		newEntryList := make([]Entry, 0, len(entryList))
 		hasInclude := false
 		for _, entry := range entryList {
 			if entry.Type == RuleTypeInclude {
 				refName := strings.ToUpper(entry.Value)
 				if entry.Attrs != nil {
 					for _, attr := range entry.Attrs {
 						InclusionName := strings.ToUpper(refName + "@" + attr.Key)
 						if pl.Inclusion[InclusionName] {
 							continue
 						}
 						pl.Inclusion[InclusionName] = true
 						refList := ref[refName]
 						if refList == nil {
 							return nil, fmt.Errorf("list not found: %s", entry.Value)
 						}
 						attrEntrys := createIncludeAttrEntrys(refList, attr)
 						if len(attrEntrys) != 0 {
 							newEntryList = append(newEntryList, attrEntrys...)
 						}
 					}
 				} else {
-					InclusionName := refName
+					inc.MustAttrs = append(inc.MustAttrs, attr)
 					if pl.Inclusion[InclusionName] {
 						continue
 					}
 					pl.Inclusion[InclusionName] = true
 					refList := ref[refName]
 					if refList == nil {
 						return nil, fmt.Errorf("list not found: %s", entry.Value)
 					}
 					newEntryList = append(newEntryList, refList.Entry...)
 				}
 				hasInclude = true
 			} else {
 				newEntryList = append(newEntryList, entry)
 			}
-		}
+			pl.Inclusions = append(pl.Inclusions, inc)
-		entryList = newEntryList
+		} else {
-		if !hasInclude {
+			pl.Entry = append(pl.Entry, entry)
 			break
 		}
 	}
 	pl.Entry = entryList
 	return pl, nil
 }
 func isMatchAttrFilters(entry Entry, incFilter Inclusion) bool {
 	attrMap := make(map[string]bool)
 	for _, attr := range entry.Attrs {
 		attrMap[attr.Key] = true
 	}
 	for _, m := range incFilter.MustAttrs {
 		if !attrMap[m.Key] { return false }
 	}
 	for _, b := range incFilter.BannedAttrs {
 		if attrMap[b.Key] { return false }
 	}
 	return true
 }
 func ResolveList(pl *ParsedList) error {
 	//TODO: deduplicate
 	if _, pldone := finalMap[pl.Name]; pldone { return nil }
 	if cirIncMap[pl.Name] {
 		return fmt.Errorf("circular inclusion in: %s", pl.Name)
 	}
 	cirIncMap[pl.Name] = true
 	defer delete(cirIncMap, pl.Name)
 	finalList := &List{Name: pl.Name}
 	finalList.Entry = append(finalList.Entry, pl.Entry...)
 	for _, inc := range pl.Inclusions {
 		if err := ResolveList(plMap[inc.Source]); err != nil {
 			return err
 		}
 		for _, entry := range finalMap[inc.Source].Entry {
 			if isMatchAttrFilters(entry, inc) {
 				finalList.Entry = append(finalList.Entry, entry)
 			}
 		}
 	}
 	finalMap[pl.Name] = finalList
 	return nil
 }
 func main() {
 	flag.Parse()
 	dir := *dataPath
 	fmt.Println("Use domain lists in", dir)
-	ref := make(map[string]*List)
+	// Generate refMap
 	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -342,7 +300,7 @@ func main() {
 		if err != nil {
 			return err
 		}
-		ref[list.Name] = list
+		refMap[list.Name] = list
 		return nil
 	})
 	if err != nil {
@@ -350,6 +308,24 @@ func main() {
 		os.Exit(1)
 	}
 	// Generate plMap
 	for refName, refList := range refMap {
 		pl, err := ParseList(refList)
 		if err != nil {
 			fmt.Println("Failed to ParseList:", err)
 			os.Exit(1)
 		}
 		plMap[refName] = pl
 	}
 	// Generate finalMap
 	for _, pl := range plMap {
 		if err := ResolveList(pl); err != nil {
 			fmt.Println("Failed to ResolveList:", err)
 			os.Exit(1)
 		}
 	}
 	// Create output directory if not exist
 	if _, err := os.Stat(*outputDir); os.IsNotExist(err) {
 		if mkErr := os.MkdirAll(*outputDir, 0755); mkErr != nil {
@@ -360,13 +336,8 @@ func main() {
 	protoList := new(router.GeoSiteList)
 	var existList []string
-	for refName, list := range ref {
+	for _, siteEntries := range finalMap {
-		pl, err := ParseList(list, ref)
+		site, err := siteEntries.toProto()
 		if err != nil {
 			fmt.Println("Failed:", err)
 			os.Exit(1)
 		}
 		site, err := pl.toProto()
 		if err != nil {
 			fmt.Println("Failed:", err)
 			os.Exit(1)
@@ -376,7 +347,7 @@ func main() {
 		// Flatten and export plaintext list
 		if *exportLists != "" {
 			if existList != nil {
-				exportPlainTextList(existList, refName, pl)
+				exportPlainTextList(existList, siteEntries)
 			} else {
 				exportedListSlice := strings.Split(*exportLists, ",")
 				for _, exportedListName := range exportedListSlice {
@@ -389,7 +360,7 @@ func main() {
 					}
 				}
 				if existList != nil {
-					exportPlainTextList(existList, refName, pl)
+					exportPlainTextList(existList, siteEntries)
 				}
 			}
 		}
@@ -402,11 +373,11 @@ func main() {
 	protoBytes, err := proto.Marshal(protoList)
 	if err != nil {
-		fmt.Println("Failed:", err)
+		fmt.Println("Failed to Marshal:", err)
 		os.Exit(1)
 	}
 	if err := os.WriteFile(filepath.Join(*outputDir, *outputName), protoBytes, 0644); err != nil {
-		fmt.Println("Failed:", err)
+		fmt.Println("Failed to write output:", err)
 		os.Exit(1)
 	} else {
 		fmt.Println(*outputName, "has been generated successfully.")
Author	SHA1	Message	Date
MkQtS	9d73db400e	Feat: add support for partial include	2025-12-31 21:42:35 +08:00
MkQtS	c83bb86d06	Refactor: promote refMap	2025-12-31 20:30:16 +08:00
MkQtS	58f79fa579	Remove support for partial include This reverts `e640ac2783` It is problematic and I will implement a new one	2025-12-31 20:29:54 +08:00
MkQtS	969e6baad8	Refactor exportPlainTextList - remove unnecessary variable - improve readablity	2025-12-31 20:25:58 +08:00
MkQtS	bbd5b64219	Refactor parseEntry - add value/attribute checker(check missing space) - allow multiple spaces - sort attributes - improve readablity	2025-12-31 20:24:51 +08:00
MkQtS	6b10d69246	Refactor: reduce the use of strings.TrimSpace	2025-12-31 20:14:14 +08:00
bafometik	fd4895c71e	Update google-ads (#3115 )	2025-12-31 11:59:52 +08:00
jinqiang zhang	f105486f25	hetzner: add hetzner-cloud.de (#3114 )	2025-12-30 17:26:25 +08:00
MkQtS	75f8ac0b8a	chinaunicom: add 10155.com (#3113 )	2025-12-29 20:58:28 +08:00
深鸣	12711270a8	connectivity-check: add redirect.archlinux.org (#3112 )	2025-12-29 00:26:26 +08:00
深鸣	6ab293c1dc	geolocation-!cn: add dmhy.org (#3111 )	2025-12-28 18:17:21 +08:00
深鸣	f050db51f0	archlinux: add archlinuxcn.org (#3110 )	2025-12-28 18:15:13 +08:00
深鸣	645014d31e	category-dev: add godbolt.org (#3109 )	2025-12-28 18:12:18 +08:00
TripleA	4b1cef4329	connectivity-check: add connectivity-check.ubuntu.com (#3108 ) and sort	2025-12-27 21:57:59 +08:00
MkQtS	234cc35db2	Add more cn domains (#3107 ) * cctv: add more domains * chinamobile: add more domains * add hikvision * category-education-cn: add more domains * category-entertainment-cn: add aisee.tv * category-media-cn: add more domains * geolocation-cn: add more domains	2025-12-26 20:06:02 +08:00
a052	9b1f374455	futu: add `@cn` attribute for some domains (#3105 ) and add futuhkapp.com	2025-12-23 18:32:15 +08:00
MkQtS	e526975cd9	Add more !cn domains (#3104 ) * category-dev: merge webflow * category-dev: add more domains * geolocation-!cn: add more domains translator/dictionary	2025-12-23 15:16:30 +08:00
MkQtS	f7aba5f55e	Add more cn domains (#3103 ) * category-education-cn: add gk100.com * category-media-cn: add more domains * geolocation-cn: add jsdmirror.com	2025-12-23 14:39:29 +08:00
bafometik	edffb486d1	tiktok: add more domains (#3102 )	2025-12-23 14:39:15 +08:00
Роман	1f80a8e387	add vrchat and vrcdn (#3096 )	2025-12-22 08:38:20 +08:00
sklimoff	9249e915a6	Add avito.ru and static-files domain (#3095 ) Co-authored-by: sklimoff <klimoff.s@gmail.com>	2025-12-21 06:57:36 +08:00
深鸣	fefa540df1	category-web-archive: add new entry (#3092 ) Co-authored-by: MkQtS <81752398+MkQtS@users.noreply.github.com>	2025-12-21 00:46:09 +08:00
深鸣	5aad950410	category-education-cn: add ictbda-domains (#3089 )	2025-12-20 23:54:59 +08:00
深鸣	42dc9593dd	xiaomi-ads: add more domains (#3093 ) Co-authored-by: MkQtS <81752398+MkQtS@users.noreply.github.com>	2025-12-20 23:53:08 +08:00
深鸣	9807b5b0a9	category-scholar-cn: add medalink.cn (#3091 )	2025-12-20 23:41:14 +08:00
深鸣	920ea4a055	dmit: add new entry (#3090 )	2025-12-20 23:32:06 +08:00
hzhex	9f6800b6b2	Remove 'habr' from category-ru (#3087 ) Removed 'include:habr' from the category-ru file. Reasons: 1) habr.com isn't affiliated with Russia directly (even though the habr.com IS hosted in Russia, it's cdn domain - habrastorage.org is hosted in Estonia) 2) the site itself contains a lot of geoblocked articles which can't be accessed without a foreign proxy - so it being in category-ru can lead to routing mishaps in cases such as routing category-ru sites to DIRECT on the client	2025-12-20 20:18:34 +08:00
Loyalsoldier	d014f46c20	Fix: limit workflow concurrency to avoid potential overlap releases (#3088 ) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-12-20 20:14:05 +08:00
チセ	6f3acc3ba9	Chore: remove unused key-value attribute feature (#3076 ) Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>	2025-12-20 19:38:46 +08:00
MkQtS	24c2f80f91	add deezer (#3085 )	2025-12-20 18:51:41 +08:00
1054009064	c9cdb42bf0	update xiaohongshu (#3084 )	2025-12-20 18:35:44 +08:00
Zeehan2005	425c41c171	geolocation-cn: add immersivetranslate.cn (#3083 )	2025-12-20 18:27:54 +08:00
RiverMud	7ab6c29b3c	geolocation-cn: add ahfda.com (#3081 )	2025-12-20 18:25:24 +08:00
NNdroid	c8cd35ba7d	Update litv (#3080 )	2025-12-19 22:01:51 +08:00
深鸣	6ff83936c8	geolocation-cn: add pospal.cn (#3078 )	2025-12-19 16:56:50 +08:00
深鸣	29b004bf5d	zuoyebang-ads: add syh.zybang.com (#3077 )	2025-12-19 16:56:02 +08:00