Skip to content
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.

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

wnyc, new siriusxm app, and also alienware desktops. #7717

Merged
merged 6 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
1 change: 1 addition & 0 deletions Parser/Device/AbstractDeviceParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ abstract class AbstractDeviceParser extends AbstractParser
'Q3' => 'AKIRA',
'1A' => 'Alba',
'AL' => 'Alcatel',
'AL0' => 'Alienware',
'20' => 'Alcor',
'XY' => 'Alps',
'XYA' => 'XY Auto',
Expand Down
16 changes: 16 additions & 0 deletions Tests/fixtures/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9743,3 +9743,19 @@
model: ""
os_family: GNU/Linux
browser_family: Unknown
-
user_agent: Mozilla/5.0 (Windows NT 10.0.18362.356; osmeta 10.3.45364) AppleWebKit/602.1.1 (KHTML, like Gecko) Version/9.0 Safari/602.1.1 osmeta/10.3.45364 Build/45364 FBAN/FBW;FBAV/186.0.0.88.783;FBBV/171658047;FBDV/AlienwareAuroraR70858;FBMD/Alienware Aurora R7 0858;FBSN/Windows;FBSV/10.0.18362.657;FBSS/2;FBCR/;FBID/desktop;FBLC/en_US;FBOP/45;FBRV/0
os:
name: Windows
version: "10.0.18362.657"
platform: ""
client:
type: mobile app
name: Facebook
version: "186.0.0.88.783"
device:
type: desktop
brand: Alienware
model: Aurora R7
os_family: Windows
browser_family: Unknown
85 changes: 85 additions & 0 deletions Tests/fixtures/podcasting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7792,6 +7792,23 @@
model: ""
os_family: iOS
browser_family: Unknown

-
user_agent: sxm-android/7.5.2 motorola/moto-e5-play Android/8.0.0
os:
name: Android
version: "8.0.0"
platform: ""
client:
type: mobile app
name: SiriusXM
version: '7.5.2'
device:
type: smartphone
brand: Motorola
model: e5
mindreader marked this conversation as resolved.
Show resolved Hide resolved
os_family: Android
browser_family: Unknown
-
user_agent: Snipd/2.2.52 CFNetwork/1410.0.3 Darwin/22.6.0 (iPhone iOS/16.6)
os:
Expand Down Expand Up @@ -8898,3 +8915,71 @@
model: Galaxy S21+ 5G
os_family: Android
browser_family: Unknown

-
user_agent: WNYC App/3.0.3 Android/24 device/Verizon-SM-G930V
os:
name: Android
version: "24"
platform: ""
client:
type: mobile app
name: WNYC
version: "3.0.3"
device:
type: smartphone
brand: Samsung
model: Galaxy S7
os_family: Android
browser_family: Unknown

-
user_agent: 'WNYC/3.0.17-11105 iOS/11.1.2 device/iPhone7,2'
os:
name: iOS
version: "11.1.2"
platform: ""
client:
type: mobile app
name: WNYC
version: 3.0.17
device:
type: smartphone
brand: Apple
model: iPhone 6
os_family: iOS
browser_family: Unknown

-
user_agent: WNYC 2.1.19 rv:11042 (iPhone; iPhone OS 10.3.2; en_US)
os:
name: iOS
version: "10.3.2"
platform: ""
client:
type: mobile app
name: WNYC
version: 2.1.19
device:
type: smartphone
brand: Apple
model: iPhone
os_family: iOS
browser_family: Unknown

-
user_agent: WNYC/9556 CFNetwork/1496.0.7 Darwin/23.5.0
os:
name: iOS
version: "17.5"
platform: ""
client:
type: mobile app
name: WNYC
version: "9556"
device:
type: ""
brand: Apple
model: ""
os_family: iOS
browser_family: Unknown
7 changes: 6 additions & 1 deletion regexes/client/mobile_apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2137,7 +2137,7 @@
name: 'Shadowrocket'
version: '$1'

- regex: '^SiriusXM/([\d\.]+)'
- regex: '^(?:SiriusXM|sxm-android|sxm-apple)/([\d\.]+)'
name: 'SiriusXM'
version: '$1'

Expand Down Expand Up @@ -2482,6 +2482,11 @@
name: 'SoFi'
version: '$1'

# WNYC (https://play.google.com/store/apps/details?id=org.wnyc.android)
- regex: 'WNYC(?: App)?[/ ]?([\d\.]+)?'
name: 'WNYC'
version: '$1'

