gopkg/useragent
2
0
Fork 0
Code Activity

Better tablet detection

Browse Source
This commit is contained in:
Miloš Mileusnić
2023-06-04 19:09:56 +02:00
parent 9a029a9c78
commit f0b3dcfa90
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ua.go
+16 -3
View File
@@ -171,7 +171,7 @@ func Parse(userAgent string) UserAgent {
ua.Name = Firefox ua.Name = Firefox
ua.Version = tokens.get(Firefox) ua.Version = tokens.get(Firefox)
ua.Mobile = tokens.exists("Mobile") ua.Mobile = tokens.exists("Mobile")
ua.Tablet = strings.Contains(strings.ToLower(ua.String), "tablet") ua.Tablet = tokens.exists("Tablet")
case tokens.get("Vivaldi") != "": case tokens.get("Vivaldi") != "":
ua.Name = Vivaldi ua.Name = Vivaldi
@@ -489,6 +489,15 @@ func (p properties) exists(key string) bool {
return false return false
} }
// func (p properties) existsIgnoreCase(key string) bool {
// for _, prop := range p.list {
// if strings.EqualFold(prop.Key, key) {
// return true
// }
// }
// return false
// }
func (p properties) existsAny(keys ...string) bool { func (p properties) existsAny(keys ...string) bool {
for _, k := range keys { for _, k := range keys {
for _, prop := range p.list { for _, prop := range p.list {
@@ -548,7 +557,7 @@ func (p properties) findBestMatch(withVerOnly bool) string {
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
for _, prop := range p.list { for _, prop := range p.list {
switch prop.Key { switch prop.Key {
case Chrome, Firefox, Safari, "Version", "Mobile", "Mobile Safari", "Mozilla", "AppleWebKit", "Windows NT", "Windows Phone OS", Android, "Macintosh", Linux, "GSA", "CrOS": case Chrome, Firefox, Safari, "Version", "Mobile", "Mobile Safari", "Mozilla", "AppleWebKit", "Windows NT", "Windows Phone OS", Android, "Macintosh", Linux, "GSA", "CrOS", "Tablet":
default: default:
// don' pick if starts with number // don' pick if starts with number
if len(prop.Key) != 0 && prop.Key[0] >= 48 && prop.Key[0] <= 57 { if len(prop.Key) != 0 && prop.Key[0] >= 48 && prop.Key[0] <= 57 {
@@ -589,7 +598,11 @@ func (p *properties) findAndroidDevice(startIndex int) string {
case Chrome, Firefox, Safari, "Opera Mini", "Presto", "Version", "Mobile", "Mobile Safari", "Mozilla", "AppleWebKit", "Windows NT", "Windows Phone OS", Android, "Macintosh", Linux, "CrOS": case Chrome, Firefox, Safari, "Opera Mini", "Presto", "Version", "Mobile", "Mobile Safari", "Mozilla", "AppleWebKit", "Windows NT", "Windows Phone OS", Android, "Macintosh", Linux, "CrOS":
// ignore this tokens, not device names // ignore this tokens, not device names
default: default:
p.list = append(p.list[:i+1], p.list[i+2:]...) if strings.Contains(strings.ToLower(dev), "tablet") {
p.list[i+1].Key = "Tablet" // leave Tablet tag for later table detection
} else {
p.list = append(p.list[:i+1], p.list[i+2:]...)
}
return strings.TrimSpace(strings.TrimSuffix(dev, "Build")) return strings.TrimSpace(strings.TrimSuffix(dev, "Build"))
} }
} }