Skip to content

Commit c2198d3

Browse files
sanchezzzhaksanchezzzhak
authored
Merge branch 'master' into devices
2 parents 00ca879 + aac3ddc commit c2198d3

File tree

7 files changed

+251
-10
lines changed

7 files changed

+251
-10
lines changed

‎Parser/Client/Browser.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class Browser extends AbstractClientParser
108108
'AW' => 'Amiga Aweb',
109109
'PN' => 'APN Browser',
110110
'6A' => 'Arachne',
111-
'RA' => 'Arc',
111+
'RA' => 'Arc Search',
112112
'R5' => 'Armorfly Browser',
113113
'AI' => 'Arvin',
114114
'AK' => 'Ask.com',

‎Tests/Parser/Client/fixtures/browser.yml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7930,7 +7930,7 @@
79307930
user_agent: ArcMobile2/1 CFNetwork/1494.0.5 Darwin/23.4.0
79317931
client:
79327932
type: browser
7933-
name: Arc
7933+
name: Arc Search
79347934
version: ""
79357935
engine: WebKit
79367936
engine_version: ""
@@ -9435,7 +9435,7 @@
94359435
user_agent: ArcMobile2/1.3.1; iPhone; iOS 16.1.1; Scale/2.00
94369436
client:
94379437
type: browser
9438-
name: Arc
9438+
name: Arc Search
94399439
version: 1.3.1
94409440
engine: WebKit
94419441
engine_version: ""
@@ -10339,3 +10339,25 @@
1033910339
engine: Blink
1034010340
engine_version: 116.0.5845.190
1034110341
family: Chrome
10342+
-
10343+
user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.60 Mobile Safari/537.36
10344+
client:
10345+
type: browser
10346+
name: Arc Search
10347+
version: ""
10348+
engine: Blink
10349+
engine_version: 130.0.6723.60
10350+
family: Chrome
10351+
headers:
10352+
http-x-requested-with: company.thebrowser.arc
10353+
-
10354+
user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Mobile Safari/537.36
10355+
client:
10356+
type: browser
10357+
name: Chrome Webview
10358+
version: ""
10359+
engine: Blink
10360+
engine_version: 123.0.0.0
10361+
family: Chrome
10362+
headers:
10363+
http-x-requested-with: com.android.webview

