feat(device) detect brand teXet models: X-pad NAVI 7.3" 3G, X-pad NAV…

…I 10.0" 3G, X-pad NAVI 7.5" 3G, X-pad Sky 8.1" 3G, X-pad Style 8.0" 3G, X-pad Style 10.1" 3G, X-pad Hit 3G, X-pad Lite 7.1", X-pad Lite 7.2", X-pad Quad 10.0" 3G, X-pad Quad 7.0" 3G, X-pad Quad 7.2" 3G, X-pad Shine 8.1" 3G issue matomo-org#6355
sanchezzzhak · Sep 5, 2020 · b861adf · b861adf
1 parent 69ac5f1
commit b861adf
Show file tree

Hide file tree

Showing 3 changed files with 299 additions and 18 deletions.
diff --git a/Tests/fixtures/smartphone-16.yml b/Tests/fixtures/smartphone-16.yml
@@ -9219,3 +9219,264 @@
     model: VIA T8D 3G
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad NAVI 7.3 3G (revision 1)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 70.0.3538.80
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad NAVI 7.3" 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad NAVI 10 3G (revision 1)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 73.0.3683.90
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad NAVI 10.0" 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad NAVI 7.5 3G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 77.0.3865.92
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad NAVI 7.5" 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad SKY 8.1 3G  (revision 1)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.79 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 79.0.3945.79
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad Sky 8.1" 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad STYLE 8 3G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36 OPR/56.0.2780.51441
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Opera
+    short_name: OP
+    version: 56.0.2780.51441
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad Style 8.0" 3G
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad STYLE 10.1 3G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 79.0.3945.93
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad Style 10.1" 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad HIT 3G (revision 1)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.116 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 79.0.3945.116
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad Hit 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad LITE 7.1 (revision 2)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36 OPR/54.1.2672.49808
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Opera
+    short_name: OP
+    version: 54.1.2672.49808
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad Lite 7.1"
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad LITE 7.2 (revision 1)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 75.0.3770.143
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad Lite 7.2"
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad QUAD 10 3G (revision 1)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.111 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 76.0.3809.111
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad Quad 10.0" 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad QUAD 7 3G (revision 1)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 77.0.3865.92
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad Quad 7.0" 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad QUAD 7.2 3G (revision 1)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 78.0.3904.90
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad Quad 7.2" 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; X-pad SHINE 8.1 3G 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 Webview
+    short_name: CV
+    version: 30.0.0.0
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad Shine 8.1" 3G
+  os_family: Android
+  browser_family: Chrome
+
diff --git a/Tests/fixtures/tablet-4.yml b/Tests/fixtures/tablet-4.yml
@@ -4208,7 +4208,7 @@
   device:
     type: tablet
     brand: TZ
-    model: X-pad NAVI 10 3G
+    model: X-pad NAVI 10.0" 3G
   os_family: Android
   browser_family: Chrome
 - 
@@ -4228,7 +4228,7 @@
   device:
     type: tablet
     brand: TZ
-    model: X-pad NAVI 7.3 3G
+    model: X-pad NAVI 7.3" 3G
   os_family: Android
   browser_family: Chrome
 - 
@@ -4248,7 +4248,7 @@
   device:
     type: tablet
     brand: TZ
-    model: X-pad NAVI 7.4 3G
+    model: X-pad NAVI 7.4" 3G
   os_family: Android
   browser_family: Chrome
 - 
@@ -4268,7 +4268,7 @@
   device:
     type: tablet
     brand: TZ
-    model: X-pad NAVI 8.2 3G
+    model: X-pad NAVI 8.2" 3G
   os_family: Android
   browser_family: Opera
 - 
@@ -4328,7 +4328,7 @@
   device:
     type: tablet
     brand: TZ
-    model: X-pad Rapid 8.2 4G
+    model: X-pad Rapid 8.2" 4G
   os_family: Android
   browser_family: Chrome
 - 
@@ -4348,7 +4348,7 @@
   device:
     type: tablet
     brand: TZ
-    model: X-pad Style 10
+    model: X-pad Style 10.0"
   os_family: Android
   browser_family: Opera
 - 
@@ -4368,7 +4368,7 @@
   device:
     type: tablet
     brand: TZ
-    model: X-pad Style 10 3G
+    model: X-pad Style 10.0" 3G
   os_family: Android
   browser_family: Chrome
 - 

diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -12377,7 +12377,7 @@ Tesco:
 
 # teXet
 teXet:
