nite/sub2clash
1
0
Fork 0
mirror of https://github.com/bestnite/sub2clash.git synced 2025-10-26 01:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

modify base64 decode func in BuildSub uses std encoder

Browse Source
This commit is contained in:
nite
2025-07-28 12:12:15 +00:00
parent 83c24170a0
commit f5686561f9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/sub.go
View File

@@ -135,16 +135,16 @@ func BuildSub(clashType model.ClashType, query model.ConvertConfig, template str
for i := range query.Subs { for i := range query.Subs {
data, err := LoadSubscription(query.Subs[i], query.Refresh, query.UserAgent, cacheExpire, retryTimes) data, err := LoadSubscription(query.Subs[i], query.Refresh, query.UserAgent, cacheExpire, retryTimes)
subName := ""
if strings.Contains(query.Subs[i], "#") {
subName = query.Subs[i][strings.LastIndex(query.Subs[i], "#")+1:]
}
if err != nil { if err != nil {
logger.Logger.Debug( logger.Logger.Debug(
"load subscription failed", zap.String("url", query.Subs[i]), zap.Error(err), "load subscription failed", zap.String("url", query.Subs[i]), zap.Error(err),
) )
return nil, NewSubscriptionLoadError(query.Subs[i], err) return nil, NewSubscriptionLoadError(query.Subs[i], err)
} }
subName := ""
if strings.Contains(query.Subs[i], "#") {
subName = query.Subs[i][strings.LastIndex(query.Subs[i], "#")+1:]
}
err = yaml.Unmarshal(data, &sub) err = yaml.Unmarshal(data, &sub)
var newProxies []P.Proxy var newProxies []P.Proxy
@@ -161,7 +161,7 @@ func BuildSub(clashType model.ClashType, query model.ConvertConfig, template str
} }
newProxies = p newProxies = p
} else { } else {
base64, err := utils.DecodeBase64(string(data), true) base64, err := utils.DecodeBase64(string(data), false)
if err != nil { if err != nil {
logger.Logger.Debug( logger.Logger.Debug(
"parse subscription failed", zap.String("url", query.Subs[i]), "parse subscription failed", zap.String("url", query.Subs[i]),