diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 89ef139403..89009fe7a2 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1108,7 +1108,6 @@ abstract class AbstractDeviceParser extends AbstractParser '0M' => 'Mecool', 'MEM' => 'MeMobile', 'MC' => 'Mediacom', - 'MK' => 'MediaTek', 'MD' => 'Medion', 'M2' => 'MEEG', 'MEG' => 'MEGA VISION', @@ -1592,6 +1591,7 @@ abstract class AbstractDeviceParser extends AbstractParser '19' => 'Smailo', 'SR' => 'Smart Electronic', 'SMA' => 'Smart Kassel', + 'STE' => 'Smart Tech', '49' => 'Smart', '47' => 'SmartBook', '3B' => 'Smartab', diff --git a/Parser/OperatingSystem.php b/Parser/OperatingSystem.php index 49941857e6..c7d45f0dd7 100644 --- a/Parser/OperatingSystem.php +++ b/Parser/OperatingSystem.php @@ -177,6 +177,7 @@ class OperatingSystem extends AbstractParser 'RRS' => 'Resurrection Remix OS', 'REX' => 'REX', 'RZD' => 'RazoDroiD', + 'RXT' => 'RTOS & Next', 'SAB' => 'Sabayon', 'SSE' => 'SUSE', 'SAF' => 'Sailfish OS', @@ -262,7 +263,7 @@ class OperatingSystem extends AbstractParser 'Mac' => ['MAC'], 'Mobile Gaming Console' => ['PSP', 'NDS', 'XBX'], 'OpenVMS' => ['OVS'], - 'Real-time OS' => ['MTK', 'TDX', 'MRE', 'JME', 'REX'], + 'Real-time OS' => ['MTK', 'TDX', 'MRE', 'JME', 'REX', 'RXT'], 'Other Mobile' => ['WOS', 'POS', 'SBA', 'TIZ', 'SMG', 'MAE', 'LUN', 'GEO'], 'Symbian' => ['SYM', 'SYS', 'SY3', 'S60', 'S40'], 'Unix' => [ diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml index a7ea72cc1a..adeb002575 100644 --- a/Tests/Parser/fixtures/oss.yml +++ b/Tests/Parser/fixtures/oss.yml @@ -5805,6 +5805,14 @@ version: "2" platform: x64 family: GNU/Linux +- + user_agent: NEXT 64_VLC/3.0.14 LibVLC/3.0.14 + os: + name: 'RTOS & Next' + short_name: RXT + version: "" + platform: "" + family: Real-time OS - user_agent: 14/tclwebkit1.0.2 os: diff --git a/Tests/fixtures/mediaplayer.yml b/Tests/fixtures/mediaplayer.yml index cd55a4dcda..e6b8605408 100644 --- a/Tests/fixtures/mediaplayer.yml +++ b/Tests/fixtures/mediaplayer.yml @@ -304,3 +304,83 @@ model: "" os_family: Windows browser_family: Unknown +- + user_agent: NEXT 2000 HD FTA_VLC/3.0.14 LibVLC/3.0.14 + os: + name: 'RTOS & Next' + version: "" + platform: "" + client: + type: mediaplayer + name: VLC + version: 3.0.14 + device: + type: tv + brand: 'Next & NextStar' + model: 2000 HD FTA + os_family: Real-time OS + browser_family: Unknown +- + user_agent: NEXT 2000-HD_VLC/3.0.14 LibVLC/3.0.14 + os: + name: 'RTOS & Next' + version: "" + platform: "" + client: + type: mediaplayer + name: VLC + version: 3.0.14 + device: + type: tv + brand: 'Next & NextStar' + model: 2000 HD + os_family: Real-time OS + browser_family: Unknown +- + user_agent: NEXT 64_VLC/3.0.14 LibVLC/3.0.14 + os: + name: 'RTOS & Next' + version: "" + platform: "" + client: + type: mediaplayer + name: VLC + version: 3.0.14 + device: + type: tv + brand: 'Next & NextStar' + model: "64" + os_family: Real-time OS + browser_family: Unknown +- + user_agent: NEXT YE-2000HD CX_VLC/3.0.14 LibVLC/3.0.14 + os: + name: 'RTOS & Next' + version: "" + platform: "" + client: + type: mediaplayer + name: VLC + version: 3.0.14 + device: + type: tv + brand: 'Next & NextStar' + model: YE-2000HD CX + os_family: Real-time OS + browser_family: Unknown +- + user_agent: NEXT YE-2000 USB_VLC/3.0.14 LibVLC/3.0.14 + os: + name: 'RTOS & Next' + version: "" + platform: "" + client: + type: mediaplayer + name: VLC + version: 3.0.14 + device: + type: tv + brand: 'Next & NextStar' + model: YE-2000 USB + os_family: Real-time OS + browser_family: Unknown diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index 0b8a00279d..fbeef4498e 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -6631,7 +6631,10 @@ browser_family: Opera - user_agent: NEXT 2000-HD PLUS_VLC/3.0.14 LibVLC/3.0.14 - os: [ ] + os: + name: 'RTOS & Next' + version: "" + platform: "" client: type: mediaplayer name: VLC @@ -6640,11 +6643,14 @@ type: tv brand: 'Next & NextStar' model: 2000 HD Plus - os_family: Unknown + os_family: Real-time OS browser_family: Unknown - user_agent: NEXT 2000 WiFi_VLC/3.0.14 LibVLC/3.0.14 - os: [ ] + os: + name: 'RTOS & Next' + version: "" + platform: "" client: type: mediaplayer name: VLC @@ -6653,11 +6659,14 @@ type: tv brand: 'Next & NextStar' model: 2000 WiFi - os_family: Unknown + os_family: Real-time OS browser_family: Unknown - user_agent: NEXT 2071_VLC/3.0.14 LibVLC/3.0.14 - os: [ ] + os: + name: 'RTOS & Next' + version: "" + platform: "" client: type: mediaplayer name: VLC @@ -6666,7 +6675,7 @@ type: tv brand: 'Next & NextStar' model: "2071" - os_family: Unknown + os_family: Real-time OS browser_family: Unknown - user_agent: Dalvik/2.1.0 (Linux; U; Android 11; Nokia Streaming Stick 800 Build/RTT0.210618.003) diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 9dc1f74d1b..6b3a8a54e0 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -4989,3 +4989,39 @@ model: CT-8750 os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Odin/100.4896.4.10 Safari/537.36 Model/VIDAA-NT72690 VIDAA/7.0(Smarttech;SmartTV;VS0343FE2;NT72690/V0000.07.00C.O0629;FHD;VS0343F2;) + os: + name: VIDAA + version: "7.0" + platform: ARM + client: + type: browser + name: Odin + version: 100.4896.4.10 + engine: Blink + engine_version: 100.0.4896.127 + device: + type: tv + brand: Smart Tech + model: "" + os_family: GNU/Linux + browser_family: Chrome +- + user_agent: Mozilla/5.0 (X11; Linux x86_64;) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36 SRAF/4.0 (; Hisense; SmartTV_2019_1; V0000.01.00a.N0423; MICALIDVB6886; ); CE-HTML/1.0 hbbtv + os: + name: GNU/Linux + version: "" + platform: x64 + client: + type: browser + name: Seraphic Sraf + version: "4.0" + engine: Blink + engine_version: 47.0.2526.106 + device: + type: tv + brand: Hisense + model: Smart TV (2019) + os_family: GNU/Linux + browser_family: Chrome diff --git a/Tests/fixtures/tv.yml b/Tests/fixtures/tv.yml index 6505fe216a..fd63b74bda 100644 --- a/Tests/fixtures/tv.yml +++ b/Tests/fixtures/tv.yml @@ -3307,26 +3307,8 @@ engine_version: "" device: type: tv - brand: MediaTek - model: MT5396 - os_family: Real-time OS - browser_family: Unknown -- - user_agent: HbbTV/1.2.1 (;MTK;MT5396;;;) ANTGalio/3.3.0.26.02.devel - os: - name: MTK / Nucleus - version: "" - platform: "" - client: - type: browser - name: ANTGalio - version: 3.3.0.26.02 - engine: "" - engine_version: "" - device: - type: tv - brand: MediaTek - model: MT5396 + brand: "" + model: "" os_family: Real-time OS browser_family: Unknown - @@ -9222,8 +9204,8 @@ engine_version: 55.0.2883.91 device: type: tv - brand: MediaTek - model: MT5887 + brand: "" + model: Smart TV (2019) os_family: GNU/Linux browser_family: Chrome - diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index a705e969e2..6372c155ad 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -35458,6 +35458,12 @@ Smart Kassel: - regex: 'SK5501(?:[);/ ]|$)' model: 'SK5501' +# Smart Tech (https://www.smarttech-tv.com/) +Smart Tech: + regex: 'Smarttech[;,]' + device: 'tv' + model: '' + # Colors or ColorsMobile (www.colors-mobile.com) Colors: regex: '(?:Colors[ _](S(?:[19]|11)|P70|P[456]5|P32|E15|P50 Plus)|Pride_1A|P52_Pride5C|P90_Pride5X|P95_Pride_7s|P77_Pride_1E|P88_Pride_1X)(?:[);/ ]|$)' @@ -40067,10 +40073,20 @@ Next & NextStar: models: - regex: '2000 WiFi' model: '2000 WiFi' + - regex: '2000 HD FTA' + model: '2000 HD FTA' - regex: '2000-HD PLUS' model: '2000 HD Plus' + - regex: '2000-HD' + model: '2000 HD' + - regex: 'NEXT 64' + model: '64' - regex: '2071' model: '2071' + - regex: 'YE-2000HD CX' + model: 'YE-2000HD CX' + - regex: 'YE-2000 USB' + model: 'YE-2000 USB' - regex: 'MyBox(?:[);/ ]|$)' model: 'MyBox' - regex: 'LGE; (YE-[0-9a-z]+)-4K;' @@ -41974,6 +41990,9 @@ Hisense: - regex: 'Hisense;SmartTV;([a-z0-9_ -]+);' device: 'tv' model: '$1' + - regex: 'Hisense; ?SmartTV_([0-9]{4})_1;' + device: 'tv' + model: 'Smart TV ($1)' - regex: '(HE43A6500UWTS)' device: 'tv' model: '$1' diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml index d8a4d27b11..5f3e3e19b2 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -656,14 +656,6 @@ Manhattan: - regex: 'T3' model: 'T3' -# MediaTek -MediaTek: - regex: 'MTK|MediaTek;' - device: 'tv' - models: - - regex: '(MT[0-9]{4})' - model: '$1' - # Medion Medion: regex: 'Medion' @@ -1220,8 +1212,9 @@ Xiaomi: # Unknown Unknown: - regex: 'OEM, ([a-z0-9_ -]+), (?:wired|wireless)|_TV_[A-Z0-9]+_([0-9]{4});' - device: 'tv' + regex: 'OEM, ([a-z0-9_ -]+), (?:wired|wireless)|_TV_[A-Z0-9]+_([0-9]{4});|LaTivu_(?:\d+[.\d]+)_([0-9]{4})' models: - regex: '_TV_[A-Z0-9]+_([0-9]{4});' model: 'Smart TV ($1)' + - regex: 'LaTivu_(?:\d+[.\d]+)_([0-9]{4})' + model: 'Smart TV ($1)' diff --git a/regexes/oss.yml b/regexes/oss.yml index 05765d7437..46af8a8c5b 100644 --- a/regexes/oss.yml +++ b/regexes/oss.yml @@ -5,6 +5,13 @@ # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later ############### +########## +# RTOS & Next +########## +- regex: '^NEXT ' + name: 'RTOS & Next' + version: '' + ########## # Meta Horizon (https://developers.meta.com/horizon) ##########