-  regex: 'Texet|(NaviPad [^/;]*) Build|TM-(?:1046|1058|1057|1067|3000|3200R|3500|4003|4071|450[34]|451[30]|4377|4082R|550[83]|5010|5017|507[4-7]|5[23]77|6003|6906|702[13]|7055HD|709[69]|9747BT|9758|9751HD|9767|5513|520[410]|5505|507[13]|5581|7859|8044|9748[ _]3G|9720|7047HD[ _]3G|9757|9740|4982|4515|4083|500[3567]|5571|3204R|5016|8043|7047HD[ _]3G|8041HD|8066|705[23]|7041|8041HD|8051|8048|974[96]|973[78]W|974[170]|9743W|9750HD|7043XD|7049|7887|7037W|702[46])|TB-(771A|711A)|X-Force[\(-]?TM-5009\)?|X-Plus[\(-]?TM-5577\)?|X-pad (?:AIR 8|iX 7) 3G'
+  regex: 'Texet|(NaviPad [^/;]*) Build|TM-(?:1046|1058|1057|1067|3000|3200R|3500|4003|4071|450[34]|451[30]|4377|4082R|550[83]|5010|5017|507[4-7]|5[23]77|6003|6906|702[13]|7055HD|709[69]|9747BT|9758|9751HD|9767|5513|520[410]|5505|507[13]|5581|7859|8044|9748[ _]3G|9720|7047HD[ _]3G|9757|9740|4982|4515|4083|500[3567]|5571|3204R|5016|8043|7047HD[ _]3G|8041HD|8066|705[23]|7041|8041HD|8051|8048|974[96]|973[78]W|974[170]|9743W|9750HD|7043XD|7049|7887|7037W|702[46])|TB-(771A|711A)|X-Force[\(-]?TM-5009\)?|X-Plus[\(-]?TM-5577\)?|X-pad (?:AIR 8|iX 7|NAVI 7.[35]|NAVI 10|SKY 8.1|STYLE 8|STYLE 10.1|HIT|LITE 7.[12]|QUAD (?:7.2|10|7)|SHINE 8.1)(?: 3G)?'
   device: 'tablet'
   models:
     - regex: 'TM-9749'
@@ -12395,23 +12395,45 @@ teXet:
     - regex: 'TM-7055HD'
       model: 'NaviPad 3G'
     - regex: 'TM-9758'
-      model: 'X-pad Style 10'
+      model: 'X-pad Style 10.0"'
+    - regex: 'X-pad SHINE 8.1 3G'
+      model: 'X-pad Shine 8.1" 3G'
+    - regex: 'X-pad QUAD 10 3G'
+      model: 'X-pad Quad 10.0" 3G'
+    - regex: 'X-pad QUAD 7 3G'
+      model: 'X-pad Quad 7.0" 3G'
+    - regex: 'X-pad QUAD 7.2 3G'
+      model: 'X-pad Quad 7.2" 3G'
+    - regex: 'X-pad STYLE 8 3G'
+      model: 'X-pad Style 8.0" 3G'
+    - regex: 'X-pad HIT 3G'
+      model: 'X-pad Hit 3G'
+    - regex: 'X-pad LITE (7.[12])'
+      model: 'X-pad Lite $1"'
+    - regex: 'TM-9767'
+      model: 'X-pad Style 10.0" 3G'
+    - regex: 'X-pad STYLE 10.1 3G'
+      model: 'X-pad Style 10.1" 3G'
     - regex: '(X-pad (?:AIR 8|iX 7) 3G)'
       model: '$1'
-    - regex: 'TM-7096'
-      model: 'X-pad NAVI 7.3 3G'
+    - regex: 'TM-7096|X-pad NAVI 7.3 3G'
+      model: 'X-pad NAVI 7.3" 3G'
     - regex: 'TM-7099'
-      model: 'X-pad NAVI 7.4 3G'
-    - regex: 'TM-1046'
-      model: 'X-pad NAVI 10 3G'
+      model: 'X-pad NAVI 7.4" 3G'
+    - regex: 'X-pad NAVI 7.5 3G'
+      model: 'X-pad NAVI 7.5" 3G'
+    - regex: 'X-pad SKY 8.1 3G'
+      model: 'X-pad Sky 8.1" 3G'
+    - regex: 'TM-1046|X-pad NAVI 10 3G'
+      model: 'X-pad NAVI 10.0" 3G'
     - regex: 'TM-7859'
-      model: 'X-pad NAVI 8.2 3G'
+      model: 'X-pad NAVI 8.2" 3G'
     - regex: 'TM-7049'
       model: 'NaviPad TM-7049 3G'
     - regex: 'TM-7887'
       model: 'NaviPad TM-7887 3G'
     - regex: 'TM-8066'
-      model: 'X-pad Rapid 8.2 4G'
+      model: 'X-pad Rapid 8.2" 4G'
     - regex: '(TM-(?:1057|1067|6906|8043|9748[_ ]3G|9740|9757(?:[_ ]3G)?|7047HD[ _]3G|9747BT|9751HD|702[13]|705[23]|7041|9720|7047HD[_ ]3G|8044|8041HD|973[78]W|9743W|974[710]|9750HD|7043XD|7037W|702[46])|TB-(?:771A|711A|8041HD))'
       model: '$1'
     - regex: 'TM-4503'
@@ -12432,8 +12454,6 @@ teXet:
     - regex: 'TM-4515'
       device: 'smartphone'
       model: 'X-Style'
-    - regex: 'TM-9767'
-      model: 'X-pad Style 10 3G'
     - regex: 'TM-(5016|3500)'
       device: 'smartphone'
       model: 'X-Maxi 2'