Skip to content

fixed hhbtv regex #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mchubar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed hhbtv regex #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions device_detector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ var desktopOsArray = []string{
`Chrome OS`,
}

var(
var (
chrMobReg = regexp.MustCompile(fixUserAgentRegEx(`Chrome/[\.0-9]* Mobile`), regexp.IgnoreCase)
chrTabReg = regexp.MustCompile(fixUserAgentRegEx(`Chrome/[\.0-9]* (?!Mobile)`), regexp.IgnoreCase)
opaTabReg = regexp.MustCompile(fixUserAgentRegEx(`Opera Tablet`), regexp.IgnoreCase)
opaTvReg = regexp.MustCompile(fixUserAgentRegEx(`Opera TV Store`), regexp.IgnoreCase)
opaTvReg = regexp.MustCompile(fixUserAgentRegEx(`Opera TV Store`), regexp.IgnoreCase)
)

func fixUserAgentRegEx(regex string) string {
Expand Down Expand Up @@ -90,7 +90,6 @@ func NewDeviceDetector(dir string) (*DeviceDetector, error) {
NewBot(filepath.Join(dir, FixtureFileBot)),
}


return d, nil
}

Expand Down Expand Up @@ -184,7 +183,7 @@ func (d *DeviceDetector) parseInfo(info *DeviceInfo) {
// If it is present the device should be a smartphone, otherwise it's a tablet
// See https://developer.chrome.com/multidevice/user-agent#chrome_for_android_user_agent
if deviceType == DEVICE_TYPE_INVALID && osFamily == `Android` {
if browserName,ok:=client.GetBrowserFamily(cmr.ShortName); ok&&browserName== `Chrome` {
if browserName, ok := client.GetBrowserFamily(cmr.ShortName); ok && browserName == `Chrome` {
if ok, _ := chrMobReg.MatchString(ua); ok {
deviceType = DEVICE_TYPE_SMARTPHONE
} else if ok, _ = chrTabReg.MatchString(ua); ok {
Expand Down Expand Up @@ -268,4 +267,3 @@ func (d *DeviceDetector) Parse(ua string) *DeviceInfo {

return info
}

6 changes: 3 additions & 3 deletions device_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ var (
type DeviceInfo struct {
userAgent string
device.DeviceMatchResult
client *client.ClientMatchResult
os *OsMatchResult
bot *BotMatchResult
client *client.ClientMatchResult
os *OsMatchResult
bot *BotMatchResult
}

func (d *DeviceInfo) GetDeviceType() int {
Expand Down
2 changes: 1 addition & 1 deletion device_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,4 +205,4 @@ func TestRegThread(t *testing.T) {
}
}
wg.Wait()
}
}
7 changes: 5 additions & 2 deletions parser/device/hbbtv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ func init() {
}

func NewHbbTv(fileName string) *HbbTv {
h := &HbbTv{}
h := &HbbTv{
hbbTvRegx: Regular{
Regex: `HbbTV/([1-9]{1}(?:.[0-9]{1}){1,2})`,
},
}
if err := h.Load(fileName); err != nil {
h.hbbTvRegx.Regex = `HbbTV/([1-9]{1}(?:.[0-9]{1}){1,2})`
return nil
}
return h
Expand Down