diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php index 131b6b66fe..ed6af704a7 100644 --- a/Parser/Client/Browser.php +++ b/Parser/Client/Browser.php @@ -64,6 +64,7 @@ class Browser extends ClientParserAbstract 'CO' => 'CometBird', 'CP' => 'ChromePlus', 'CR' => 'Chromium', + 'CY' => 'Cyberfox', 'CS' => 'Cheshire', 'DB' => 'dbrowser', 'DE' => 'Deepnet Explorer', @@ -90,6 +91,7 @@ class Browser extends ClientParserAbstract 'IA' => 'Iceape', 'IB' => 'IBrowse', 'IC' => 'iCab', + 'I2' => 'iCab Mobile', 'I1' => 'Iridium', 'ID' => 'IceDragon', 'IV' => 'Isivioo', diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php index 75b929a489..547e263b53 100644 --- a/Parser/Device/DeviceParserAbstract.php +++ b/Parser/Device/DeviceParserAbstract.php @@ -62,6 +62,7 @@ abstract class DeviceParserAbstract extends ParserAbstract */ public static $deviceBrands = array( '3Q' => '3Q', + '4G' => '4Good', 'AC' => 'Acer', 'AZ' => 'Ainol', 'AI' => 'Airness', @@ -181,6 +182,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'IK' => 'iKoMo', 'IM' => 'i-mate', 'I1' => 'iOcean', + 'I2' => 'IconBIT', 'IW' => 'iNew', 'IF' => 'Infinix', 'IN' => 'Innostream', @@ -219,6 +221,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'LO' => 'Loewe', 'LM' => 'Logicom', 'LX' => 'Lexibook', + 'LY' => 'LYF', 'MJ' => 'Majestic', 'MA' => 'Manta Multimedia', 'MB' => 'Mobistel', diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml index 84a6e2610f..03defb15e8 100644 --- a/Tests/Parser/Client/fixtures/browser.yml +++ b/Tests/Parser/Client/fixtures/browser.yml @@ -1674,3 +1674,21 @@ version: "41.2" engine: WebKit engine_version: 537.36 +- + user_agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:28.0) Gecko/20100101 Firefox/28.0 Cyberfox/28.0.1 + client: + type: browser + name: Cyberfox + short_name: CY + version: "28.0.1" + engine: Gecko + engine_version: +- + user_agent: Mozilla/5.0 (iPhone; CPU OS 8_0 like Mac OS X) AppleWebKit/538.34.9 (KHTML, like Gecko) iCabMobile/1.1 + client: + type: browser + name: "iCab Mobile" + short_name: I2 + version: "1.1" + engine: WebKit + engine_version: "538.34.9" diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml index 210a47ca13..db245f4a87 100644 --- a/Tests/fixtures/smartphone-5.yml +++ b/Tests/fixtures/smartphone-5.yml @@ -859,3 +859,1363 @@ model: DM550 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.2.1; ru-ru; NT-3506M Build/JOP40D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: "4.2.1" + platform: + client: + type: browser + name: Android Browser + short_name: AN + version: + engine: WebKit + engine_version: 534.30 + device: + type: smartphone + brand: I2 + model: NetTAB Mercury Quad FHD + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; LS-4004 Build/LMY47D; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 55.0.2883.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Flame 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5501 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.124 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 53.0.2785.124 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Earth 1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5021 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Earth 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-4503 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/43.0.2357.93 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 43.0.2357.93 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Flame LS-4503 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; LS-4001 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 39.0.0.0 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Flame 3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; LS-4003 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 39.0.0.0 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Flame 4 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; LS-4002 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 39.0.0.0 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Flame 5 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; LS-4005 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 39.0.0.0 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Flame 6 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; LYF_LS-4006) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/33.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 33.0.0.0 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Flame 7 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; LS-4008 Build/LMY47D; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/48.0.2564.106 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 48.0.2564.106 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Flame 7S + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5002 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 55.0.2883.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water 1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5005 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 55.0.2883.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water 4 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5006 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/43.0.2357.93 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 43.0.2357.93 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water 6 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.0.2; LS-5008 Build/LRX22G; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.0.2 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5009 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 56.0.2924.87 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Wind 6 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5010 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.121 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 43.0.2357.121 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Wind 1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; LS-5013 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.81 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 51.0.2704.81 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Wind 5 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5014 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.76 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 46.0.2490.76 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Wind 4 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; LS-5015 Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/54.0.2840.68 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 6.0.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 54.0.2840.68 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water 8 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; LS-5016 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.86 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 6.0.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 50.0.2661.86 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Wind 7 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; LS-5017 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.132 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 57.0.2987.132 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water 11 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5018 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.106 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 48.0.2564.106 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Wind 4S + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; LS-5020 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 49.0.2623.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water 10 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0.1; LS-5201 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 6.0.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water F1S + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5502 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/57.0.2987.132 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 57.0.2987.132 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Wind 3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.0.2; LS-5503 Build/LRX22G; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/57.0.2987.132 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.0.2 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 57.0.2987.132 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water 3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; LS-5504 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.121 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 43.0.2357.121 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water 7 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; LS-5506 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 55.0.2883.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water 9 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; LS-6001 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/43.0.2357.93 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 43.0.2357.93 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: "" + model: "" + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; NEM-L51 Build/HONORNEM-L51) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 55.0.2883.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: HU + model: Honor 5C + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 7.0; NEM-L22 Build/HONORNEM-L22; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "7.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: HU + model: Honor 5C Dual SIM + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1.1; PLE-701L Build/HuaweiMediaPad) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: "" + device: + type: tablet + brand: HU + model: MediaPad T2 7.0 Pro + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 5.1.1; zh-CN; PLE-703L Build/HuaweiMediaPad) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: 5.1.1 + platform: "" + client: + type: browser + name: Android Browser + short_name: AN + version: "" + engine: WebKit + engine_version: "534.30" + device: + type: tablet + brand: HU + model: MediaPad T2 7.0 Pro + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Q327 Build/LMY47D; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/46.0.2490.76 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 46.0.2490.76 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: MI + model: Bolt + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; 4Good S450m 4G Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.105 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 49.0.2623.105 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: 4G + model: S450m 4G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; ASUS_Z00YD Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.116 YaBrowser/16.10.0.1326.00 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Yandex Browser + short_name: YA + version: 16.10.0.1326.00 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: AU + model: Z00YD + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Ixion_ES255 Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.94 Mobile Safari/537.36 OPR/37.0.2192.105088 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Opera Mobile + short_name: OM + version: 37.0.2192.105088 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: DX + model: Ixion ES255 + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; 4Good S555m 4G Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.111 YaBrowser/16.2.1.7529.00 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Yandex Browser + short_name: YA + version: 16.2.1.7529.00 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: 4G + model: S555m 4G + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; S501m 3G Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 30.0.0.0 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: 4G + model: S501m 3G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.4; T700i_3G Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.95 Safari/537.36 + os: + name: Android + short_name: AND + version: 4.4.4 + platform: "" + client: + type: browser + name: Chrome + short_name: CH + version: 48.0.2564.95 + engine: Blink + engine_version: "" + device: + type: tablet + brand: 4G + model: T700i 3G + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; 4Good Light A103 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: 4G + model: Light A103 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FS506 Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 56.0.2924.87 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Cirrus 3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; NB105 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36 + os: + name: Android + short_name: AND + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome + short_name: CH + version: 30.0.0.0 + engine: Blink + engine_version: "" + device: + type: tablet + brand: BV + model: NB105 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; NB74 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36 + os: + name: Android + short_name: AND + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome + short_name: CH + version: 30.0.0.0 + engine: Blink + engine_version: "" + device: + type: tablet + brand: BV + model: NB74 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; NP101 Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36 + os: + name: Android + short_name: AND + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome + short_name: CH + version: 30.0.0.0 + engine: Blink + engine_version: "" + device: + type: tablet + brand: BV + model: NP101 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.0.1; K00R Build/LRX22C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Safari/537.36 + os: + name: Android + short_name: AND + version: 5.0.1 + platform: "" + client: + type: browser + name: Chrome + short_name: CH + version: 58.0.3029.83 + engine: Blink + engine_version: "" + device: + type: tablet + brand: AU + model: MeMO Pad 7 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FS509 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 56.0.2924.87 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Nimbus 9 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 6.0; en-US; FS406 Build/MRA58K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 UCBrowser/11.2.0.915 U3/0.8.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: UC Browser + short_name: UC + version: 11.2.0.915 + engine: WebKit + engine_version: "534.30" + device: + type: smartphone + brand: FL + model: Stratus 5 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FS504 Build/LMY47I; ru-ru) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Mobile Safari/537.36 Puffin/6.1.0.15920AP + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Puffin + short_name: PU + version: 6.1.0.15920 + engine: WebKit + engine_version: "537.36" + device: + type: smartphone + brand: FL + model: Cirrus 2 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FS407 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36 OPR/42.6.2246.114522 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Opera Mobile + short_name: OM + version: 42.6.2246.114522 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Stratus 6 + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; U; Android 5.1; en-US; FS402 Build/LMY47I) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 UCBrowser/11.2.0.915 U3/0.8.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: UC Browser + short_name: UC + version: 11.2.0.915 + engine: WebKit + engine_version: "534.30" + device: + type: smartphone + brand: FL + model: Stratus 2 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; FS501 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.89 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 50.0.2661.89 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Nimbus 3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FS505 Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.124 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 53.0.2785.124 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Nimbus 7 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; FS551 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 YaBrowser/17.3.2.414.00 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 4.4.2 + platform: "" + client: + type: browser + name: Yandex Browser + short_name: YA + version: 17.3.2.414.00 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Nimbus 4 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FS454 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.137 YaBrowser/17.4.0.491.00 (alpha) Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Yandex Browser + short_name: YA + version: 17.4.0.491.00 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Nimbus 8 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; FS452 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.85 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 54.0.2840.85 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Nimbus 2 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4.2; FS451 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 4.4.2 + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 47.0.2526.83 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Nimbus 1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FS508 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 58.0.3029.83 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Cirrus 6 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; FS511 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 YaBrowser/16.6.0.8810.00 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Yandex Browser + short_name: YA + version: 16.6.0.8810.00 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Cirrus 7 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 5.1; en-US; FS502 Build/LMY47D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 UCBrowser/11.2.8.945 U3/0.8.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: UC Browser + short_name: UC + version: 11.2.8.945 + engine: WebKit + engine_version: "534.30" + device: + type: smartphone + brand: FL + model: Cirrus 1 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FS405 Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 YaBrowser/16.6.0.8810.00 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Yandex Browser + short_name: YA + version: 16.6.0.8810.00 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Stratus 4 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; Panasonic_T50 Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 55.0.2883.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: PA + model: T50 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; F3211 Build/36.0.A.1.111) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.132 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 57.0.2987.132 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: SO + model: Xperia XA Ultra + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 6.0; LS-5505 Build/LYF_LS-5505_01_07) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "6.0" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 55.0.2883.91 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: LY + model: Water F1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4; FS403 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0 Mobile Safari/537 + os: + name: Android + short_name: AND + version: "4.4" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 30.0 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Cumulus 1 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; FS404 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/46.0.2490.76 Mobile Safari/537 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 46.0.2490.76 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Stratus 3 + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 4.4; FS401 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.76 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: "4.4" + platform: "" + client: + type: browser + name: Chrome Mobile + short_name: CM + version: 46.0.2490.76 + engine: Blink + engine_version: "" + device: + type: smartphone + brand: FL + model: Stratus 1 + os_family: Android + browser_family: Chrome \ No newline at end of file diff --git a/Tests/fixtures/tablet-2.yml b/Tests/fixtures/tablet-2.yml index 6541b66e60..8f78eceab4 100644 --- a/Tests/fixtures/tablet-2.yml +++ b/Tests/fixtures/tablet-2.yml @@ -2499,3 +2499,23 @@ model: N101 os_family: Android browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 5.1; NB751 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Safari/537.36 + os: + name: Android + short_name: AND + version: "5.1" + platform: "" + client: + type: browser + name: Chrome + short_name: CH + version: 55.0.2883.91 + engine: Blink + engine_version: "" + device: + type: tablet + brand: BV + model: NB751 + os_family: Android + browser_family: Chrome diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml index 2d8a33b3f1..cf85a77996 100644 --- a/regexes/client/browsers.yml +++ b/regexes/client/browsers.yml @@ -191,6 +191,13 @@ engine: default: 'Gecko' +#Cyberfox +- regex: 'Cyberfox(?:/(\d+[\.\d]+))?' + name: 'Cyberfox' + version: '$1' + engine: + default: 'Gecko' + #Swiftfox - regex: 'Firefox/(\d+[\.\d]+).*\(Swiftfox\)' name: 'Swiftfox' @@ -729,6 +736,13 @@ name: 'IBrowse' version: '$1' +#iCabMobile +- regex: 'iCabMobile(?:[ /](\d+[\.\d]+))?' + name: 'iCab Mobile' + version: '$1' + engine: + default: 'WebKit' + #iCab - regex: 'iCab(?:[ /](\d+[\.\d]+))?' name: 'iCab' diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index b420e06587..c1ceb1e2b4 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -357,7 +357,7 @@ Apple: # micromax MicroMax: - regex: 'MicroMax[ \-\_]?[a-z0-9]+' + regex: '(MicroMax[ \-\_]?[a-z0-9]+|Q327)' device: 'smartphone' models: - regex: 'MicroMax(?:[ \-\_])?(P[a-z0-9]+)' @@ -365,6 +365,8 @@ MicroMax: device: 'tablet' - regex: 'MicroMax(?:[ \-\_])?([a-z0-9]+)' model: '$1' + - regex: 'Q327' + model: 'Bolt' # 3Q 3Q: @@ -372,15 +374,32 @@ MicroMax: device: 'tablet' model: '$1' +# 4Good +4Good: + regex: '4Good[ _]([^;/]+) Build|(?:4Good)?(S450m [43]G|S555m 4G|S501m 3G|T700i_3G|Light A103)' + device: 'smartphone' + models: + - regex: 'T700i_3G' + model: 'T700i 3G' + device: 'tablet' + - regex: '(S(?:450m|555m|501m)[_ ][43]G|Light A103)' + model: '$1' + - regex: '4Good[ _]([^);/ ]+)' + model: '$1' + # Bravis Bravis: - regex: 'Bravis|A501 Bright' + regex: 'Bravis|A501 Bright|NB(?:10[56]|751|7[145])|NP101' device: 'smartphone' models: - regex: 'A501 Bright' model: 'A501 Bright' - regex: 'Bravis[_ ]([^;\)]+) Build' model: '$1' + - regex: '(NB(?:10[156]|751|7[145])|NP101)' + model: '$1' + device: 'tablet' + # Acer Acer: @@ -652,7 +671,7 @@ Garmin-Asus: # Asus Asus: - regex: 'Asus|Transformer|TF300T|Slider SL101|PadFone|ME302(?:C|KL)|ME301T|ME371MG|ME17(?:1|2V|3X)|(?:K0[01][0-9a-z]|Z00D)[);/ ]' + regex: 'Asus|Transformer|TF300T|Slider SL101|PadFone|ME302(?:C|KL)|ME301T|ME371MG|ME17(?:1|2V|3X)|(?:K0[01][0-9a-z]|Z00D|Z00YD)[);/ ]' device: 'smartphone' models: # explicit tablet models @@ -671,7 +690,7 @@ Asus: - regex: 'ME301T[);/ ]' model: 'MeMO Pad Smart 10' device: 'tablet' - - regex: '(?:K01[3A]|K007)[);/ ]' + - regex: '(?:K01[3A]|K007|K00R)[);/ ]' model: 'MeMO Pad 7' device: 'tablet' - regex: 'K01E[);/ ]' @@ -728,12 +747,13 @@ Asus: model: 'Fonepad 8' device: 'phablet' - # explicit smartphone models - regex: '(?:ASUS_)?Z007' model: 'ZenFone C' - regex: '(?:ASUS_)?(?:Z00D|Z008D|Z00AD[AB]?)' model: 'ZenFone 2' + - regex: '(?:ASUS_)(Z00YD)' + model: '$1' - regex: '(?:ASUS_)?Z00[ERL]D' model: 'ZenFone 2 Laser' - regex: '(?:ASUS_)?T00[IQ1]' @@ -1170,14 +1190,14 @@ DEXP: regex: 'DEXP|(?:Ursus|Ixion)[ _]([^;/]+) Build|H135[ _]Build' device: 'smartphone' models: - - regex: 'Ixion ([^;/]+) Build' + + - regex: 'Ixion[_ ]([^;/]+) Build' model: 'Ixion $1' - regex: 'Ursus ([^;/]+) Build' model: 'Ursus $1' device: 'tablet' - - # 15,6'' tablet + - regex: 'H135[ _]Build' model: 'Atlas' device: 'desktop' @@ -1350,7 +1370,7 @@ Senseit: # Sony & Sony Ericsson (combined as they are mixed up) Sony: - regex: 'Sony(?: ?Ericsson)?|SGP|Xperia|C1[569]0[45]|C2[01]0[45]|C2305|C530[236]|C550[23]|C6[56]0[236]|C6616|C68(?:0[26]|[34]3)|C69(?:0[236]|16|43)|D200[45]|D21(?:0[45]|14)|D22(?:0[236]|12|43)|D230[2356]|D240[36]|D25(?:02|33)|D510[236]|D530[36]|D5322|D5503|D58[03]3|D65(?:0[23]|43)|D66[035]3|E210[45]|E2115|E5506|E2[03]03|E2306|E2312|E2353|E58[02]3|E56[46305][36]|E6553|E66[358]3|E68[58]3|F3111|F331[13]|F3213|F5[13]21|F833[12]|(?:WT|LT|SO|ST|SK|MK)[0-9]+[a-z]*[0-9]*(?: Build|\))|X?L39H|XM50[ht]|W960|portalmmm/2\.0 K|S3[69]h|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build|SO-0(?:[345]D|[234]E|[12]C|[1235]F|[12]G)|R800[aix]|LiveWithWalkman' + regex: 'Sony(?: ?Ericsson)?|SGP|Xperia|C1[569]0[45]|C2[01]0[45]|C2305|C530[236]|C550[23]|C6[56]0[236]|C6616|C68(?:0[26]|[34]3)|C69(?:0[236]|16|43)|D200[45]|D21(?:0[45]|14)|D22(?:0[236]|12|43)|D230[2356]|D240[36]|D25(?:02|33)|D510[236]|D530[36]|D5322|D5503|D58[03]3|D65(?:0[23]|43)|D66[035]3|E210[45]|E2115|E5506|E2[03]03|E2306|E2312|E2353|E58[02]3|E56[46305][36]|E6553|E66[358]3|E68[58]3|F3111|F331[13]|F3213|F3211|F5[13]21|F833[12]|(?:WT|LT|SO|ST|SK|MK)[0-9]+[a-z]*[0-9]*(?: Build|\))|X?L39H|XM50[ht]|W960|portalmmm/2\.0 K|S3[69]h|X10[ia]v?|E1[05][ai]v?|MT[0-9]{2}[a-z]? Build|SO-0(?:[345]D|[234]E|[12]C|[1235]F|[12]G)|R800[aix]|LiveWithWalkman' device: 'smartphone' models: # SONY ERICSSON: explicit smartphone models @@ -1596,7 +1616,7 @@ Sony: model: 'Xperia Z5 Premium' - regex: '(?:Sony(?:Ericsson)?)?F3111' model: 'Xperia XA' - - regex: '(?:Sony(?:Ericsson)?)?F3213' + - regex: '(?:Sony(?:Ericsson)?)?F3213|F3211' model: 'Xperia XA Ultra' - regex: '(?:Sony(?:Ericsson)?)?F833[12]' model: 'Xperia XZ' @@ -2036,7 +2056,7 @@ Hosin: # Huawei Huawei: - regex: '(HW-)?(?:Huawei|Ideos|Honor[ _]|(?:H60-L(?:01|02|03|04|11|12)|H30-(?:C00|L01M?|L02|U10|T00|T10)|G621-TL00M?|PLK-(?:AL10|CL00|TL00|TL01H?|UL00|L01)|SCL-(?:AL00|CL00|TL00H?|L01)|CH(?:E2?|M)-[CUT]L00[HM]?|CHE1-CL[12]0|CHE2-L11|CHM-U01|KIW-L21|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508)|NEM-L21)[);/ ])' + regex: '(HW-)?(?:Huawei|Ideos|Honor[ _]|(?:H60-L(?:01|02|03|04|11|12)|H30-(?:C00|L01M?|L02|U10|T00|T10)|G621-TL00M?|PLK-(?:AL10|CL00|TL00|TL01H?|UL00|L01)|SCL-(?:AL00|CL00|TL00H?|L01)|CH(?:E2?|M)-[CUT]L00[HM]?|CHE1-CL[12]0|CHE2-L11|CHM-U01|KIW-L21|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508)|NEM-L[52][21]|PLE-70[13]L)[);/ ])' device: 'smartphone' models: - regex: 'U(8230|8661|8667)[);/ ]' @@ -2079,11 +2099,18 @@ Huawei: model: 'Honor Y6' - regex: '(?:Honor_|HW-)?PLK-(?:AL10|CL00|TL00|TL01H?|UL00|L01)[);/ ]' model: 'Honor 7' + - regex: '(?:Honor_|HW-)?NEM-L51[);/ ]' + model: 'Honor 5C' + - regex: '(?:Honor_|HW-)?NEM-L22[);/ ]' + model: 'Honor 5C Dual SIM' - regex: '(?:Honor_|HW-)?NEM-L21[);/ ]' model: 'Honor 7 Lite' - regex: 'T1-A21w' device: 'tablet' model: 'Honor Tablet Note' + - regex: 'PLE-70[13]L' + device: 'tablet' + model: 'MediaPad T2 7.0 Pro' - regex: 'T1-A21L' device: 'tablet' model: 'MediaPad T1 10' @@ -2158,6 +2185,82 @@ iBerry: - regex: 'AUXUS ([^/;]+) Build' model: '$1' +# IconBIT +IconBIT: + regex: 'NT-3506M' + device: 'smartphone' + models: + - regex: 'NT-3506M' + model: 'NetTAB Mercury Quad FHD' + +# LYF +LYF: + regex: '(LYF[ _])?LS-[45][0-9]{3}' + device: 'smartphone' + models: + - regex: 'LS-4004' + model: 'Flame 2' + - regex: 'LS-5501' + model: 'Earth 1' + - regex: 'LS-5021' + model: 'Earth 2' + - regex: 'LS-5505' + model: 'Water F1' + - regex: 'LS-4503' + model: 'Flame LS-4503' + - regex: 'LS-4001' + model: 'Flame 3' + - regex: 'LS-4003' + model: 'Flame 4' + - regex: 'LS-4002' + model: 'Flame 5' + - regex: 'LS-4005' + model: 'Flame 6' + - regex: '(LYF[ _])?LS-4006' + model: 'Flame 7' + - regex: 'LS-4008' + model: 'Flame 7S' + - regex: 'LS-4505' + model: 'Flame 8' + - regex: 'LS-5002' + model: 'Water 1' + - regex: 'LS-5005' + model: 'Water 4' + - regex: 'LS-5006' + model: 'Water 6' + - regex: 'LS-5008' + model: 'Water 2' + - regex: 'LS-5009' + model: 'Wind 6' + - regex: 'LS-5013' + model: 'Wind 5' + - regex: 'LS-5014' + model: 'Wind 4' + - regex: 'LS-5010' + model: 'Wind 1' + - regex: 'LS-5015' + model: 'Water 8' + - regex: 'LS-5016' + model: 'Wind 7' + - regex: 'LS-5504' + model: 'Water 7' + - regex: 'LS-5017' + model: 'Water 11' + - regex: 'LS-5018' + model: 'Wind 4S' + - regex: 'LS-5020' + model: 'Water 10' + - regex: 'LS-5201' + model: 'Water F1S' + - regex: 'LS-5502' + model: 'Wind 3' + - regex: 'LS-5503' + model: 'Water 3' + - regex: 'LS-5506' + model: 'Water 9' + - regex: 'LS-6001' + model: 'Wind 2' + # iNew iNew: regex: 'iNew|(?:V7A|V3 Plus|V3-?E|V3C)(?: Build|[;/\)])' @@ -3490,7 +3593,7 @@ Panasonic: - regex: 'PANATV[0-9]+|Viera/' device: 'tv' model: 'Smart TV' - - regex: 'Panasonic[ \-]?([a-z0-9]+)' + - regex: 'Panasonic[ _\-]?([a-z0-9]+)' model: '$1' - regex: 'portalmmm/2.0 (P[a-z0-9]+)' model: '$1' @@ -5192,7 +5295,7 @@ Toshiba: # Fly Fly: - regex: 'Fly(?!Flow|touch)|MERIDIAN-|(?:IQ[0-9]{3,})[ _]?(?:Quad|Firebird|Quattro|Turbo|Magic)?(?: Build|[;/\)])' + regex: 'Fly(?!Flow|touch)|FS50[1-9]|FS511|FS551|FS40[1-7]|FS452|FS451|FS454|4FS06|MERIDIAN-|(?:IQ[0-9]{3,})[ _]?(?:Quad|Firebird|Quattro|Turbo|Magic)?(?: Build|[;/\)])' device: 'smartphone' models: - regex: '(?:Fly_)?IQ310(?: Build|[;/\)])' @@ -5201,6 +5304,44 @@ Fly: - regex: '(?:Fly_)?IQ236(?: Build|[;/\)])' model: 'Victory' + - regex: 'FS506' + model: 'Cirrus 3' + - regex: 'FS403' + model: 'Cumulus 1' + - regex: 'FS508' + model: 'Cirrus 6' + - regex: 'FS511' + model: 'Cirrus 7' + - regex: 'FS509' + model: 'Nimbus 9' + - regex: 'FS406' + model: 'Stratus 5' + - regex: 'FS404' + model: 'Stratus 3' + - regex: 'FS504' + model: 'Cirrus 2' + - regex: 'FS407' + model: 'Stratus 6' + - regex: 'FS401' + model: 'Stratus 1' + - regex: 'FS402' + model: 'Stratus 2' + - regex: 'FS501' + model: 'Nimbus 3' + - regex: 'FS502' + model: 'Cirrus 1' + - regex: 'FS505' + model: 'Nimbus 7' + - regex: 'FS551' + model: 'Nimbus 4' + - regex: 'FS454' + model: 'Nimbus 8' + - regex: 'FS452' + model: 'Nimbus 2' + - regex: 'FS451' + model: 'Nimbus 1' + - regex: 'FS405' + model: 'Stratus 4' - regex: '(?:Fly_)?IQ237(?: Build|[;/\)])' model: 'Dynamic' - regex: '(?:Fly_)?IQ238(?: Build|[;/\)])'