From e447b0d9ba2222a11fd03a032b2e4d45ef617e89 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 09:58:08 +0100 Subject: [PATCH 01/19] Improves detection for Thomson devices ref #7880 --- Tests/fixtures/tv-4.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 78ad26124a..a4c39e5524 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3027,3 +3027,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index bd399c3503..e9e7208a1b 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -23828,7 +23828,7 @@ Thomson: - regex: 'THOMSON[ _]SEREA500' device: 'smartphone' model: 'Serea 500' - - regex: '((?:49|55)UC6306|55UC63|32HD55|40FD54|55UD63)' + - regex: 'THOMSON,([a-z0-9_ \-]+)(?:\*[0-9])?,(?:wired|wireless)' device: 'tv' model: '$1' From 390c74e0f240ac63feab5d2cc16f1a4b0dd1ce1b Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 10:05:34 +0100 Subject: [PATCH 02/19] Improves detection for Miray devices ref #7880 --- Tests/fixtures/tv-4.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index a4c39e5524..026fb6b037 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3045,3 +3045,21 @@ 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: smartphone + brand: Miray + model: 32D1240 + os_family: GNU/Linux + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index e9e7208a1b..7c4b5706a0 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -17254,7 +17254,7 @@ Mio: # Miray Miray: - regex: 'MIDM[_-]|MPM[_-]|TPM4G_WT8' + regex: 'MIRAY[;,]|MIDM[_-]|MPM[_-]|TPM4G_WT8' device: 'smartphone' models: - regex: 'TPM4G_WT8' @@ -17265,6 +17265,8 @@ Miray: device: 'tablet' - regex: 'MPM[_-]([a-z0-9]+)' model: 'MPM $1' + - regex: 'MIRAY,([a-z0-9_ \-]+),(?:wired|wireless)' + model: '$1' # mitsubishi Mitsubishi: From 8602cdb2edd7a999aca25ca9de2a99c1eababee3 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 10:08:29 +0100 Subject: [PATCH 03/19] Improves detection for Essentielb devices ref #7880 --- Tests/fixtures/tv-4.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 026fb6b037..176bb79946 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3063,3 +3063,21 @@ 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: smartphone + brand: Essentielb + model: 32A6000 + os_family: Other Smart TV + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 7c4b5706a0..3e4a173268 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -8032,7 +8032,7 @@ Eton: # Essentielb Essentielb: - regex: '(?:Wooze[_ ]?(?:I55?|I45|X?L)|HEYOU(?:[135]|20PLUS|[1-7]0))(?:[);/ ]|$)' + regex: 'ESSENTIEL B[;,]|(?:Wooze[_ ]?(?:I55?|I45|X?L)|HEYOU(?:[135]|20PLUS|[1-7]0))(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'HEYOU20PLUS(?:[);/ ]|$)' @@ -8041,6 +8041,8 @@ Essentielb: model: 'HEYou $1' - regex: 'Wooze[_ ]?((?:I55?|I45|X?L))(?:[);/ ]|$)' model: 'Wooze $1' + - regex: 'ESSENTIEL B,([a-z0-9_ \-]+),(?:wired|wireless)' + model: '$1' # Facebook Facebook: From d50049ea48aa0316032205692393217c98a5b2dd Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 10:10:40 +0100 Subject: [PATCH 04/19] Improves detection for Manta Multimedia devices ref #7880 --- Tests/fixtures/tv-4.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 176bb79946..a08a2d540a 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3081,3 +3081,21 @@ 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: smartphone + brand: Manta Multimedia + model: 32D2040 + os_family: GNU/Linux + browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 3e4a173268..b023982f8e 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -16788,7 +16788,7 @@ Mpman: # Manta Multimedia or Manta Manta Multimedia: - regex: 'MSP950(1[245]|2[01])|MSP96017|MSP94501|MSP95009|MSP96002|MSP450[79]|((? Date: Tue, 29 Oct 2024 10:17:50 +0100 Subject: [PATCH 05/19] Improves detection for Master-G devices ref #7880 --- Tests/fixtures/tv-4.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 17 +++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index a08a2d540a..2282ce3894 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3099,3 +3099,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index b023982f8e..3cad8f9185 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -36090,6 +36090,17 @@ NEVIR: device: 'tv' model: '$1' +# Master-G +Master-G: + regex: 'MASTER-G[;,]|NEOQC4G(?:[);/ ]|$)' + device: 'tablet' + models: + - regex: 'NEOQC4G' + model: 'GPad Neo QC 4G' + - regex: 'MASTER-G,([a-z0-9_ \-]+),(?:wired|wireless)' + device: 'tv' + model: '$1' + # philips Philips: regex: 'Philips|NETTV/|2020/2021 UHD Android|10BDL4151T|Xenium S[25]66|(?:PI3210G|TPM1[79]1E|70PUH6774_96|QM152E|QM16[134]E|TLE(?:821L|722G)|AND1E|S397|W5510|S410J)(?:[);/ ]|$)' @@ -40235,12 +40246,6 @@ iYou: device: 'smartphone' model: '$1' -# Master-G -Master-G: - regex: 'NEOQC4G(?:[);/ ]|$)' - device: 'tablet' - model: 'GPad Neo QC 4G' - # Sewoo post terminals Sewoo: regex: '(NBP-60)(?:[);/ ]|$)' From b0d8db5870a724651843249e7a64f75cdc65f7e9 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 10:18:33 +0100 Subject: [PATCH 06/19] Fix device type --- Tests/fixtures/tv-4.yml | 6 +++--- regexes/device/mobiles.yml | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 2282ce3894..d061dc8503 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3058,7 +3058,7 @@ engine: Blink engine_version: 49.0.2623.75 device: - type: smartphone + type: tv brand: Miray model: 32D1240 os_family: GNU/Linux @@ -3076,7 +3076,7 @@ engine: Blink engine_version: 49.0.2623.87 device: - type: smartphone + type: tv brand: Essentielb model: 32A6000 os_family: Other Smart TV @@ -3094,7 +3094,7 @@ engine: Blink engine_version: 49.0.2623.75 device: - type: smartphone + type: tv brand: Manta Multimedia model: 32D2040 os_family: GNU/Linux diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 3cad8f9185..9bbe2847c8 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -8042,6 +8042,7 @@ Essentielb: - regex: 'Wooze[_ ]?((?:I55?|I45|X?L))(?:[);/ ]|$)' model: 'Wooze $1' - regex: 'ESSENTIEL B,([a-z0-9_ \-]+),(?:wired|wireless)' + device: 'tv' model: '$1' # Facebook @@ -16813,6 +16814,7 @@ Manta Multimedia: - regex: '(MSP450[79]|MSP95009)(?:[);/ ]|$)' model: '$1' - regex: 'MANTA,([a-z0-9_ \-]+),(?:wired|wireless)' + device: 'tv' model: '$1' # Masstel (masstel.vn) @@ -17270,6 +17272,7 @@ Miray: - regex: 'MPM[_-]([a-z0-9]+)' model: 'MPM $1' - regex: 'MIRAY,([a-z0-9_ \-]+),(?:wired|wireless)' + device: 'tv' model: '$1' # mitsubishi From 0a9f262fb26e8a4e8652dd4350ba8f785c45b185 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 10:40:14 +0100 Subject: [PATCH 07/19] Adds detection for evvoli brand ref #7880 --- Parser/Device/AbstractDeviceParser.php | 1 + Tests/fixtures/tv-4.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 8 ++++++++ 3 files changed, 27 insertions(+) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 0695f2643e..25d06c7b28 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -575,6 +575,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'EO' => 'Evolveo', '0Q' => 'Evoo', '5U' => 'EVPAD', + 'EVV' => 'evvoli', 'E0' => 'EvroMedia', 'XE' => 'ExMobile', '4Z' => 'Exmart', diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index d061dc8503..1be3cd0c24 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3117,3 +3117,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9bbe2847c8..9901ed2eef 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -8921,6 +8921,14 @@ EVPAD: - regex: 'EVPAD-PRO-MAX' model: 'EVBox Pro Max' +# evvoli (https://evvoli.com/) +evvoli: + regex: 'EVVOLI[;,]' + device: 'tv' + models: + - regex: 'EVVOLI,([a-z0-9_ \-]+),(?:wired|wireless)' + model: '$1' + # EvroMedia EvroMedia: regex: 'EVROMEDIA|Playpad[ _]|PLAY_PAD_PRO_XL|3G NOTE XL' From 5fdb373cbbb92373325c7203ff180a6a3a888d56 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 10:44:04 +0100 Subject: [PATCH 08/19] Improves detection for AOC devices ref #7880 --- Tests/fixtures/tv-4.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 1be3cd0c24..2ff56b7539 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3135,3 +3135,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9901ed2eef..bcea1fa652 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -3460,7 +3460,7 @@ ANS: # AOC (https://www.aoc.com/) AOC: - regex: 'AOC,|(?:Q10107L-ME)(?:[);/ ]|$)' + regex: 'AOC[;,]|(?:Q10107L-ME)(?:[);/ ]|$)' device: 'tv' models: - regex: '(Q10107L-ME)(?:[);/ ]|$)' @@ -3468,6 +3468,8 @@ AOC: model: '$1' - regex: '(LE(?:32|43)S5970(?:s)?-(?:20|28|30)|LE55U7970-30|LE43S5977-20|U60856)' model: '$1' + - regex: 'AOC;([a-z0-9_ \-/]+);' + model: '$1' # Assistant Assistant: From 1e0c9d286b2532d36ffc2f6acded4cd82761901b Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 10:51:55 +0100 Subject: [PATCH 09/19] Improves detection for Philips devices ref #7880 --- Tests/fixtures/tv-4.yml | 54 ++++++++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 3 +++ 2 files changed, 57 insertions(+) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 2ff56b7539..716b959d8e 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3153,3 +3153,57 @@ 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: Android TV + version: "11.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: Android + 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: Android TV + version: "11.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: Android + 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index bcea1fa652..72d4f16813 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -36119,6 +36119,9 @@ Philips: regex: 'Philips|NETTV/|2020/2021 UHD Android|10BDL4151T|Xenium S[25]66|(?:PI3210G|TPM1[79]1E|70PUH6774_96|QM152E|QM16[134]E|TLE(?:821L|722G)|AND1E|S397|W5510|S410J)(?:[);/ ]|$)' device: 'smartphone' models: + - regex: 'Philips;([a-z0-9_ \-/]+);' + model: '$1' + device: 'tv' - regex: '(10BDL4151T)' device: 'smart display' model: '$1' From 95a8c247108188ceda97405100d003ca3f34f257 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 10:56:58 +0100 Subject: [PATCH 10/19] Improves detection for Whale OS ref #7880 --- Tests/fixtures/tv-4.yml | 12 ++++++------ regexes/oss.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 716b959d8e..309dc34f49 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3156,8 +3156,8 @@ - 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: Android TV - version: "11.0" + name: Whale OS + version: "1.0" platform: "" client: type: browser @@ -3169,13 +3169,13 @@ type: tv brand: Philips model: 50PUS7304/62 - os_family: Android + 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: Android TV - version: "11.0" + name: Whale OS + version: "1.0" platform: "" client: type: browser @@ -3187,7 +3187,7 @@ type: tv brand: Philips model: 50PUS8505/62 - os_family: Android + 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 diff --git a/regexes/oss.yml b/regexes/oss.yml index cebd8cd139..d12ce387ec 100644 --- a/regexes/oss.yml +++ b/regexes/oss.yml @@ -463,7 +463,7 @@ ########## # Whale OS (https://www.zeasn.com/) ########## -- regex: '(?:WH|WhaleTV/)(\d+[\.\d]+)' +- regex: '(?:WH|WhaleTV)/?(\d+[\.\d]+)' name: 'Whale OS' version: '$1' From 6f0af4f04b9d1c99ff5e452c47d9c9f354b6f477 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 19:08:01 +0100 Subject: [PATCH 11/19] Improves detection for TCL devices ref #7880 --- Tests/fixtures/tv-2.yml | 2 +- Tests/fixtures/tv-4.yml | 36 ++++++++++++++++++++++++++++++++++++ regexes/device/mobiles.yml | 7 +++---- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index 40a2cb2dd3..0b8a00279d 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -5876,7 +5876,7 @@ device: type: tv brand: TCL - model: 72563C + model: Smart TV (2020) os_family: Other Smart TV browser_family: Opera - diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 309dc34f49..959f3ded36 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3207,3 +3207,39 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 72d4f16813..8d517d496b 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -21066,7 +21066,7 @@ Pentagram: # Tcl (tcl.com) TCL: - regex: 'TCL,|smarttv_AFTMM-TCL|AFTMD002|AFTSHN02|AFTMD001|TCL[_ -][a-z0-9]+|(?:TCL[_ -][^;/]+ Build)|TCL72563C|(?:TCLGalaG60(?:\(9108A\))?|4163D|4187[DMU]|4188[CLRSVO]|5004S|5033TP|5087Z|5101A|5102[BKLMOP]|5107G|5124J|5130[JMEI]|5133MP|5133A|5148A|5152D|5159[AJ]|5164[AD]|5199I|6102[ADH]|6125[ADFH]|6127[AI]|6156[ADH]|6159[AK]|6165[AHS]|7040N|8491X|9048S|9060[GX]|9080G|9081X|9295G|9296[GQ]|A(?:50[2789]|600)DL|T(?:60[123]|701)DL|T(?:506D|671[EFGHO]|676[HJK]|766[AHJSU]|767[GHW]|770[BH]|771K|773O|774[BH]|775[BH]|776[HO]|779W|780H|781SPP|781S|781|782H|790[SY]|799[BH]|810[HS])|Percee TV|9183W|9198S|9309X2|9317X1|8[14]96G|916[016]G| 9061| 8182| 8167| 8095|BeyondTV\d?|UnionTV|T507U|5131[AG]|T610[KE]|T612B|9132[GS]|9137W|T430W|T431[DUQ]|T501[CL]|T768S|9494G|9460G|9466X|T60[79]DL)(?:_(?:RU|EEA|TR))?(?:[);/ ]|$)' + regex: 'TCL,|TCL[a-z0-9]+;|smarttv_AFTMM-TCL|AFTMD002|AFTSHN02|AFTMD001|TCL[_ -][a-z0-9]+|(?:TCL[_ -][^;/]+ Build)|(?:TCLGalaG60(?:\(9108A\))?|4163D|4187[DMU]|4188[CLRSVO]|5004S|5033TP|5087Z|5101A|5102[BKLMOP]|5107G|5124J|5130[JMEI]|5133MP|5133A|5148A|5152D|5159[AJ]|5164[AD]|5199I|6102[ADH]|6125[ADFH]|6127[AI]|6156[ADH]|6159[AK]|6165[AHS]|7040N|8491X|9048S|9060[GX]|9080G|9081X|9295G|9296[GQ]|A(?:50[2789]|600)DL|T(?:60[123]|701)DL|T(?:506D|671[EFGHO]|676[HJK]|766[AHJSU]|767[GHW]|770[BH]|771K|773O|774[BH]|775[BH]|776[HO]|779W|780H|781SPP|781S|781|782H|790[SY]|799[BH]|810[HS])|Percee TV|9183W|9198S|9309X2|9317X1|8[14]96G|916[016]G| 9061| 8182| 8167| 8095|BeyondTV\d?|UnionTV|T507U|5131[AG]|T610[KE]|T612B|9132[GS]|9137W|T430W|T431[DUQ]|T501[CL]|T768S|9494G|9460G|9466X|T60[79]DL)(?:_(?:RU|EEA|TR))?(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'TCLGalaG60(?:\(9108A\))?(?:[);/ ]|$)' @@ -21303,9 +21303,8 @@ TCL: - regex: '((?:43|55)S62FS|(?:43|50)P65US|U(?:43|60|65)P60|65P4USM|(?:40|49)S62|L32S6|55P610|50P8S|55S62|(?:43|50)P6US|55DP60)' device: 'tv' model: '$1' - - regex: 'TCL72563C' - device: 'tv' - model: '72563C' + - regex: '_TV_[A-Z0-9]+_Tbrowser_2k20' + model: 'Smart TV (2020)' - regex: 'smarttv_AFTMM-TCL-TS8011' device: 'tv' model: 'TS8011' From 18deda109195e931c583f151266f86c35a0f1810 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 19:17:59 +0100 Subject: [PATCH 12/19] Improves detection for SCBC devices ref #7880 --- Tests/fixtures/tv-4.yml | 36 ++++++++++++++++++++++++++++++++++ regexes/device/televisions.yml | 22 +++++++++++---------- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 959f3ded36..619765fa5e 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3243,3 +3243,39 @@ 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: 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: SCBC + model: Smart TV (2020) + os_family: Other Smart TV + browser_family: Opera diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml index bf8f6524f8..6bb09f9dc6 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -814,6 +814,18 @@ PEAQ: device: 'tv' model: '' +# SCBC +SCBC: + regex: 'SCBC[;,]|_TV_[A-Z0-9_]+_TCL_SCBC' + device: 'tv' + models: + - regex: 'SCBC586' + model: 'SCBC586' + - regex: '43D1850' + model: '43D1850' + - regex: '_TV_[A-Z0-9]+_TCL_SCBC_Tbrowser_2k20' + model: 'Smart TV (2020)' + # Philips Philips: regex: 'Philips|NETTV/' @@ -890,16 +902,6 @@ Samsung: - regex: 'Maple_2011' model: 'Smart TV (2011)' -# SCBC -SCBC: - regex: 'SCBC[;,]' - device: 'tv' - models: - - regex: 'SCBC586' - model: 'SCBC586' - - regex: '43D1850' - model: '43D1850' - # SEG SEG: regex: 'SEG[;,]' From a302c98b9afffe678a66e8703c33264c17d0d957 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 19:34:25 +0100 Subject: [PATCH 13/19] Adds detection for WhaleBrowser ref #7880 --- Parser/Client/Browser.php | 2 ++ Tests/Parser/Client/fixtures/browser.yml | 9 +++++++++ regexes/client/browsers.yml | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php index ea56416fb1..3d67b99644 100644 --- a/Parser/Client/Browser.php +++ b/Parser/Client/Browser.php @@ -684,6 +684,7 @@ class Browser extends AbstractClientParser 'WB' => 'Wave Browser', 'WA' => 'Wavebox', 'WH' => 'Whale Browser', + 'W2' => 'WhaleBrowser', 'WO' => 'wOSBrowser', '3W' => 'w3m', 'WT' => 'WeTab Browser', @@ -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', diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml index 0f4bcddd5e..3c2ac1041b 100644 --- a/Tests/Parser/Client/fixtures/browser.yml +++ b/Tests/Parser/Client/fixtures/browser.yml @@ -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 diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml index 77cd1ada1a..89462422a3 100644 --- a/regexes/client/browsers.yml +++ b/regexes/client/browsers.yml @@ -1109,6 +1109,13 @@ engine: default: 'Blink' +# WhaleBrowser (https://partner.zeasn.com/partnerportal/TestingTools/index.jhtml) +- regex: 'WhaleBrowser/(\d+[\.\d]+)' + name: 'WhaleBrowser' + version: '$1' + engine: + default: 'Blink' + # SFive (https://sfive.vn/) - regex: 'SFive(?:_Android)?/.+ Chrome/(\d+[\.\d]+)' name: 'SFive' From 81458511b1694011cb0deee3d03e4070e2c6991c Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 19:35:36 +0100 Subject: [PATCH 14/19] Improves detection for Skyworth devices ref #7880 --- Tests/fixtures/tv-4.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 619765fa5e..a3804f782f 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3279,3 +3279,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 8d517d496b..9ba442599a 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -23581,7 +23581,7 @@ Sky: # Skyworth or SWTV Skyworth: - regex: 'Sky_?worth|SWTV-|(?:FlowBox-F1|SWTV|SW-22AE NF)(?:[);/ ]|$)' + regex: 'Sky_?worth|SWTV-|SKW690|(?:FlowBox-F1|SWTV|SW-22AE NF)(?:[);/ ]|$)' device: 'tv' models: - regex: 'FlowBox-F1' @@ -23592,6 +23592,8 @@ Skyworth: model: '$1' - regex: 'Sky_?worth ([^;/)]+)(?: Build|[;)])' model: '$1' + - regex: 'LaTivu_(?:\d+[\.\d]+)_([0-9]{4})' + model: 'Smart TV ($1)' # Smartfren Smartfren: From 3bfe32b0289de1c6898b07ff92fd43aa97c792fd Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 19:40:36 +0100 Subject: [PATCH 15/19] Adds detection for Top-Tech brand ref #7880 --- Parser/Device/AbstractDeviceParser.php | 1 + Tests/fixtures/tv-4.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 8 ++++++++ 3 files changed, 27 insertions(+) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 25d06c7b28..04b0e57910 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1740,6 +1740,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'TY' => 'Tooky', 'TYD' => 'TYD', 'TOO' => 'TOOGO', + 'TPT' => 'Top-Tech', 'T9' => 'Top House', 'DK' => 'Topelotek', '42' => 'Topway', diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index a3804f782f..57187ee4f3 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3297,3 +3297,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9ba442599a..65ccfe5dd0 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -26320,6 +26320,14 @@ Tolino: device: 'tablet' model: 'Tolino Tab $1' +# Top-Tech +Top-Tech: + regex: 'Toptech690[;,]' + device: 'tv' + models: + - regex: 'LaTivu_(?:\d+[\.\d]+)_([0-9]{4})' + model: 'Smart TV ($1)' + # Top House Top House: regex: 'Coto[_ ]|X1013' From ebf6fca394db7c208c20956d27f8dde0e7472715 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 29 Oct 2024 19:43:33 +0100 Subject: [PATCH 16/19] Adds detection for Cultraview brand ref #7880 --- Parser/Device/AbstractDeviceParser.php | 1 + Tests/fixtures/tv-4.yml | 18 ++++++++++++++++++ regexes/device/mobiles.yml | 8 ++++++++ 3 files changed, 27 insertions(+) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 04b0e57910..4f4a08f65c 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -406,6 +406,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'CU' => 'Cube', 'CB' => 'CUBOT', 'CUI' => 'Cuiud', + 'CUL' => 'Cultraview', 'CV' => 'CVTE', 'CWO' => 'Cwowdefu', 'CX0' => 'CX', diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 57187ee4f3..d50e0fcb3b 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3315,3 +3315,21 @@ 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 diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 65ccfe5dd0..32772c39bb 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -41942,6 +41942,14 @@ Cuiud: - regex: 'Cuiud F7' model: 'F7' +# Cultraview (http://www.cultraview.com/) +Cultraview: + regex: 'Cultraview690[;,]' + device: 'tv' + models: + - regex: 'LaTivu_(?:\d+[\.\d]+)_([0-9]{4})' + model: 'Smart TV ($1)' + # Cidea or C idea (http://cidealife.com/ or https://www.cideatablet.com/) C Idea: regex: 'CM(?:[58]22|(?:85|78)00plus)(?:[);/ ]|$)' From 45bbaf4121feaaad3937fe137512dbe999b3e14a Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Wed, 30 Oct 2024 08:28:31 +0100 Subject: [PATCH 17/19] Rename TCL to TCL SCBC --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tv-4.yml | 4 ++-- Tests/fixtures/tv.yml | 4 ++-- regexes/device/televisions.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 4f4a08f65c..e0cfd0d22e 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1531,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', diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index d50e0fcb3b..072212625d 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3257,7 +3257,7 @@ engine_version: 77.0.3865.120 device: type: tv - brand: SCBC + brand: TCL SCBC model: Smart TV (2020) os_family: Other Smart TV browser_family: Opera @@ -3275,7 +3275,7 @@ engine_version: 77.0.3865.120 device: type: tv - brand: SCBC + brand: TCL SCBC model: Smart TV (2020) os_family: Other Smart TV browser_family: Opera diff --git a/Tests/fixtures/tv.yml b/Tests/fixtures/tv.yml index ca44f18c76..d9e347112d 100644 --- a/Tests/fixtures/tv.yml +++ b/Tests/fixtures/tv.yml @@ -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 @@ -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 diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml index 6bb09f9dc6..4c7239fd11 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -814,8 +814,8 @@ PEAQ: device: 'tv' model: '' -# SCBC -SCBC: +# TCL SCBC +TCL SCBC: regex: 'SCBC[;,]|_TV_[A-Z0-9_]+_TCL_SCBC' device: 'tv' models: From cfc3364e6ba7b01e13348c2dc1b7374f77af0974 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Wed, 30 Oct 2024 11:53:25 +0100 Subject: [PATCH 18/19] Rename WhaleBrowser to Whale TV Browser --- Parser/Client/Browser.php | 2 +- Tests/Parser/Client/fixtures/browser.yml | 2 +- regexes/client/browsers.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php index 3d67b99644..ecf23b178f 100644 --- a/Parser/Client/Browser.php +++ b/Parser/Client/Browser.php @@ -684,7 +684,7 @@ class Browser extends AbstractClientParser 'WB' => 'Wave Browser', 'WA' => 'Wavebox', 'WH' => 'Whale Browser', - 'W2' => 'WhaleBrowser', + 'W2' => 'Whale TV Browser', 'WO' => 'wOSBrowser', '3W' => 'w3m', 'WT' => 'WeTab Browser', diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml index 3c2ac1041b..c8152ed87c 100644 --- a/Tests/Parser/Client/fixtures/browser.yml +++ b/Tests/Parser/Client/fixtures/browser.yml @@ -10316,7 +10316,7 @@ 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 + name: Whale TV Browser version: 1.1.933.1 engine: Blink engine_version: 107.0.4280.88 diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml index 89462422a3..4377c33afc 100644 --- a/regexes/client/browsers.yml +++ b/regexes/client/browsers.yml @@ -1109,9 +1109,9 @@ engine: default: 'Blink' -# WhaleBrowser (https://partner.zeasn.com/partnerportal/TestingTools/index.jhtml) +# Whale TV Browser (https://partner.zeasn.com/partnerportal/TestingTools/index.jhtml) - regex: 'WhaleBrowser/(\d+[\.\d]+)' - name: 'WhaleBrowser' + name: 'Whale TV Browser' version: '$1' engine: default: 'Blink' From 88886881c4cf6bb6fc6db4bc6089d673fc608757 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Wed, 30 Oct 2024 11:57:51 +0100 Subject: [PATCH 19/19] Fix --- Tests/fixtures/tv-4.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 072212625d..e2d8a439dc 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -3287,7 +3287,7 @@ platform: ARM client: type: browser - name: WhaleBrowser + name: Whale TV Browser version: 1.1.933.1 engine: Blink engine_version: 107.0.4280.88 @@ -3305,7 +3305,7 @@ platform: ARM client: type: browser - name: WhaleBrowser + name: Whale TV Browser version: 1.3.240509.0 engine: Blink engine_version: 97.0.4280.88 @@ -3323,7 +3323,7 @@ platform: ARM client: type: browser - name: WhaleBrowser + name: Whale TV Browser version: 1.3.21.5 engine: Blink engine_version: 97.0.4280.88