# Electron generic apps
- regex: ' (?!(?:AppleWebKit|brave|Franz|Mailspring|Notion|Basecamp|Evernote|catalyst|ramboxpro|BlueMail|BeakerBrowser|TweakStyle|Colibri|Polypane|VibeMate|(?:d|LT|Glass|Sushi|Flash|OhHai)Browser|Sizzy))([a-z0-9]*)(?:-desktop|-electron-app)?/(\d+\.[\d.]+).*Electron/'
name: '$1'
Expand Down
4 changes: 2 additions & 2 deletions regexes/device/mobiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20899,7 +20899,7 @@ Soundmax:

# Samsung
Samsung:
regex: 'SAMSUNG(?! ?(?:Browser|Redmi|TicWatch))|FamilyHub|Maple (?!III)|Maple2012|SMART-TV.+Tizen.+SamsungBrowser|Gear Live|(?:SEC_)?SC-(?:001|01[EFGHKLM]|02[CGHJKLMF]|03[EFJKL]|04[EFJLG]|05[GL]|(?:4[12]|5[1-4])A|5[1-5]B|5[1-5]C|56C|5[23]D)|N[57]100|N5110|N9100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|GT-|(?<!GOG|GOG )Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|beyond[02]q?|crownq?lte|vollo Vi86(?:[);/ ]|$)|(?:lineage_|aokp_|rr_)?(?:serranoltexx|j5y17lte|Santos103G|fortuna3g)|(?:OTV-)?SMT-E5015|ISW11SC|40[34]SC|SC(?:G1[6789]|G2[01]|V3[1-9]|V4[0-9]|51Aa|-56B|T21|G0[1-9]|G1[0-5]|L2[234])(?:-[uj])?(?:[);/ ]|$)'
regex: 'SAMSUNG(?! ?(?:Browser|Redmi|TicWatch))|FamilyHub|Maple (?!III)|Maple2012|SMART-TV.+Tizen.+SamsungBrowser|Gear Live|(?:SEC_)?SC-(?:001|01[EFGHKLM]|02[CGHJKLMF]|03[EFJKL]|04[EFJLG]|05[GL]|(?:4[12]|5[1-4])A|5[1-5]B|5[1-5]C|56C|5[23]D)|N[57]100|N5110|N9100|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|GT-|(?<!GOG|GOG )Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|beyond[02]q?|crownq?lte|vollo Vi86(?:[);/ ]|$)|(?:lineage_|aokp_|rr_)?(?:serranoltexx|j5y17lte|Santos103G|fortuna3g|Verizon-SM)|(?:OTV-)?SMT-E5015|ISW11SC|40[34]SC|SC(?:G1[6789]|G2[01]|V3[1-9]|V4[0-9]|51Aa|-56B|T21|G0[1-9]|G1[0-5]|L2[234])(?:-[uj])?(?:[);/ ]|$)'
device: 'smartphone'
models:
# explicit tv models
Expand Down Expand Up @@ -21700,7 +21700,7 @@ Samsung:
model: 'Galaxy S6 Edge'
- regex: '(?:SAMSUNG-)?SM-G928(?:7C|N0|R4|W8|[07ACFGIKLPSTVX])'
model: 'Galaxy S6 Edge+'
- regex: '(?:SAMSUNG-)?SM-G930(?:AZ|FD|R[467]|T1|V[CL]|W8|[0AFKLPRSTUVX8])?(?:[);/ ]|$)'
- regex: '(?:SAMSUNG-|Verizon-)?SM-G930(?:AZ|FD|R[467]|T1|V[CL]|W8|[0AFKLPRSTUVX8])?(?:[);/ ]|$)'
model: 'Galaxy S7'
- regex: '(?:SAMSUNG-)?SM-G935(?:R4|W8|[0AFKLPSTUVX])|SC-02H|SCV33|Galaxy s7 edge'
model: 'Galaxy S7 Edge'
Expand Down
13 changes: 13 additions & 0 deletions regexes/device/notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ Asus:
- regex: 'FBMD/X556UQK;'
model: 'X556UQK'

Alienware:
regex: 'FBMD/(?:Alienware [0-9]{2,3}R[0-9]{1,2}|Area-51m|R3|R4|Alienware Aurora R[0-9]+(:? [0-9]+)?);'
device: 'desktop'
models:
- regex: 'Alienware 15R3;'
model: 'Alienware 15 R3'
- regex: 'Alienware 17R4;'
model: 'Alienware 17 R4'
- regex: 'Area-51m;'
model: 'Area-51m'
- regex: 'Aurora (R[0-9]+)'
model: 'Aurora $1'

Dell:
regex: 'FBMD/(?:Latitude E4300|Inspiron 3541|XPS 15 95[35]0);'
device: 'desktop'
Expand Down
Loading