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

Adds detection for Whale TV Browser, Cultraview, evvoli and Top-Tech brands, improves detection for various brands #7881

Merged
merged 20 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from 17 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
2 changes: 2 additions & 0 deletions Parser/Client/Browser.php
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ class Browser extends AbstractClientParser
'WB' => 'Wave Browser',
'WA' => 'Wavebox',
'WH' => 'Whale Browser',
'W2' => 'WhaleBrowser',
liviuconcioiu marked this conversation as resolved.
Show resolved Hide resolved
'WO' => 'wOSBrowser',
'3W' => 'w3m',
'WT' => 'WeTab Browser',
Expand Down Expand Up @@ -768,6 +769,7 @@ class Browser extends AbstractClientParser
'M9', 'F9', '0P', '0A', 'JR', 'D3', 'TK', 'BP', '2F',
'2M', 'K7', '1N', '8A', 'H7', 'X3', 'T4', 'X4', '5O',
'8C', '3M', '6I', '2P', 'PU', '7I', 'X5', 'AL', '3P',
'W2',
],
'Firefox' => [
'FF', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1',
Expand Down
5 changes: 4 additions & 1 deletion Parser/Device/AbstractDeviceParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ abstract class AbstractDeviceParser extends AbstractParser
'CU' => 'Cube',
'CB' => 'CUBOT',
'CUI' => 'Cuiud',
'CUL' => 'Cultraview',
'CV' => 'CVTE',
'CWO' => 'Cwowdefu',
'CX0' => 'CX',
Expand Down Expand Up @@ -575,6 +576,7 @@ abstract class AbstractDeviceParser extends AbstractParser
'EO' => 'Evolveo',
'0Q' => 'Evoo',
'5U' => 'EVPAD',
'EVV' => 'evvoli',
'E0' => 'EvroMedia',
'XE' => 'ExMobile',
'4Z' => 'Exmart',
Expand Down Expand Up @@ -1529,7 +1531,7 @@ abstract class AbstractDeviceParser extends AbstractParser
'SY' => 'Sanyo',
'SAN' => 'SANY',
'S9' => 'Savio',
'Y4' => 'SCBC',
'Y4' => 'TCL SCBC',
'CZ' => 'Schneider',
'SCO' => 'Scosmos',
'SC1' => 'Scoole',
Expand Down Expand Up @@ -1739,6 +1741,7 @@ abstract class AbstractDeviceParser extends AbstractParser
'TY' => 'Tooky',
'TYD' => 'TYD',
'TOO' => 'TOOGO',
'TPT' => 'Top-Tech',
'T9' => 'Top House',
'DK' => 'Topelotek',
'42' => 'Topway',
Expand Down
9 changes: 9 additions & 0 deletions Tests/Parser/Client/fixtures/browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10312,3 +10312,12 @@
family: Chrome
headers:
http-x-requested-with: com.cloaktp.browser
-
user_agent: Mozilla/5.0 (X11;Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.4280.88 Safari/537.36 Model/NT6904K (SKW690;WHALEOSSKWNT6904KTVP1;WHALEOS-SKW-NT6904KTV-1000051.000;;_TV_NT6904K_HHbrowser_2k22;) LaTivu_1.0.1_2022 CE-HTML/1.0 NETTV_4.6.0.1 SignOn/2.0 SmartTvA/5.0.0 WhaleTV/3.0 WhaleBrowser/1.1.933.1 en
client:
type: browser
name: WhaleBrowser
version: 1.1.933.1
engine: Blink
engine_version: 107.0.4280.88
family: Chrome
2 changes: 1 addition & 1 deletion Tests/fixtures/tv-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5876,7 +5876,7 @@
device:
type: tv
brand: TCL
model: 72563C
model: Smart TV (2020)
os_family: Other Smart TV
browser_family: Opera
-
Expand Down
306 changes: 306 additions & 0 deletions Tests/fixtures/tv-4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3027,3 +3027,309 @@
model: 32SN6000H
os_family: Android
browser_family: Unknown
-
user_agent: 'Opera/9.80 NETTV/4.5.0 Mozilla/5.0 (Linux armv7i; CE-HTML/1.0; U; en) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.75 Safari/537.36 Tbrowser/2.0 TV/V8-S586T02-LF1V299 (THOMSON,55UD66*6,wired)'
os:
name: GNU/Linux
version: ""
platform: ARM
client:
type: browser
name: T-Browser
version: "2.0"
engine: Blink
engine_version: 49.0.2623.75
device:
type: tv
brand: Thomson
model: 55UD66
os_family: GNU/Linux
browser_family: Chrome
-
user_agent: Opera/9.80 NETTV/4.5.0 Mozilla/5.0 (Linux armv7i; CE-HTML/1.0; U; en) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.75 Safari/537.36 NETRANGEMMH Tbrowser/2.0 TV/V8-NT563LA-LF1V430 (MIRAY,32D1240,wired)
os:
name: GNU/Linux
version: ""
platform: ARM
client:
type: browser
name: T-Browser
version: "2.0"
engine: Blink
engine_version: 49.0.2623.75
device:
type: tv
brand: Miray
model: 32D1240
os_family: GNU/Linux
browser_family: Chrome
-
user_agent: Zeasn/2.0 NETTV/4.5.0 Mozilla/5.0 (Linux;CE-HTML/1.0;U;en), Chrome/49.0.2623.87 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_UNKONWN/V8-NT563AM-LF1V033 (ESSENTIEL B,32A6000,wireless)
os:
name: Whale OS
version: "1"
platform: ""
client:
type: browser
name: T-Browser
version: "2.0"
engine: Blink
engine_version: 49.0.2623.87
device:
type: tv
brand: Essentielb
model: 32A6000
os_family: Other Smart TV
browser_family: Chrome
-
user_agent: Opera/9.80 NETTV/4.5.0 Mozilla/5.0 (Linux armv7i; CE-HTML/1.0; U; en) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.75 Safari/537.36 Tbrowser/2.0 _TV_NT563/V8-NT563AM-LF1V054 (MANTA,32D2040,wireless)
os:
name: GNU/Linux
version: ""
platform: ARM
client:
type: browser
name: T-Browser
version: "2.0"
engine: Blink
engine_version: 49.0.2623.75
device:
type: tv
brand: Manta Multimedia
model: 32D2040
os_family: GNU/Linux
browser_family: Chrome
-
user_agent: Opera/9.80 NETTV/4.5.0 Mozilla/5.0 (Linux armv7i; CE-HTML/1.0; U; en) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.75 Safari/537.36 NETRANGEMMH Tbrowser/2.0 TV/V8-NT563LA-LF1V430 (MASTER-G,43D1240,wireless)
os:
name: GNU/Linux
version: ""
platform: ARM
client:
type: browser
name: T-Browser
version: "2.0"
engine: Blink
engine_version: 49.0.2623.75
device:
type: tv
brand: Master-G
model: 43D1240
os_family: GNU/Linux
browser_family: Chrome
-
user_agent: Zeasn/2.0 NETTV/4.5.0 Mozilla/5.0 (Linux;CE-HTML/1.0;U;en), Chrome/49.0.2623.87 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_UNKONWN/V8-NT563LA-LF1V270 (EVVOLI,32EV200DS,wireless)
os:
name: Whale OS
version: "1"
platform: ""
client:
type: browser
name: T-Browser
version: "2.0"
engine: Blink
engine_version: 49.0.2623.87
device:
type: tv
brand: evvoli
model: 32EV200DS
os_family: Other Smart TV
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.120 Safari/537.36 OPR/46.0.2207.0 OMI/4.20.4.54.Nebula.11 Model/Tango-NT72671(AOC;50U6305/43I;205.002.153.001;_TV_NT72671_Cosmos_2k20) SignOn/2.0 WhaleTV/2.0 NETTV/4.6.0.1 SmartTvA/5.0.0 es
os:
name: Whale OS
version: "2.0"
platform: ARM
client:
type: browser
name: Opera Devices
version: 4.20.4.54
engine: Blink
engine_version: 77.0.3865.120
device:
type: tv
brand: AOC
model: 50U6305/43I
os_family: Other Smart TV
browser_family: Opera
-
user_agent: Mozilla/5.0 (Linux; Andr0id 11.0; TPM191E Build/RTT2.211108.001) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.112 Safari/537.36 OPR/32.0.2128.0 OMI/4.8.0.129.Typhoon2.10(;Philips;50PUS7304/62;TPM191E_R.201.000.248.227;_TV_5599;) CE-HTML/1.0 NETTV/9.0.0 SmartTvA/5.0.0 WH/1.0
os:
name: Whale OS
version: "1.0"
platform: ""
client:
type: browser
name: Opera Devices
version: 4.8.0.129
engine: Blink
engine_version: 49.0.2623.112
device:
type: tv
brand: Philips
model: 50PUS7304/62
os_family: Other Smart TV
browser_family: Opera
-
user_agent: Mozilla/5.0 (Linux; Andr0id 11.0; TPM191E Build/RTT2.211108.001) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.112 Safari/537.36 OPR/32.0.2128.0 OMI/4.8.0.129.Typhoon2.10(;Philips;50PUS8505/62;TPM191E_R.201.000.248.227;_TV_5599;) CE-HTML/1.0 NETTV/9.0.0 SmartTvA/5.0.0 WH/1.0
os:
name: Whale OS
version: "1.0"
platform: ""
client:
type: browser
name: Opera Devices
version: 4.8.0.129
engine: Blink
engine_version: 49.0.2623.112
device:
type: tv
brand: Philips
model: 50PUS8505/62
os_family: Other Smart TV
browser_family: Opera
-
user_agent: Mozilla/5.0 (Linux; Andr0id 8.0; TPM171E Build/OC) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.112 Safari/537.36 OPR/32.0.2128.0 OMI/4.8.0.129.Sprinter6.112(;Philips;49PUS7002/62;TPM171E_R.107.001.143.000;_TV_5596;) CE-HTML/1.0 NETTV/8.0.2 SmartTvA/5.0.0
os:
name: Android TV
version: "8.0"
platform: ""
client:
type: browser
name: Opera Devices
version: 4.8.0.129
engine: Blink
engine_version: 49.0.2623.112
device:
type: tv
brand: Philips
model: 49PUS7002/62
os_family: Android
browser_family: Opera
-
user_agent: 'Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.120 Safari/537.36 OPR/46.0.2207.0 OMI/4.20.4.54.Elm.33 Model/ELM-NT72671D(TCL72671D;V8-NT671LA-LF1V603;T000.000.000.262_DM226.0.8_U1.0.129.17_A0.3.2 [2021-11-02 14:51:20];_TV_NT72671_Tbrowser_2k20) SignOn/2.0 WhaleTV/2.0 NETTV_4.6.0.1 en'
os:
name: Whale OS
version: "2.0"
platform: ARM
client:
type: browser
name: Opera Devices
version: 4.20.4.54
engine: Blink
engine_version: 77.0.3865.120
device:
type: tv
brand: TCL
model: Smart TV (2020)
os_family: Other Smart TV
browser_family: Opera
-
user_agent: 'Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.120 Safari/537.36 OPR/46.0.2207.0 OMI/4.20.4.54.Elm.33 Model/ELM-NT72671D(TCL72671D;V8-NT671LA-LF1V621;T000.000.000.266_DM226.0.8_U1.0.129.21_A0.3.2 [2022-01-07 10:37:03];_TV_NT72671_Tbrowser_2k20) SignOn/2.0 WhaleTV/2.0 NETTV_4.6.0.1 es'
os:
name: Whale OS
version: "2.0"
platform: ARM
client:
type: browser
name: Opera Devices
version: 4.20.4.54
engine: Blink
engine_version: 77.0.3865.120
device:
type: tv
brand: TCL
model: Smart TV (2020)
os_family: Other Smart TV
browser_family: Opera
-
user_agent: 'Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.120 Safari/537.36 OPR/46.0.2207.0 OMI/4.20.4.54.Elm.9 HbbTV/1.5.1 (+DRM; TCL72671D;V8-NT671LA-LF1V486;T000.000.000.218_DM100.2.29_U1.0.42.45_A0.0.38 [2021-04-21 14:44:20]; ;_TV_NT72671_TCL_SCBC_Tbrowser_2k20;) FVC/4.0 (TCL72671D;) LaTivu_1.0.1_2020 SignOn/2.0 WhaleTV/2.0 NETTV/4.6.0.1 es-MX'
os:
name: Whale OS
version: "2.0"
platform: ARM
client:
type: browser
name: Opera Devices
version: 4.20.4.54
engine: Blink
engine_version: 77.0.3865.120
device:
type: tv
brand: TCL SCBC
model: Smart TV (2020)
os_family: Other Smart TV
browser_family: Opera
-
user_agent: 'Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.120 Safari/537.36 OPR/46.0.2207.0 OMI/4.20.4.54.Elm.9 HbbTV/1.5.1 (+DRM; TCL72671D;V8-NT671LA-LF1V458;T000.000.000.207_DM100.2.26_U1.0.42.40_A0.0.38 [2021-03-26 14:36:55]; ;_TV_NT72671_TCL_SCBC_Tbrowser_2k20;) FVC/4.0 (TCL72671D;) LaTivu_1.0.1_2020 SignOn/2.0 WhaleTV/2.0 NETTV/4.6.0.1 es-MX'
os:
name: Whale OS
version: "2.0"
platform: ARM
client:
type: browser
name: Opera Devices
version: 4.20.4.54
engine: Blink
engine_version: 77.0.3865.120
device:
type: tv
brand: TCL SCBC
model: Smart TV (2020)
os_family: Other Smart TV
browser_family: Opera
-
user_agent: Mozilla/5.0 (X11;Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.4280.88 Safari/537.36 Model/NT6904K (SKW690;WHALEOSSKWNT6904KTVP1;WHALEOS-SKW-NT6904KTV-1000051.000;;_TV_NT6904K_HHbrowser_2k22;) LaTivu_1.0.1_2022 CE-HTML/1.0 NETTV_4.6.0.1 SignOn/2.0 SmartTvA/5.0.0 WhaleTV/3.0 WhaleBrowser/1.1.933.1 en
os:
name: Whale OS
version: "3.0"
platform: ARM
client:
type: browser
name: WhaleBrowser
version: 1.1.933.1
engine: Blink
engine_version: 107.0.4280.88
device:
type: tv
brand: Skyworth
model: Smart TV (2022)
os_family: Other Smart TV
browser_family: Chrome
-
user_agent: Mozilla/5.0 (X11;Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4280.88 Safari/537.36 Model/NT726902K (Toptech690;WHALEOSDKNT6902KTVP41;WHALEOS-DK-NT6902KTV-0000082.000;;_TV_NT726902K_HHbrowser_2k22;) LaTivu_1.0.1_2022 CE-HTML/1.0 NETTV_4.6.0.1 SignOn/2.0 SmartTvA/5.0.0 WhaleTV/3.0 WhaleBrowser/1.3.240509.0 en
os:
name: Whale OS
version: "3.0"
platform: ARM
client:
type: browser
name: WhaleBrowser
version: 1.3.240509.0
engine: Blink
engine_version: 97.0.4280.88
device:
type: tv
brand: Top-Tech
model: Smart TV (2022)
os_family: Other Smart TV
browser_family: Chrome
-
user_agent: Mozilla/5.0 (X11;Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4280.88 Safari/537.36 Model/NT726902K (Cultraview690;WHALEOSJRXNT6902KTVP66;WHALEOS-DK-NT6902KTV-0000040.000;;_TV_NT726902K_HHbrowser_2k22;) LaTivu_1.0.1_2022 CE-HTML/1.0 NETTV_4.6.0.1 SignOn/2.0 SmartTvA/5.0.0 WhaleTV/3.0 WhaleBrowser/1.3.21.5 en
os:
name: Whale OS
version: "3.0"
platform: ARM
client:
type: browser
name: WhaleBrowser
version: 1.3.21.5
engine: Blink
engine_version: 97.0.4280.88
device:
type: tv
brand: Cultraview
model: Smart TV (2022)
os_family: Other Smart TV
browser_family: Chrome
4 changes: 2 additions & 2 deletions Tests/fixtures/tv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8408,7 +8408,7 @@
engine_version: 39.0.2171.71
device:
type: tv
brand: SCBC
brand: TCL SCBC
model: SCBC586
os_family: GNU/Linux
browser_family: Chrome
Expand All @@ -8426,7 +8426,7 @@
engine_version: 39.0.2171.71
device:
type: tv
brand: SCBC
brand: TCL SCBC
model: 43D1850
os_family: GNU/Linux
browser_family: Chrome
Expand Down
Loading
Loading