mirror of
https://github.com/v2fly/domain-list-community.git
synced 2026-02-06 05:53:13 +07:00
Compare commits
19 Commits
2026012707
...
2026020314
| Author | SHA1 | Date | |
|---|---|---|---|
|
947556aa16 | ||
|
44de14725e | ||
|
c638ec66f0 | ||
|
|
4c8b1438f8 | ||
|
3399285ea9 | ||
|
62346cf6b7 | ||
|
8dee321846 | ||
|
b117cf851f | ||
|
|
0b6606758d | ||
|
fcf9c67d83 | ||
|
|
56e0b47c73 | ||
|
4f45866be4 | ||
|
|
40d763daca | ||
|
|
6c91898557 | ||
|
|
91da593233 | ||
|
9f1c6b6922 | ||
|
|
b3bae7de8f | ||
|
4e9b28f951 | ||
|
3c0a538219 |
@@ -31,11 +31,13 @@ type DomainList struct {
|
||||
}
|
||||
|
||||
func (d *DomainRule) domain2String() string {
|
||||
dstring := d.Type + ":" + d.Value
|
||||
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 {
|
||||
dstring += ":@" + strings.Join(d.Attrs, ",@")
|
||||
fmt.Fprintf(&dstr, ":@%s", strings.Join(d.Attrs, ",@"))
|
||||
}
|
||||
return dstring
|
||||
return dstr.String()
|
||||
}
|
||||
|
||||
func loadGeosite(path string) ([]DomainList, map[string]*DomainList, error) {
|
||||
@@ -82,10 +84,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 +121,16 @@ func exportAll(filename string, domainLists []DomainList) error {
|
||||
return w.Flush()
|
||||
}
|
||||
|
||||
func main() {
|
||||
flag.Parse()
|
||||
|
||||
// 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 to create output directory:", mkErr)
|
||||
os.Exit(1)
|
||||
}
|
||||
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 %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)
|
||||
os.Exit(1)
|
||||
return fmt.Errorf("failed to loadGeosite: %w", err)
|
||||
}
|
||||
|
||||
var exportListSlice []string
|
||||
@@ -150,15 +146,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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
adcolony.com @ads
|
||||
@@ -1,4 +1,4 @@
|
||||
adjust.com @ads
|
||||
adjust.net.in @ads
|
||||
adjust.io @ads
|
||||
adjust.net.in @ads
|
||||
adjust.world @ads
|
||||
@@ -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
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
applovin.com @ads
|
||||
applvn.com @ads
|
||||
@@ -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
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
atom-data.io @ads
|
||||
analytics-data.io @ads
|
||||
ironbeast.io @ads
|
||||
@@ -31,6 +31,7 @@ binanceapi.com
|
||||
binanceru.net
|
||||
bnbstatic.com
|
||||
bntrace.com
|
||||
bsappapi.com
|
||||
nftstatic.com
|
||||
|
||||
# saas
|
||||
|
||||
9
data/bohemia
Normal file
9
data/bohemia
Normal file
@@ -0,0 +1,9 @@
|
||||
arma3.com
|
||||
armaplatform.com
|
||||
bistudio.com
|
||||
bohemia.net
|
||||
dayz.com
|
||||
makearmanotwar.com
|
||||
silicagame.com
|
||||
vigorgame.com
|
||||
ylands.com
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -48,6 +48,7 @@ include:kakao
|
||||
include:kaspersky
|
||||
include:lg
|
||||
include:logitech
|
||||
include:louisvuitton
|
||||
include:mailru-group
|
||||
include:meta
|
||||
include:microsoft
|
||||
|
||||
@@ -18,6 +18,7 @@ include:segmentfault
|
||||
include:sxl
|
||||
include:tencent-dev
|
||||
include:ubuntukylin
|
||||
include:unitychina
|
||||
|
||||
jinrishici.com
|
||||
openvela.com
|
||||
|
||||
@@ -142,3 +142,5 @@ ystbds.com
|
||||
zhan.com
|
||||
# 智慧树
|
||||
zhihuishu.com
|
||||
# 浙江省教育考试院
|
||||
zjzs.net
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
include:2kgames
|
||||
include:blizzard
|
||||
include:bluearchive
|
||||
include:bohemia
|
||||
include:curseforge
|
||||
include:cygames
|
||||
include:ea
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
emogi.com @ads
|
||||
@@ -1 +0,0 @@
|
||||
data.flurry.com @ads
|
||||
@@ -24,7 +24,6 @@ include:category-social-media-cn
|
||||
# Advertisment & Analytics
|
||||
include:getui
|
||||
include:jiguang
|
||||
include:umeng
|
||||
|
||||
# 神策数据
|
||||
sensorsdata.cn
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
assets.growingio.com @ads
|
||||
@@ -1,2 +0,0 @@
|
||||
mlog.hiido.com @ads
|
||||
ylog.hiido.com @ads
|
||||
@@ -1 +0,0 @@
|
||||
static.hotjar.com @ads
|
||||
@@ -1 +0,0 @@
|
||||
inner-active.mobi @ads
|
||||
@@ -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$
|
||||
|
||||
5
data/louisvuitton
Normal file
5
data/louisvuitton
Normal file
@@ -0,0 +1,5 @@
|
||||
louisvuitton.cn @cn
|
||||
louisvuitton.com
|
||||
lvcampaign.com @cn
|
||||
|
||||
full:tp.louisvuitton.com @cn
|
||||
@@ -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
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
mopub.com @ads
|
||||
@@ -1 +0,0 @@
|
||||
evt.mxplay.com @ads
|
||||
@@ -1 +0,0 @@
|
||||
js-agent.newrelic.com @ads
|
||||
@@ -1,3 +1,3 @@
|
||||
ogury.co @ads
|
||||
ogury.com @ads
|
||||
presage.io @ads
|
||||
ogury.co @ads
|
||||
@@ -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
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
cdn.pocoiq.cn @ads
|
||||
oct.pocoiq.cn @ads
|
||||
@@ -1 +1,2 @@
|
||||
sekai.colorfulpalette.org
|
||||
pjsekai.sega.jp
|
||||
|
||||
@@ -2,5 +2,3 @@
|
||||
|
||||
pubmatic.com
|
||||
pubmatic.co.jp
|
||||
|
||||
include:pubmatic-ads
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
ads.pubmatic.com @ads
|
||||
@@ -44,6 +44,7 @@ dnsv1.com.cn
|
||||
dothework.cn
|
||||
ectencent.cn
|
||||
ectencent.com.cn
|
||||
edgeone.cool
|
||||
edgeonedy1.com
|
||||
essurl.com
|
||||
exmailgz.com
|
||||
|
||||
@@ -24,6 +24,7 @@ pardot.com
|
||||
quotable.com
|
||||
radian6.com
|
||||
relateiq.com
|
||||
salesforce-setup.com
|
||||
salesforce.com
|
||||
salesforce.org
|
||||
salesforceiq.com
|
||||
|
||||
@@ -8,6 +8,7 @@ galaxyappstore.com
|
||||
galaxymobile.jp
|
||||
game-platform.net
|
||||
knoxemm.com
|
||||
ospserver.net
|
||||
samsung.com
|
||||
samsungads.com @ads
|
||||
samsungapps.com
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
ssacdn.com @ads
|
||||
supersonic.com @ads
|
||||
supersonicads.com @ads
|
||||
ssacdn.com @ads
|
||||
|
||||
supersonicads-a.akamaihd.net @ads
|
||||
@@ -1,2 +0,0 @@
|
||||
g1.tagtic.cn @ads
|
||||
xy-log.tagtic.cn @ads
|
||||
@@ -1 +0,0 @@
|
||||
ssp.api.tappx.com @ads
|
||||
@@ -1 +0,0 @@
|
||||
uberads.com @ads
|
||||
@@ -1,4 +1,6 @@
|
||||
unity.com
|
||||
unity3d.com
|
||||
|
||||
include:unity-ads
|
||||
# Ads/tracking
|
||||
iads.unity3d.com @ads
|
||||
unityads.unity3d.com @ads
|
||||
|
||||
@@ -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
|
||||
179
main.go
179
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 {
|
||||
targetList, exist := finalMap[strings.ToUpper(exportedName)]
|
||||
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"))
|
||||
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()
|
||||
@@ -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,13 @@ 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
|
||||
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
|
||||
}
|
||||
@@ -200,25 +198,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))
|
||||
if !validateSiteName(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 == "" {
|
||||
@@ -226,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 {
|
||||
@@ -242,7 +236,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 +262,31 @@ 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 dlc.RuleTypeRegexp:
|
||||
finalList = append(finalList, entry)
|
||||
@@ -306,9 +320,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 +342,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 +365,75 @@ 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 to create output directory:", 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
|
||||
var exportListSlice []string
|
||||
for raw := range strings.SplitSeq(*exportLists, ",") {
|
||||
if trimmed := strings.TrimSpace(raw); trimmed != "" {
|
||||
exportListSlice = append(exportListSlice, trimmed)
|
||||
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
|
||||
}
|
||||
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)
|
||||
os.Exit(1)
|
||||
return fmt.Errorf("failed to makeProtoList %q: %w", siteName, err)
|
||||
}
|
||||
protoList.Entry = append(protoList.Entry, site)
|
||||
}
|
||||
@@ -459,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.")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user