‎Tests/fixtures/clienthints.yml‎

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3684,3 +3684,178 @@
36843684
model: Galaxy A13
36853685
os_family: Android
36863686
browser_family: Chrome
3687+
-
3688+
user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36
3689+
headers:
3690+
Sec-CH-UA: '"Not_A Brand";v="8.0.0.0", "Chromium";v="120.0.6099.210", "Google Chrome";v="120.0.6099.210"'
3691+
Sec-CH-UA-Platform: "Android"
3692+
Sec-CH-UA-Mobile: "?1"
3693+
Sec-CH-UA-Full-Version: "120.0.6099.210"
3694+
Sec-CH-UA-Platform-Version: "11.0.0"
3695+
Sec-CH-UA-Model: "Model S 4G"
3696+
os:
3697+
name: Android
3698+
version: 11.0.0
3699+
platform: ""
3700+
client:
3701+
type: browser
3702+
name: Chrome Mobile
3703+
version: 120.0.6099.210
3704+
engine: Blink
3705+
engine_version: 120.0.6099.210
3706+
device:
3707+
type: smartphone
3708+
brand: Sunmax
3709+
model: Model S 4G
3710+
os_family: Android
3711+
browser_family: Chrome
3712+
-
3713+
user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36
3714+
headers:
3715+
Sec-CH-UA: '"Chromium";v="124.0.6367.113", "Google Chrome";v="124.0.6367.113", "Not-A.Brand";v="99.0.0.0"'
3716+
Sec-CH-UA-Platform: "Android"
3717+
Sec-CH-UA-Mobile: "?1"
3718+
Sec-CH-UA-Full-Version: "124.0.6367.113"
3719+
Sec-CH-UA-Platform-Version: "11.0.0"
3720+
Sec-CH-UA-Model: "Model S"
3721+
os:
3722+
name: Android
3723+
version: 11.0.0
3724+
platform: ""
3725+
client:
3726+
type: browser
3727+
name: Chrome Mobile
3728+
version: 124.0.6367.113
3729+
engine: Blink
3730+
engine_version: 124.0.6367.113
3731+
device:
3732+
type: smartphone
3733+
brand: Sunmax
3734+
model: Model S
3735+
os_family: Android
3736+
browser_family: Chrome
3737+
-
3738+
user_agent: Mozilla/5.0 (Linux; Android 12; Model D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Mobile Safari/537.36
3739+
headers:
3740+
Sec-CH-UA: '" Not A;Brand";v="99.0.0.0", "Chromium";v="102.0.5005.125", "Google Chrome";v="102.0.5005.125"'
3741+
Sec-CH-UA-Platform: "Android"
3742+
Sec-CH-UA-Mobile: "?1"
3743+
Sec-CH-UA-Full-Version: "102.0.5005.125"
3744+
Sec-CH-UA-Platform-Version: "12.0.0"
3745+
Sec-CH-UA-Model: "Model D"
3746+
os:
3747+
name: Android
3748+
version: 12.0.0
3749+
platform: ""
3750+
client:
3751+
type: browser
3752+
name: Chrome Mobile
3753+
version: 102.0.5005.125
3754+
engine: Blink
3755+
engine_version: 102.0.5005.125
3756+
device:
3757+
type: smartphone
3758+
brand: Sunmax
3759+
model: Model D
3760+
os_family: Android
3761+
browser_family: Chrome
3762+
-
3763+
user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Model A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Mobile Safari/537.36
3764+
headers:
3765+
Sec-CH-UA: '"Chromium";v="104.0.5112.69", " Not A;Brand";v="99.0.0.0", "Google Chrome";v="104.0.5112.69"'
3766+
Sec-CH-UA-Platform: "Android"
3767+
Sec-CH-UA-Mobile: "?1"
3768+
Sec-CH-UA-Full-Version: "104.0.5112.69"
3769+
Sec-CH-UA-Platform-Version: "8.1.0"
3770+
Sec-CH-UA-Model: "Model A"
3771+
os:
3772+
name: Android
3773+
version: 8.1.0
3774+
platform: ""
3775+
client:
3776+
type: browser
3777+
name: Chrome Mobile
3778+
version: 104.0.5112.69
3779+
engine: Blink
3780+
engine_version: 104.0.5112.69
3781+
device:
3782+
type: smartphone
3783+
brand: Sunmax
3784+
model: Model A
3785+
os_family: Android
3786+
browser_family: Chrome
3787+
-
3788+
user_agent: Mozilla/5.0 (Linux; Android 11; Model 6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36
3789+
headers:
3790+
Sec-CH-UA: '"Chromium";v="94", "Google Chrome";v="94", ";Not A Brand";v="99"'
3791+
Sec-CH-UA-Platform: "Android"
3792+
Sec-CH-UA-Mobile: "?1"
3793+
Sec-CH-UA-Full-Version: "94.0.4606.85"
3794+
Sec-CH-UA-Platform-Version: "11.0.0"
3795+
Sec-CH-UA-Model: "Model 6"
3796+
os:
3797+
name: Android
3798+
version: 11.0.0
3799+
platform: ""
3800+
client:
3801+
type: browser
3802+
name: Chrome Mobile
3803+
version: 94.0.4606.85
3804+
engine: Blink
3805+
engine_version: 94.0.4606.85
3806+
device:
3807+
type: smartphone
3808+
brand: Sunmax
3809+
model: Model 6
3810+
os_family: Android
3811+
browser_family: Chrome
3812+
-
3813+
user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36
3814+
headers:
3815+
Sec-CH-UA: '"Chromium";v="124.0.6367.82", "Google Chrome";v="124.0.6367.82", "Not-A.Brand";v="99.0.0.0"'
3816+
Sec-CH-UA-Platform: "Android"
3817+
Sec-CH-UA-Mobile: "?1"
3818+
Sec-CH-UA-Full-Version: "124.0.6367.82"
3819+
Sec-CH-UA-Platform-Version: "11.0.0"
3820+
Sec-CH-UA-Model: "Model_6_pro_4G"
3821+
os:
3822+
name: Android
3823+
version: 11.0.0
3824+
platform: ""
3825+
client:
3826+
type: browser
3827+
name: Chrome Mobile
3828+
version: 124.0.6367.82
3829+
engine: Blink
3830+
engine_version: 124.0.6367.82
3831+
device:
3832+
type: smartphone
3833+
brand: Sunmax
3834+
model: Model 6 Pro 4G
3835+
os_family: Android
3836+
browser_family: Chrome
3837+
-
3838+
user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Mobile Safari/537.36
3839+
headers:
3840+
Sec-CH-UA: '"Chromium";v="122.0.6261.90", "Not(A:Brand";v="24.0.0.0", "Google Chrome";v="122.0.6261.90"'
3841+
Sec-CH-UA-Platform: "Android"
3842+
Sec-CH-UA-Mobile: "?1"
3843+
Sec-CH-UA-Full-Version: "122.0.6261.90"
3844+
Sec-CH-UA-Platform-Version: "9.0.0"
3845+
Sec-CH-UA-Model: "LECT-TAB1011H"
3846+
os:
3847+
name: Android
3848+
version: 9.0.0
3849+
platform: ""
3850+
client:
3851+
type: browser
3852+
name: Chrome Mobile
3853+
version: 122.0.6261.90
3854+
engine: Blink
3855+
engine_version: 122.0.6261.90
3856+
device:
3857+
type: tablet
3858+
brand: Lectrus
3859+
model: LECT-TAB1011H
3860+
os_family: Android
3861+
browser_family: Chrome

‎Tests/fixtures/smartphone-18.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3669,3 +3669,39 @@
36693669
model: SS5424G
36703670
os_family: Android
36713671
browser_family: Chrome
3672+
-
3673+
user_agent: Mozilla/5.0 (Linux; Android 8.1.0; MS571) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36
3674+
os:
3675+
name: Android
3676+
version: 8.1.0
3677+
platform: ""
3678+
client:
3679+
type: browser
3680+
name: Chrome Mobile
3681+
version: 103.0.0.0
3682+
engine: Blink
3683+
engine_version: 103.0.0.0
3684+
device:
3685+
type: smartphone
3686+
brand: Maxcom
3687+
model: MS571
3688+
os_family: Android
3689+
browser_family: Chrome
3690+
-
3691+
user_agent: Mozilla/5.0 (Linux; Android 9; MS572) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Mobile Safari/537.36
3692+
os:
3693+
name: Android
3694+
version: "9"
3695+
platform: ""
3696+
client:
3697+
type: browser
3698+
name: Chrome Mobile
3699+
version: 108.0.0.0
3700+
engine: Blink
3701+
engine_version: 108.0.0.0
3702+
device:
3703+
type: smartphone
3704+
brand: Maxcom
3705+
model: MS572
3706+
os_family: Android
3707+
browser_family: Chrome

‎regexes/client/browsers.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,9 @@
502502
engine:
503503
default: 'Blink'
504504

505-
# Arc (https://arc.net/)
505+
# Arc Search (https://arc.net/ | https://arc.net/search)
506506
- regex: 'ArcMobile2(?:/(\d+\.[.\d]+);)?'
507-
name: 'Arc'
507+
name: 'Arc Search'
508508
version: '$1'
509509
engine:
510510
default: 'WebKit'

‎regexes/client/hints/browsers.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,3 +322,5 @@
322322
'com.hawk.android.browser': 'Hawk Turbo Browser'
323323
'com.zte.nubrowser': 'ZTE Browser'
324324
'com.cloaktp.browser': 'Privacy Pioneer Browser'
325+
'company.thebrowser.arc': 'Arc Search'
326+
'com.android.webview': 'Chrome Webview'

‎regexes/device/mobiles.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31924,14 +31924,14 @@ Ruggex:
3192431924

3192531925
# Maxcom (maxcom.pl)
3192631926
Maxcom:
31927-
regex: '(?:MS(?:45[036]|505|507_STRONG|514|651)|MS457(?:PLUS)?|RS-401|Neva Rise S1)(?:[);/ ]|$)'
31927+
regex: '(?:MS(?:45[036]|505|507_STRONG|514|57[12]|651)|MS457(?:PLUS)?|RS-401|Neva Rise S1)(?:[);/ ]|$)'
3192831928
device: 'smartphone'
3192931929
models:
3193031930
- regex: '(MS457)PLUS(?:[);/ ]|$)'
3193131931
model: '$1 Plus'
3193231932
- regex: '(MS507)_STRONG(?:[);/ ]|$)'
3193331933
model: '$1 Strong'
31934-
- regex: 'MS(45[0367]|505|514|651)(?:[);/ ]|$)'
31934+
- regex: 'MS(45[0367]|505|514|57[12]|651)(?:[);/ ]|$)'
3193531935
model: 'MS$1'
3193631936
- regex: 'RS-401(?:[);/ ]|$)'
3193731937
model: 'RS-401'
@@ -40447,9 +40447,15 @@ Khadas:
4044740447

4044840448
# Sunmax or sunmax mobile (sunmaxmobile.com)
4044940449
Sunmax:
40450-
regex: '(Model Y)(?:[);/ ]|$)'
40450+
regex: 'Model[ _][6ADSY](?:[ _]pro)?(?:[ _]4G)?(?:[);/ ]|$)'
4045140451
device: 'smartphone'
40452-
model: '$1'
40452+
models:
40453+
- regex: 'Model_6_pro_4G'
40454+
model: 'Model 6 Pro 4G'
40455+
- regex: '(Model S 4G)'
40456+
model: '$1'
40457+
- regex: '(Model [6ADSY])'
40458+
model: '$1'
4045340459

4045440460
# Kapsys (kapsys.com)
4045540461
Kapsys:
@@ -40868,7 +40874,7 @@ BluSlate:
4086840874

4086940875
# Lectrus
4087040876
Lectrus:
40871-
regex: 'LECT-TAB(1011|0711)(?:[);/ ]|$)'
40877+
regex: 'LECT-TAB(1011H?|0711)(?:[);/ ]|$)'
4087240878
device: 'tablet'
4087340879
model: 'LECT-TAB$1'
4087440880

0 commit comments

Comments
 (0)