From afa85c4a1ebada71cec1e5422b02408b9b9952be Mon Sep 17 00:00:00 2001 From: sgiehl Date: Sun, 23 Aug 2015 22:35:24 +0200 Subject: [PATCH] Added detection for Overmax devices --- Parser/Device/DeviceParserAbstract.php | 1 + Tests/fixtures/smartphone.yml | 19 +++++ Tests/fixtures/tablet.yml | 114 +++++++++++++++++++++++++ Tests/fixtures/unknown.yml | 57 ------------- regexes/device/mobiles.yml | 12 +++ 5 files changed, 146 insertions(+), 57 deletions(-) diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php index b52c93e8bd..5da291fac1 100644 --- a/Parser/Device/DeviceParserAbstract.php +++ b/Parser/Device/DeviceParserAbstract.php @@ -221,6 +221,7 @@ abstract class DeviceParserAbstract extends ParserAbstract 'QI' => 'Qilive', 'QT' => 'Qtek', 'QU' => 'Quechua', + 'OV' => 'Overmax', 'OY' => 'Oysters', 'RA' => 'Ramos', 'RI' => 'Rikomagic', diff --git a/Tests/fixtures/smartphone.yml b/Tests/fixtures/smartphone.yml index 616c136a31..c6eb4695d4 100644 --- a/Tests/fixtures/smartphone.yml +++ b/Tests/fixtures/smartphone.yml @@ -17876,6 +17876,25 @@ model: Xda comet os_family: Windows Mobile browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; pl-pl; OV-Vertis-02 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: "4.2.2" + platform: + client: + type: browser + name: Android Browser + short_name: AN + version: + engine: WebKit + device: + type: smartphone + brand: OV + model: OV-Vertis-02 + os_family: Android + browser_family: Android Browser - user_agent: Mozilla/5.0 (Linux; Android 4.1.1; Oysters Pacific 800 Build/JRO03C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.135 Mobile Safari/537.36 os: diff --git a/Tests/fixtures/tablet.yml b/Tests/fixtures/tablet.yml index acabf02bc1..40b630935b 100644 --- a/Tests/fixtures/tablet.yml +++ b/Tests/fixtures/tablet.yml @@ -10722,6 +10722,120 @@ model: MID os_family: Android browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; OV-BasicTab Build/JRO03H) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: "4.1.1" + platform: + client: + type: browser + name: Android Browser + short_name: AN + version: + engine: WebKit + device: + type: tablet + brand: OV + model: OV-BasicTab + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; OV-Quattor10 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: "4.1.1" + platform: + client: + type: browser + name: Android Browser + short_name: AN + version: + engine: WebKit + device: + type: tablet + brand: OV + model: OV-Quattor10 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; pl-pl; OV-SteelCore10+II Build/MASTER) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: "4.1.1" + platform: + client: + type: browser + name: Android Browser + short_name: AN + version: + engine: WebKit + device: + type: tablet + brand: OV + model: OV-SteelCore10+II + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; pl-pl; OV-TB-07B Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: "4.0.4" + platform: + client: + type: browser + name: Android Browser + short_name: AN + version: + engine: WebKit + device: + type: tablet + brand: OV + model: OV-TB-07B + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ro-ro; OV-TB-07B Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: "4.0.4" + platform: + client: + type: browser + name: Android Browser + short_name: AN + version: + engine: WebKit + device: + type: tablet + brand: OV + model: OV-TB-07B + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; pl-pl; OV-TB-08 II Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: "4.0.4" + platform: + client: + type: browser + name: Android Browser + short_name: AN + version: + engine: WebKit + device: + type: tablet + brand: OV + model: OV-TB-08 II + os_family: Android + browser_family: Android Browser - user_agent: Mozilla/5.0 (Linux; Android 4.2.2; OYSTERS T14N 3G Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.72 Safari/537.36 OPR/19.0.1340.69721 os: diff --git a/Tests/fixtures/unknown.yml b/Tests/fixtures/unknown.yml index bf8b458946..8da8dc0740 100644 --- a/Tests/fixtures/unknown.yml +++ b/Tests/fixtures/unknown.yml @@ -2308,44 +2308,6 @@ model: os_family: Android browser_family: Android Browser -- - user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; pl-pl; OV-TB-07B Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 - os: - name: Android - short_name: AND - version: "4.0.4" - platform: - client: - type: browser - name: Android Browser - short_name: AN - version: - engine: WebKit - device: - type: - brand: - model: - os_family: Android - browser_family: Android Browser -- - user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; pl-pl; OV-TB-08 II Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 - os: - name: Android - short_name: AND - version: "4.0.4" - platform: - client: - type: browser - name: Android Browser - short_name: AN - version: - engine: WebKit - device: - type: - brand: - model: - os_family: Android - browser_family: Android Browser - user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; pt-br; T02A Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 os: @@ -2422,25 +2384,6 @@ model: os_family: Android browser_family: Android Browser -- - user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ro-ro; OV-TB-07B Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 - os: - name: Android - short_name: AND - version: "4.0.4" - platform: - client: - type: browser - name: Android Browser - short_name: AN - version: - engine: WebKit - device: - type: - brand: - model: - os_family: Android - browser_family: Android Browser - user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ru-ru; Advance TV Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 os: diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 953b485bf4..7d207d08e3 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -2247,6 +2247,18 @@ Orange: - regex: 'SPV[ \-]?([a-z0-9]+)' model: 'SPV $1' +# Overmax +Overmax: + regex: 'OV-[a-z]+(?:[^;/]+)? Build' + device: 'tablet' + models: + - regex: 'OV-Vertis-([^;/]+) Build' + model: 'OV-Vertis-$1' + device: 'smartphone' + + - regex: '(OV-[a-z]+(?:[^;/]+)?) Build' + model: '$1' + # Oysters Oysters: regex: 'Oysters'