chore: parse float in subscription info

Larvan2 · Larvan2 · commit 8230bc8e7d8e · 2024-09-11T13:34:59.000+08:00
diff --git a/adapter/provider/provider.go b/adapter/provider/provider.go
@@ -18,7 +18,6 @@ import (
 	"github.com/metacubex/mihomo/component/resource"
 	C "github.com/metacubex/mihomo/constant"
 	types "github.com/metacubex/mihomo/constant/provider"
-	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/tunnel/statistic"
 
 	"github.com/dlclark/regexp2"
@@ -149,10 +148,7 @@ func (pp *proxySetProvider) getSubscriptionInfo() {
 				return
 			}
 		}
-		pp.subscriptionInfo, err = NewSubscriptionInfo(userInfoStr)
-		if err != nil {
-			log.Warnln("[Provider] get subscription-userinfo: %e", err)
-		}
+		pp.subscriptionInfo = NewSubscriptionInfo(userInfoStr)
 	}()
 }
 
diff --git a/adapter/provider/subscription_info.go b/adapter/provider/subscription_info.go
@@ -1,8 +1,11 @@
 package provider
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
+
+	"github.com/metacubex/mihomo/log"
 )
 
 type SubscriptionInfo struct {
@@ -12,28 +15,46 @@ type SubscriptionInfo struct {
 	Expire   int64
 }
 
-func NewSubscriptionInfo(userinfo string) (si *SubscriptionInfo, err error) {
+func NewSubscriptionInfo(userinfo string) (si *SubscriptionInfo) {
 	userinfo = strings.ToLower(userinfo)
 	userinfo = strings.ReplaceAll(userinfo, " ", "")
 	si = new(SubscriptionInfo)
+
 	for _, field := range strings.Split(userinfo, ";") {
-		switch name, value, _ := strings.Cut(field, "="); name {
+		name, value, ok := strings.Cut(field, "=")
+		if !ok {
+			continue
+		}
+
+		intValue, err := parseValue(value)
+		if err != nil {
+			log.Warnln("[Provider] get subscription-userinfo: %e", err)
+			continue
+		}
+
+		switch name {
 		case "upload":
-			si.Upload, err = strconv.ParseInt(value, 10, 64)
+			si.Upload = intValue
 		case "download":
-			si.Download, err = strconv.ParseInt(value, 10, 64)
+			si.Download = intValue
 		case "total":
-			si.Total, err = strconv.ParseInt(value, 10, 64)
+			si.Total = intValue
 		case "expire":
-			if value == "" {
-				si.Expire = 0
-			} else {
-				si.Expire, err = strconv.ParseInt(value, 10, 64)
-			}
-		}
-		if err != nil {
-			return
+			si.Expire = intValue
 		}
 	}
-	return
+
+	return si
+}
+
+func parseValue(value string) (int64, error) {
+	if intValue, err := strconv.ParseInt(value, 10, 64); err == nil {
+		return intValue, nil
+	}
+
+	if floatValue, err := strconv.ParseFloat(value, 64); err == nil {
+		return int64(floatValue), nil
+	}
+
+	return 0, fmt.Errorf("failed to parse value '%s'", value)
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ import (`
`18`	`18`	`"github.com/metacubex/mihomo/component/resource"`
`19`	`19`	`C "github.com/metacubex/mihomo/constant"`
`20`	`20`	`types "github.com/metacubex/mihomo/constant/provider"`
`21`		`- "github.com/metacubex/mihomo/log"`
`22`	`21`	`"github.com/metacubex/mihomo/tunnel/statistic"`
`23`	`22`
`24`	`23`	`"github.com/dlclark/regexp2"`
`@@ -149,10 +148,7 @@ func (pp *proxySetProvider) getSubscriptionInfo() {`
`149`	`148`	`return`
`150`	`149`	`}`
`151`	`150`	`}`
`152`		`- pp.subscriptionInfo, err = NewSubscriptionInfo(userInfoStr)`
`153`		`- if err != nil {`
`154`		`- log.Warnln("[Provider] get subscription-userinfo: %e", err)`
`155`		`- }`
	`151`	`+ pp.subscriptionInfo = NewSubscriptionInfo(userInfoStr)`
`156`	`152`	`}()`
`157`	`153`	`}`
`158`	`154`