Parse versions string into struct

ua.go

@@ -8,27 +8,19 @@ import (
 
 // UserAgent struct containing all data extracted from parsed user-agent string
 type UserAgent struct {
-	URL       string
+	VersionNo   VersionNo
-	String    string
+	OSVersionNo VersionNo
-	Name      string
+	URL         string
-	Version   string
+	String      string
-	OS        string
+	Name        string
-	OSVersion string
+	Version     string
-	Device    string
+	OS          string
-	// VersionNo struct {
+	OSVersion   string
-	// 	Major int
+	Device      string
-	// 	Minor int
+	Mobile      bool
-	// 	Patch int
+	Tablet      bool
-	// }
+	Desktop     bool
-	// OSVersionNo struct {
+	Bot         bool
-	// 	Major int
-	// 	Minor int
-	// 	Patch int
-	// }
-	Mobile  bool
-	Tablet  bool
-	Desktop bool
-	Bot     bool
 }
 
 // Constants for browsers and operating systems for easier comparison
@@ -344,6 +336,9 @@ func Parse(userAgent string) UserAgent {
 		}
 	}
 
+	parseVersion(ua.Version, &ua.VersionNo)
+	parseVersion(ua.OSVersion, &ua.OSVersionNo)
+
 	return ua
 }
 

ua_test.go

@@ -164,7 +164,7 @@ func TestParse(t *testing.T) {
 			t.Error("\n", test[0], "Device should be", test[5], "not", ua.Device)
 		}
 
-		//fmt.Println(ua.OS, ua.OSVersion, ua.Device)
+		// fmt.Println(ua.Version, "==>", ua.VersionNoShort())
 
 	}
 }

version.go

@@ -0,0 +1,66 @@
+package useragent
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+type VersionNo struct {
+	Major int
+	Minor int
+	Patch int
+}
+
+func parseVersion(ver string, verno *VersionNo) {
+	var err error
+	parts := strings.Split(ver, ".")
+	if len(parts) > 0 {
+		if verno.Major, err = strconv.Atoi(parts[0]); err != nil {
+			return
+		}
+	}
+	if len(parts) > 1 {
+		if verno.Minor, err = strconv.Atoi(parts[1]); err != nil {
+			return
+		}
+		if len(parts) > 2 {
+			if verno.Patch, err = strconv.Atoi(parts[2]); err != nil {
+				return
+			}
+		}
+	}
+	return
+}
+
+// VersionNoShort return version string in format <Major>.<Minor>
+func (ua UserAgent) VersionNoShort() string {
+	if ua.VersionNo.Major == 0 && ua.VersionNo.Minor == 0 && ua.VersionNo.Patch == 0 {
+		return ""
+	}
+	return fmt.Sprintf("%d.%d", ua.VersionNo.Major, ua.VersionNo.Minor)
+}
+
+// VersionNoFull returns version string in format <Major>.<Minor>.<Patch>
+func (ua UserAgent) VersionNoFull() string {
+	if ua.VersionNo.Major == 0 && ua.VersionNo.Minor == 0 && ua.VersionNo.Patch == 0 {
+		return ""
+	}
+	return fmt.Sprintf("%d.%d.%d", ua.VersionNo.Major, ua.VersionNo.Minor, ua.VersionNo.Patch)
+}
+
+// OSVersionNoShort returns OS version string in format <Major>.<Minor>
+func (ua UserAgent) OSVersionNoShort() string {
+	if ua.OSVersionNo.Major == 0 && ua.OSVersionNo.Minor == 0 && ua.OSVersionNo.Patch == 0 {
+		return ""
+	}
+	return fmt.Sprintf("%d.%d", ua.OSVersionNo.Major, ua.OSVersionNo.Minor)
+}
+
+// OSVersionNoFull returns OS version string in format <Major>.<Minor>.<Patch>
+func (ua UserAgent) OSVersionNoFull() string {
+	if ua.OSVersionNo.Major == 0 && ua.OSVersionNo.Minor == 0 && ua.OSVersionNo.Patch == 0 {
+		return ""
+	}
+	return fmt.Sprintf("%d.%d.%d", ua.OSVersionNo.Major, ua.OSVersionNo.Minor, ua.OSVersionNo.Patch)
+}