Add domains to category-ru, netease, hdrezka, kodik, windsurf and yandex (#3238 )

* add Aviasales * add hdrezka * add kodik * add windsurf * yandex: add yandex-pogoda.static-storage.net * netease: add easebar.com
category-media-cn: add jin10 & tonghuashun domains (#3255 )
2026-03-05 11:10:41 +07:00 · 2026-02-07 23:45:47 +08:00 · 2026-02-07 13:48:19 +08:00 · 2026-02-06 23:25:57 +08:00 · 2026-02-06 21:45:21 +08:00 · 2026-02-06 18:35:19 +08:00
51 changed files with 291 additions and 178 deletions
--- a/cmd/datdump/main.go
+++ b/cmd/datdump/main.go
@@ -31,11 +31,21 @@ type DomainList struct {
 }
 func (d *DomainRule) domain2String() string {
-	dstring := d.Type + ":" + d.Value
+	var dstr strings.Builder
-	if len(d.Attrs) != 0 {
+	dstr.Grow(len(d.Type) + len(d.Value) + 10)
-		dstring += ":@" + strings.Join(d.Attrs, ",@")
+	dstr.WriteString(d.Type)
 	dstr.WriteByte(':')
 	dstr.WriteString(d.Value)
 	for i, attr := range d.Attrs {
 		if i == 0 {
 			dstr.WriteByte(':')
 		} else {
 			dstr.WriteByte(',')
 		}
 		dstr.WriteByte('@')
 		dstr.WriteString(attr)
 	}
-	return dstring
+	return dstr.String()
 }
 func loadGeosite(path string) ([]DomainList, map[string]*DomainList, error) {
@@ -82,10 +92,10 @@ func loadGeosite(path string) ([]DomainList, map[string]*DomainList, error) {
 func exportSite(name string, domainListByName map[string]*DomainList) error {
 	domainList, ok := domainListByName[strings.ToUpper(name)]
 	if !ok {
-		return fmt.Errorf("list '%s' does not exist", name)
+		return fmt.Errorf("list %q does not exist", name)
 	}
 	if len(domainList.Rules) == 0 {
-		return fmt.Errorf("list '%s' is empty", name)
+		return fmt.Errorf("list %q is empty", name)
 	}
 	file, err := os.Create(filepath.Join(*outputDir, name+".yml"))
 	if err != nil {
@@ -119,22 +129,16 @@ func exportAll(filename string, domainLists []DomainList) error {
 	return w.Flush()
 }
-func main() {
+func run() error {
-	flag.Parse()
+	// Make sure output directory exists
-
+	if err := os.MkdirAll(*outputDir, 0755); err != nil {
-	// Create output directory if not exist
+		return fmt.Errorf("failed to create output directory: %w", err)
 	if _, err := os.Stat(*outputDir); os.IsNotExist(err) {
 		if mkErr := os.MkdirAll(*outputDir, 0755); mkErr != nil {
 			fmt.Println("Failed to create output directory:", mkErr)
 			os.Exit(1)
 		}
 	}
-	fmt.Printf("Loading %s...\n", *inputData)
+	fmt.Printf("loading source data %q...\n", *inputData)
 	domainLists, domainListByName, err := loadGeosite(*inputData)
 	if err != nil {
-		fmt.Println("Failed to loadGeosite:", err)
+		return fmt.Errorf("failed to loadGeosite: %w", err)
 		os.Exit(1)
 	}
 	var exportListSlice []string
@@ -150,15 +154,24 @@ func main() {
 	for _, eplistname := range exportListSlice {
 		if strings.EqualFold(eplistname, "_all_") {
 			if err := exportAll(filepath.Base(*inputData)+"_plain.yml", domainLists); err != nil {
-				fmt.Println("Failed to exportAll:", err)
+				fmt.Printf("failed to exportAll: %v\n", err)
 				continue
 			}
 		} else {
 			if err := exportSite(eplistname, domainListByName); err != nil {
-				fmt.Println("Failed to exportSite:", err)
+				fmt.Printf("failed to exportSite: %v\n", err)
 				continue
 			}
 		}
-		fmt.Printf("list: '%s' has been exported successfully.\n", eplistname)
+		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)
 	}
 }
--- a/data/adjust-ads
+++ b/data/adjust-ads
@@ -1,4 +1,4 @@
 adjust.com @ads
 adjust.net.in @ads
 adjust.io @ads
 adjust.net.in @ads
 adjust.world @ads
--- a/data/aviasales
+++ b/data/aviasales
@@ -0,0 +1,3 @@
 avs.io
 aviasales.ru
 aviasales.com
--- a/data/binance
+++ b/data/binance
@@ -31,6 +31,7 @@ binanceapi.com
 binanceru.net
 bnbstatic.com
 bntrace.com
 bsappapi.com
 nftstatic.com
 # saas
--- a/data/category-ads
+++ b/data/category-ads
@@ -1,7 +1,6 @@
 # This file contains domains that clearly serving ads
 include:acfun-ads
 include:adjust-ads
 include:adobe-ads
 include:alibaba-ads
 include:amazon-ads
@@ -10,7 +9,6 @@ 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
@@ -26,28 +24,24 @@ include:letv-ads
 include:meta-ads
 include:microsoft-ads
 include:netease-ads
 include:ogury-ads
 include:ookla-speedtest-ads
 include:openai @ads
 include:openx-ads
 include:picacg @ads
 include:pikpak @ads
 include:pixiv @ads
 include:pubmatic-ads
 include:qihoo360-ads
 include:samsung @ads
 include:segment-ads
 include:sina-ads
 include:snap @ads
 include:sohu-ads
 include:spotify-ads
 include:supersonic-ads
 include:television-ads
 include:tencent-ads
 include:tendcloud @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
@@ -70,7 +64,6 @@ adservice.sigmob.cn
 adtechus.com
 adtrue.com
 adxprtz.com
 assets.growingio.com
 cdn.advertserve.com
 cdn.banclip.com
 cfts1tifqr.com
--- a/data/category-ads-all
+++ b/data/category-ads-all
@@ -1,6 +1,14 @@
 # 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:growingio
 include:ogury
 include:openx
 include:pubmatic
 include:segment
 include:supersonic
 include:taboola
 1rx.io @ads
@@ -21,7 +29,6 @@ lijit.com @ads
 mfadsrvr.com @ads
 mgid.com @ads
 ns1p.net @ads
 pubmatic.com @ads
 sigmob.com @ads
 spotxchange.com @ads
 unimhk.com @ads
--- a/data/category-ai-!cn
+++ b/data/category-ai-!cn
@@ -4,13 +4,16 @@ include:cerebras
 include:comfy
 include:cursor
 include:elevenlabs
 include:github-copilot
 include:google-deepmind
 include:groq
 include:huggingface
 include:liveperson
 include:manus
 include:openai
 include:perplexity
 include:poe
 include:windsurf
 include:xai
 include:youmind
--- a/data/category-cdn-cn
+++ b/data/category-cdn-cn
@@ -6,12 +6,14 @@ include:qiniu
 include:upai
 include:wangsu
-## 创世云
+# 创世云
 chuangcache.com
 chuangcdn.com
-## FUNCDN
+# 大风云CDN
 dfyun.com.cn
 # FUNCDN
 funcdn.com
-## 北京知道创宇信息技术股份有限公司
+# 北京知道创宇信息技术股份有限公司
 jiashule.com
 jiasule.com
 yunaq.com
--- a/data/category-collaborate-cn
+++ b/data/category-collaborate-cn
@@ -4,6 +4,8 @@
 asklink.com
 ## EasyTier
 easytier.cn
 ## 飞衡HTTP
 feihengip.com
 ## Oray
 oray.com
 oray.net
--- a/data/category-companies
+++ b/data/category-companies
@@ -48,6 +48,7 @@ include:kakao
 include:kaspersky
 include:lg
 include:logitech
 include:louisvuitton
 include:mailru-group
 include:meta
 include:microsoft
--- a/data/category-dev-cn
+++ b/data/category-dev-cn
@@ -18,7 +18,9 @@ include:segmentfault
 include:sxl
 include:tencent-dev
 include:ubuntukylin
 include:unitychina
 aardio.com
 jinrishici.com
 openvela.com
 tipdm.org
--- a/data/category-education-cn
+++ b/data/category-education-cn
@@ -71,6 +71,8 @@ baicizhan.com
 baicizhan.org
 bczcdn.com
 bczeducation.cn
 # 毕业之家科研服务平台
 biyehome.net
 # Burning Vocabulary
 burningvocabulary.cn
 burningvocabulary.com
@@ -142,3 +144,5 @@ ystbds.com
 zhan.com
 # 智慧树
 zhihuishu.com
 # 浙江省教育考试院
 zjzs.net
--- a/data/category-enterprise-query-platform-cn
+++ b/data/category-enterprise-query-platform-cn
@@ -6,3 +6,7 @@ include:tianyancha
 qichamao.com
 qyyjt.cn
 x315.com
 # 信查查
 xcc.cn
 xinchacha.com
--- a/data/category-entertainment
+++ b/data/category-entertainment
@@ -54,6 +54,7 @@ include:pixiv
 include:plutotv
 include:pocketcasts
 include:primevideo
 include:radiko
 include:roku
 include:showtimeanytime
 include:sling
--- a/data/category-entertainment-cn
+++ b/data/category-entertainment-cn
@@ -50,6 +50,8 @@ yeshen.com
 51zmt.top
 # 广东南方新媒体
 aisee.tv
 # 动画巡礼
 anitabi.cn
 # 暴风影音
 baofeng.com
 baofeng.net
--- a/data/category-media-cn
+++ b/data/category-media-cn
@@ -78,6 +78,15 @@ freebuf.com
 geekpark.net
 # 光明网
 gmw.com
 # 硅谷网
 guigu.org
 # 同花顺
 0033.cn
 10jqka.com.cn
 hexin.cn
 hexin.com.cn
 ths123.com
 thsi.cn
 # 和讯
 hexun.com
 # 河南广播电视台/大象网
@@ -100,6 +109,8 @@ iresearch.cn
 jianyuweb.com
 wallstcn.com
 wallstreetcn.com
 # 金十数据
 jin10.com
 # 上观新闻/解放日报
 jfdaily.com
 shobserver.com
@@ -134,6 +145,9 @@ xinhuanet.com
 xinhuaxmt.com
 # 维科网
 ofweek.com
 # PChome电脑之家
 pchome.net
 pchpic.net
 # PConline 太平洋科技
 3conline.com
 pconline.com.cn
@@ -184,10 +198,6 @@ techweb.com.cn
 thecover.cn
 # 澎湃新闻
 thepaper.cn
 # 同花顺
 10jqka.com.cn
 thsi.cn
 ths123.com
 # 人人都是产品经理
 woshipm.com
 # 新快报
--- a/data/category-ru
+++ b/data/category-ru
@@ -22,6 +22,7 @@ include:category-gov-ru
 include:category-retail-ru
 # Public transportation
 include:aviasales
 include:mosmetro
 include:avito
--- a/data/category-social-media-cn
+++ b/data/category-social-media-cn
@@ -18,6 +18,9 @@ tieba.com
 dandan818.com
 dandanvoice.com
 # 饭否
 fanfou.com
 # 脉脉
 maimai.cn
 taou.com
--- a/data/category-wiki-cn
+++ b/data/category-wiki-cn
@@ -4,6 +4,9 @@ mbalib.com
 sec-wiki.com
 shidianbaike.com
 # 叉子周 手机博物馆
 chaz.fun
 # huijiwiki
 huijistatic.com
 huijiwiki.com
--- a/data/clearbit-ads
+++ b/data/clearbit-ads
--- a/data/cloudflare
+++ b/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
--- a/data/dji
+++ b/data/dji
@@ -2,6 +2,7 @@ dji.com
 dji.ink
 dji.net
 djicdn.com
 djigate.com
 djiits.com
 djiops.com
 djiservice.org
--- a/data/douyu
+++ b/data/douyu
@@ -4,3 +4,4 @@ douyucdn.cn
 douyucdn2.cn
 douyuscdn.com
 douyutv.com
 edgesrv.com
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@@ -271,6 +271,8 @@ ldoceonline.com
 immersivetranslate.com # 沉浸式翻译 (国际版)
 ## OriginLab (Graphing for Science and Engineering)
 originlab.com
 ## OsmAnd
 osmand.net
 # Software development
 include:category-dev
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -23,8 +23,8 @@ include:category-social-media-cn
 # Advertisment & Analytics
 include:getui
 include:growingio
 include:jiguang
 include:umeng
 # 神策数据
 sensorsdata.cn
@@ -164,6 +164,7 @@ ezpro.pro # 小马路由
 itpub.net # ITPUB技术论坛
 itsk.com # IT天空论坛
 jandan.net # 煎蛋
 jisilu.cn # 集思录
 kafan.cn # 卡饭论坛
 kanxue.com # 看雪
 kdslife.com # 宽带山
@@ -434,7 +435,7 @@ include:lenovo
 include:meizu
 include:midea
 include:narwal # 云鲸科技
-include:netease
+include:netease @-!cn
 include:oppo @-!cn
 include:qihoo360
 include:sumkoo #北京尚古创新科技有限公司
@@ -664,7 +665,6 @@ ycrx360.com
 9ht.com
 9xu.com
 a9vg.com
 aardio.com # 皖ICP备09012014号
 acetaffy.club # 粤ICP备2022042304号
 adxvip.com
 afzhan.com
@@ -720,7 +720,6 @@ bio-equip.com
 biodiscover.com
 bishijie.com
 bitecoin.com
 biyehome.net
 bjcathay.com
 bobo.com
 bojianger.com
@@ -744,7 +743,6 @@ chachaba.com
 changba.com
 chaojituzi.net
 chashebao.com
 chaz.fun # 粤ICP备2022001828号-2
 chazhengla.com
 chazidian.com
 che168.com
@@ -880,7 +878,6 @@ fanli.com
 fangxiaoer.com
 fanxian.com
 fastapi.net
 feihengip.com # 粤ICP备2023115330号-1
 feihuo.com
 feiniaomy.com
 fengniao.com
@@ -904,7 +901,6 @@ gdrc.com
 geektool.top # 极客Tool 蜀ICP备2024086015号-2
 gezida.com
 gfan.com
 giocdn.com
 globrand.com
 gm86.com
 gmz88.com
@@ -915,7 +911,6 @@ gongxiangcj.com
 goosail.com
 goufw.com
 greenxiazai.com
 growingio.com
 gtags.net
 guabu.com
 guaiguai.com
@@ -923,7 +918,6 @@ guanaitong.com
 guanhaobio.com
 guanyierp.com # 沪ICP备14043335号-8
 gucheng.com
 guigu.org
 guoxinmac.com
 gupzs.com
 gushiwen.org
@@ -1179,7 +1173,6 @@ p5w.net
 paipaibang.com
 paopaoche.net
 pc6.com
 pchome.net
 pcpop.com
 peccn.com
 pgzs.com
--- a/data/github
+++ b/data/github
@@ -1,4 +1,5 @@
 include:github-ads
 include:github-copilot
 include:npmjs
 atom.io
@@ -14,7 +15,6 @@ github.dev
 github.io
 githubapp.com
 githubassets.com
 githubcopilot.com
 githubhackathon.com
 githubnext.com
 githubpreview.dev
--- a/data/github-copilot
+++ b/data/github-copilot
@@ -0,0 +1 @@
 githubcopilot.com
--- a/data/growingio
+++ b/data/growingio
@@ -0,0 +1,7 @@
 # 北京易数科技
 datayi.cn
 gio.ren
 giocdn.com
 growin.cn
 growingio.cn
 growingio.com
--- a/data/hdrezka
+++ b/data/hdrezka
@@ -0,0 +1,12 @@
 hdrezka-home.tv
 hdrezka.ac
 hdrezka.ag
 hdrezka.cm
 hdrezka.co
 hdrezka.me
 hdrezka.org
 hdrezka.site
 rezka.ag
 # hdrezka video CDN servers
 stream.voidboost.cc
--- a/data/kinopub
+++ b/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$
--- a/data/kodik
+++ b/data/kodik
@@ -0,0 +1,4 @@
 kodik-storage.com
 kodik.biz
 kodik.cc
 kodik.info
--- a/data/louisvuitton
+++ b/data/louisvuitton
@@ -0,0 +1,5 @@
 louisvuitton.cn @cn
 louisvuitton.com
 lvcampaign.com @cn
 full:tp.louisvuitton.com @cn
--- a/data/manus
+++ b/data/manus
@@ -0,0 +1,2 @@
 manus.im
 manuscdn.com
--- a/data/microsoft-dev
+++ b/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
--- a/data/netease
+++ b/data/netease
@@ -16,6 +16,7 @@ include:netease-ads
 166.net
 188.com
 321fenx.com
 easebar.com @!cn
 haowu.link
 icourse163.org
 lf126.net
--- a/data/ogury-ads
+++ b/data/ogury-ads
@@ -1,3 +1,3 @@
 ogury.co @ads
 ogury.com @ads
 presage.io @ads
 ogury.co @ads
--- a/data/openx-ads
+++ b/data/openx-ads
--- a/data/projectsekai
+++ b/data/projectsekai
@@ -1 +1,2 @@
 sekai.colorfulpalette.org
 pjsekai.sega.jp
--- a/data/pubmatic
+++ b/data/pubmatic
@@ -2,5 +2,3 @@
 pubmatic.com
 pubmatic.co.jp
 include:pubmatic-ads
--- a/data/pubmatic-ads
+++ b/data/pubmatic-ads
@@ -1 +0,0 @@
 ads.pubmatic.com @ads
--- a/data/qcloud
+++ b/data/qcloud
@@ -44,6 +44,7 @@ dnsv1.com.cn
 dothework.cn
 ectencent.cn
 ectencent.com.cn
 edgeone.cool
 edgeonedy1.com
 essurl.com
 exmailgz.com
--- a/data/radiko
+++ b/data/radiko
@@ -0,0 +1,5 @@
 # radiko official access and streaming domains
 radiko-cf.com
 radiko.jp
 smartstream.ne.jp
--- a/data/salesforce
+++ b/data/salesforce
@@ -24,6 +24,7 @@ pardot.com
 quotable.com
 radian6.com
 relateiq.com
 salesforce-setup.com
 salesforce.com
 salesforce.org
 salesforceiq.com
--- a/data/segment-ads
+++ b/data/segment-ads
--- a/data/supersonic-ads
+++ b/data/supersonic-ads
@@ -1,4 +1,5 @@
 ssacdn.com @ads
 supersonic.com @ads
 supersonicads.com @ads
-ssacdn.com @ads
+
 supersonicads-a.akamaihd.net @ads
--- a/data/unity
+++ b/data/unity
@@ -1,4 +1,6 @@
 unity.com
 unity3d.com
-include:unity-ads
+# Ads/tracking
 iads.unity3d.com @ads
 unityads.unity3d.com @ads
--- a/data/unitychina
+++ b/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
--- a/data/vercel
+++ b/data/vercel
@@ -3,6 +3,7 @@ err.sh
 hyper.is
 nextjs.org
 now.sh
 skills.sh
 static.fun
 title.sh
 turborepo.org
--- a/data/windsurf
+++ b/data/windsurf
@@ -0,0 +1,4 @@
 codeium.com
 codeiumdata.com
 windsurf.build
 windsurf.com
--- a/data/yandex
+++ b/data/yandex
@@ -60,3 +60,6 @@ yastatic.net
 # Watching movies, included in the Yandex subscription
 kinopoisk.ru
 kinopoisk-ru.clstorage.net
 # Weather service
 full:yandex-pogoda.static-storage.net
--- a/main.go
+++ b/main.go
@@ -23,7 +23,6 @@ var (
 )
 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
@@ -78,18 +77,14 @@ func makeProtoList(listName string, entries []*Entry) (*router.GeoSite, error) {
 	return site, nil
 }
-func writePlainList(exportedName string) error {
+func writePlainList(listname string, entries []*Entry) error {
-	targetList, exist := finalMap[strings.ToUpper(exportedName)]
+	file, err := os.Create(filepath.Join(*outputDir, strings.ToLower(listname)+".txt"))
 	if !exist || len(targetList) == 0 {
 		return fmt.Errorf("list %q does not exist or is empty.", exportedName)
 	}
 	file, err := os.Create(filepath.Join(*outputDir, strings.ToLower(exportedName)+".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()
@@ -99,7 +94,7 @@ func parseEntry(line string) (Entry, error) {
 	var entry Entry
 	parts := strings.Fields(line)
 	if len(parts) == 0 {
-		return entry, fmt.Errorf("empty line: %q", line)
+		return entry, fmt.Errorf("empty line")
 	}
 	// Parse type and value
@@ -138,7 +133,7 @@ func parseEntry(line string) (Entry, error) {
 		}
 	}
-	// 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
@@ -159,10 +154,21 @@ func parseEntry(line string) (Entry, error) {
 	// Sort attributes
 	slices.Sort(entry.Attrs)
 	// Formated plain entry: type:domain.tld:@attr1,@attr2
-	entry.Plain = entry.Type + ":" + entry.Value
+	var plain strings.Builder
-	if len(entry.Attrs) != 0 {
+	plain.Grow(len(entry.Type) + len(entry.Value) + 10)
-		entry.Plain = entry.Plain + ":@" + strings.Join(entry.Attrs, ",@")
+	plain.WriteString(entry.Type)
 	plain.WriteByte(':')
 	plain.WriteString(entry.Value)
 	for i, attr := range entry.Attrs {
 		if i == 0 {
 			plain.WriteByte(':')
 		} else {
 			plain.WriteByte(',')
 		}
 		plain.WriteByte('@')
 		plain.WriteString(attr)
 	}
 	entry.Plain = plain.String()
 	return entry, nil
 }
@@ -200,25 +206,21 @@ func validateSiteName(name string) bool {
 	return true
 }
-func loadData(path string) error {
+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))
+	var entries []*Entry
 	if !validateSiteName(listName) {
 		return fmt.Errorf("invalid list name: %s", listName)
 	}
 	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 == "" {
@@ -226,11 +228,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 {
@@ -242,7 +244,7 @@ func parseList(refName string, refList []*Entry) error {
 	for _, entry := range refList {
 		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: entry.Value}
 			for _, attr := range entry.Attrs {
@@ -268,11 +270,31 @@ func parseList(refName string, refList []*Entry) error {
 	return nil
 }
-func polishList(roughMap *map[string]*Entry) []*Entry {
+func isMatchAttrFilters(entry *Entry, incFilter *Inclusion) bool {
-	finalList := make([]*Entry, 0, len(*roughMap))
+	if len(incFilter.MustAttrs) == 0 && len(incFilter.BanAttrs) == 0 {
-	queuingList := make([]*Entry, 0, len(*roughMap)) // Domain/full entries without attr
+		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 dlc.RuleTypeRegexp:
 			finalList = append(finalList, entry)
@@ -306,9 +328,6 @@ func polishList(roughMap *map[string]*Entry) []*Entry {
 				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
@@ -331,32 +350,11 @@ func resolveList(pl *ParsedList) error {
 	}
 	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
@@ -375,80 +373,75 @@ func resolveList(pl *ParsedList) error {
 			}
 		}
 	}
-	finalMap[pl.Name] = polishList(&roughMap)
+	finalMap[pl.Name] = polishList(roughMap)
 	return nil
 }
-func main() {
+func run() error {
 	flag.Parse()
 	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 {
+		listName := strings.ToUpper(filepath.Base(path))
-			return err
+		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)
+		return fmt.Errorf("failed to loadData: %w", err)
 		os.Exit(1)
 	}
 	// Generate plMap
 	for refName, refList := range refMap {
 		if err := parseList(refName, refList); err != nil {
-			fmt.Println("Failed to parseList:", err)
+			return fmt.Errorf("failed to parseList %q: %w", refName, err)
 			os.Exit(1)
 		}
 	}
 	// Generate finalMap
-	for _, pl := range plMap {
+	for plname, pl := range plMap {
 		if err := resolveList(pl); err != nil {
-			fmt.Println("Failed to resolveList:", err)
+			return fmt.Errorf("failed to resolveList %q: %w", plname, err)
 			os.Exit(1)
 		}
 	}
-	// Create output directory if not exist
+	// Make sure output directory exists
-	if _, err := os.Stat(*outputDir); os.IsNotExist(err) {
+	if err := os.MkdirAll(*outputDir, 0755); err != nil {
-		if mkErr := os.MkdirAll(*outputDir, 0755); mkErr != nil {
+		return fmt.Errorf("failed to create output directory: %w", err)
 			fmt.Println("Failed to create output directory:", mkErr)
 			os.Exit(1)
 		}
 	}
 	// Export plaintext list
-	var exportListSlice []string
+	for rawEpList := range strings.SplitSeq(*exportLists, ",") {
-	for raw := range strings.SplitSeq(*exportLists, ",") {
+		if epList := strings.TrimSpace(rawEpList); epList != "" {
-		if trimmed := strings.TrimSpace(raw); trimmed != "" {
+			entries, exist := finalMap[strings.ToUpper(epList)]
-			exportListSlice = append(exportListSlice, trimmed)
+			if !exist || len(entries) == 0 {
 				fmt.Printf("list %q does not exist or is empty\n", epList)
 				continue
 			}
 			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)
 		}
 	}
 	for _, exportList := range exportListSlice {
 		if err := writePlainList(exportList); err != nil {
 			fmt.Println("Failed to write list:", err)
 			continue
 		}
 		fmt.Printf("list %q has been generated successfully.\n", exportList)
 	}
 	// Generate dat file
 	protoList := new(router.GeoSiteList)
 	for siteName, siteEntries := range finalMap {
 		site, err := makeProtoList(siteName, siteEntries)
 		if err != nil {
-			fmt.Println("Failed to makeProtoList:", err)
+			return fmt.Errorf("failed to makeProtoList %q: %w", siteName, err)
 			os.Exit(1)
 		}
 		protoList.Entry = append(protoList.Entry, site)
 	}
@@ -459,13 +452,19 @@ func main() {
 	protoBytes, err := proto.Marshal(protoList)
 	if err != nil {
-		fmt.Println("Failed to marshal:", err)
+		return fmt.Errorf("failed to marshal: %w", err)
 		os.Exit(1)
 	}
 	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.")
 	}
 }
Author	SHA1	Message	Date
Konstantin	2a8ef360ee	Add domains to category-ru, netease, hdrezka, kodik, windsurf and yandex (#3238 ) * add Aviasales * add hdrezka * add kodik * add windsurf * yandex: add yandex-pogoda.static-storage.net * netease: add easebar.com	2026-02-07 23:45:47 +08:00
Qi Tianyi	c8717372da	category-media-cn: add jin10 & tonghuashun domains (#3255 )	2026-02-07 13:48:19 +08:00
Qi Tianyi	106baf8ba0	douyu: add edgesrv.com (#3254 )	2026-02-06 23:25:57 +08:00
Qi Tianyi	d12634be01	geolocation-cn: add jisilu.cn (#3253 ) 集思录	2026-02-06 21:45:21 +08:00
Aethersailor	a8b474fac0	update category-ai-!cn (#3251 ) add manus	2026-02-06 18:35:19 +08:00
⑨bingyin	f5227519b8	vercel: add `skills.sh` (#3250 )	2026-02-06 15:34:15 +08:00
MkQtS	b20cf00e07	Add more cn domains (#3249 ) * add growingio * category-cdn-cn: add dfyun.com.cn * category-collaborate-cn: add feihengip.com * category-dev-cn: add aardio.com * category-education-cn: add biyehome.net * category-enterprise-query-platform-cn: add xinchacha domains * category-media-cn: add more domains * category-social-media-cn: add fanfou.com * category-wiki-cn: add chaz.fun	2026-02-05 21:32:06 +08:00
jinqiang zhang	027b8b3409	dji: add djigate.com (#3248 )	2026-02-05 20:20:39 +08:00
xd DG	535dc789b9	Add geosite:radiko (#3247 ) * Add geosite:radiko * Sort domains and include radiko in category-entertainment --------- Co-authored-by: terada46 <mizukiloveu@gmail.com>	2026-02-05 17:30:18 +08:00
MkQtS	311b281000	improve codes (#3246 )	2026-02-04 15:03:04 +08:00
秋野かえで	bfb35d7b68	split githubcopilot.com to `github-copilot` (#3245 )	2026-02-04 14:34:55 +08:00
深鸣	daf4c10d0c	category-entertainment-cn: add anitabi.cn (#3244 )	2026-02-04 13:58:38 +08:00
深鸣	a188c2c058	geolocation-!cn: add osmand.net (#3243 )	2026-02-04 13:57:46 +08:00
MkQtS	947556aa16	Improve codes (#3242 ) * 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	2026-02-03 22:38:18 +08:00
susaninz	44de14725e	kinopub: add cdn2cdn.com, cdn2site.com, pushbr.com (#3240 ) These CDN domains are used by Kinopub for: - cdn2cdn.com: video streaming CDN - cdn2site.com: video streaming CDN - pushbr.com: poster/thumbnail images Discovered via network traffic analysis on the Kinopub web app. Without these domains proxied, poster images fail to load. --------- Co-authored-by: Ivan Slezkin <ivanslezkin@Mac.lan>	2026-02-03 19:04:53 +08:00
sergeevms	c638ec66f0	salesforce: add salesforce-setup.com (#3239 )	2026-02-02 23:31:35 +08:00
susaninz	4c8b1438f8	kinopub: add cdn-service.space (#3220 ) This domain is used by the Kinopub Android TV app for version checking. Without it, the app hangs on startup when accessed from regions where this domain is blocked. Discovered during network traffic analysis on 2026-01-27.	2026-02-02 23:15:54 +08:00
Emik	3399285ea9	add pjsekai.sega.jp to projectsekai (#3236 )	2026-02-01 21:35:51 +08:00
⑨bingyin	62346cf6b7	Add bsappapi.com to Binance (#3235 )	2026-02-01 21:30:20 +08:00
jinqiang zhang	8dee321846	qcloud: add edgeone.cool (#3237 )	2026-02-01 21:28:10 +08:00
fernvenue	b117cf851f	Add packages.microsoft.com to microsoft-dev. (#3234 )	2026-02-01 11:58:25 +08:00
jinqiang zhang	0b6606758d	add louisvuitton (#3233 )	2026-01-31 18:04:21 +08:00
Blackteahamburger	fcf9c67d83	category-education-cn: add zjzs.net (#3232 )	2026-01-30 19:20:41 +08:00
MkQtS	56e0b47c73	Clean up ad lists (#3231 ) * category-ads-all: include adjust * category-ads-all: include clearbit * category-ads-all: include ogury * category-ads-all: include openx * category-ads-all: include pubmatic and remove pubmatic-ads * category-ads-all: include segment * category-ads-all: include supersonic * geolocation-cn: remove the inclusion of umeng it's included in alibaba * add unitychina * remove unity-ads use unity@ads or unitychina@ads instead	2026-01-30 12:10:37 +08:00
Signaliks	4f45866be4	Update cloudflare (#3229 )	2026-01-29 13:34:52 +08:00
`@@ -1 +1,2 @@`
	`sekai.colorfulpalette.org`	`sekai.colorfulpalette.org`
		`pjsekai.sega.jp`