matomo-org#5829 detect teXet devices: TM-7099, TM-9758, TM-7047HD 3G,…

… TM-7021, TM-9720, TM-5277, TM-9740, TM-9737W, TM-9741, TM-9758, TM-7043XD, NaviPad, TM-7037W, TM-7024, TM-7026
sanchezzzhak · Oct 16, 2018 · bfb1738 · bfb1738
1 parent 0b916fc
commit bfb1738
Show file tree

Hide file tree

Showing 2 changed files with 352 additions and 4 deletions.
diff --git a/Tests/fixtures/smartphone-6.yml b/Tests/fixtures/smartphone-6.yml
@@ -8422,4 +8422,344 @@
     brand: T8
     model: TM-SM410
   os_family: Android
-  browser_family: Chrome
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 Linux; Android 4.4.2; TM-7099 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: TZ
+    model: X-pad NAVI 7.4 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 Linux; Android 4.4.2; TM-9758 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: TZ
+    model: TM-9758
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 Linux; Android 4.1.1; TM-7047HD 3G Build/JRO03H; ru-ru AppleWebKit/537.36 KHTML, like Gecko Chrome/59.0.3071.117 Safari/537.36 Puffin/7.1.2.18064AT
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1.1
+    platform: ""
+  client:
+    type: browser
+    name: Puffin
+    short_name: PU
+    version: 7.1.2.18064
+    engine: WebKit
+    engine_version: "537.36"
+  device:
+    type: tablet
+    brand: TZ
+    model: TM-7047HD 3G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 2.2.1; ru-ru; TM-7021 Build/MID) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
+  os:
+    name: Android
+    short_name: AND
+    version: 2.2.1
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: "533.1"
+  device:
+    type: tablet
+    brand: TZ
+    model: TM-7021
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; ru-ru; TM-9720 Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0.3
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: TZ
+    model: TM-9720
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 Linux; U; Android 4.1.2; ru-ru; TM-5277 Build/JZO54K AppleWebKit/534.30 KHTML, like Gecko Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1.2
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: smartphone
+    brand: TZ
+    model: TM-5277
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 Linux; U; Android 4.1.1; ru-ru; TM-9740 Build/JRO03H 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
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: TZ
+    model: TM-9740
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; ru-ru; TM-9737W Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0.3
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: TZ
+    model: TM-9737W
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; ru-ru; TM-9741 Build/V1.1.ICECREAMSANDWICH.rus.teXet.20120829.211009) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0.3
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: TZ
+    model: TM-9741
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; TM-9758 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.158 Safari/537.36 OPR/47.3.2249.130976
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4.2
+    platform: ""
+  client:
+    type: browser
+    name: Opera
+    short_name: OP
+    version: 47.3.2249.130976
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: X-pad Style 10
+  os_family: Android
+  browser_family: Opera
+-
+  user_agent: Mozilla/5.0 Linux; U; Android 4.1.1; en-US; TM-9750HD Build/JRO03H 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: 4.1.1
+    platform: ""
+  client:
+    type: browser
+    name: UC Browser
+    short_name: UC
+    version: 11.2.0.915
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: TZ
+    model: TM-9750HD
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 Linux; U; Android 4.1.1; en-US; TM-7043XD Build/JRO03C AppleWebKit/534.30 KHTML, like Gecko Version/4.0 UCBrowser/11.0.8.855 U3/0.8.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1.1
+    platform: ""
+  client:
+    type: browser
+    name: UC Browser
+    short_name: UC
+    version: 11.0.8.855
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: TZ
+    model: TM-7043XD
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 Linux; U; Android 4.1.2; ru-ru; NaviPad TM-7049 3Grevision 1 AppleWebKit/537.16 KHTML, like Gecko Version/4.0 Safari/537.16 Chrome/33.0.0.0
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 33.0.0.0
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: NaviPad TM-7049 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; ru-ru; NaviPad TM-7887 3G (revision 1) AppleWebKit/537.16 (KHTML, like Gecko) Version/4.0 Safari/537.16 Chrome/33.0.0.0
+  os:
+    name: Android
+    short_name: AND
+    version: 4.2.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 33.0.0.0
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: NaviPad TM-7887 3G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 Linux; Android 4.0.3; TM-7037W Build/IML74K AppleWebKit/537.36 KHTML, like Gecko Chrome/42.0.2311.111 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0.3
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 42.0.2311.111
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: TM-7037W
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 Linux; Android 4.0.4; TM-7024 Build/IMM76D AppleWebKit/537.36 KHTML, like Gecko Chrome/42.0.2311.111 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0.4
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: 42.0.2311.111
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: TZ
+    model: TM-7024
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 Linux; U; Android 4.0.4; ru-ru; TM-7026 revision 4 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
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: TZ
+    model: TM-7026
+  os_family: Android
+  browser_family: Android Browser
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -6420,7 +6420,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|5377|6003|6906|7023|7055HD|7096|9747BT|9751HD|9767|5513|520[410]|5505|507[13]|5581|7859|8044|9748[ _]3G|9757|4982|4515|4083|500[3567]|5571|3204R|5016|8043|7047HD[ _]3G|8041HD|8066|705[23]|7041|8041HD|8051|8048|974[96]|9738W|9743W)|TB-(771A|711A)|X-Force[\(-]?TM-5009\)?|X-Plus[\(-]?TM-5577\)?'
+  regex: 'Texet|(NaviPad [^/;]*) Build|TM-(?:1046|1058|1057|1067|3000|3200R|3500|4003|4071|450[34]|451[30]|4377|4082R|550[83]|5010|5017|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[10]|9743W|9758|9750HD|7043XD|7049|7887|7037W|702[46])|TB-(771A|711A)|X-Force[\(-]?TM-5009\)?|X-Plus[\(-]?TM-5577\)?'
   device: 'tablet'
   models:
     - regex: 'TM-9749'
@@ -6437,20 +6437,28 @@ teXet:
       model: '$1'
     - regex: 'TM-7055HD'
       model: 'NaviPad 3G'
+    - regex: 'TM-9758'
+      model: 'X-pad Style 10'
     - regex: 'TM-7096'
       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'
     - regex: 'TM-7859'
       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'
-    - regex: '(TM-(?:1057|1067|6906|8043|9748|9757(?:[_ ]3G)?|9747BT|9751HD|7023|705[23]|7041|7047HD[_ ]3G|8044|8041HD|9738W|9743W)|TB-(?:771A|711A|8041HD))'
+    - regex: '(TM-(?:1057|1067|6906|8043|9748|9757(?:[_ ]3G)?|7047HD[ _]3G|9747BT|9758|9751HD|702[13]|705[23]|7041|9720|7047HD[_ ]3G|8044|8041HD|973[78]W|9743W|974[10]|9750HD|7043XD|7037W|702[46])|TB-(?:771A|711A|8041HD))'
       model: '$1'
     - regex: 'TM-4503'
       device: 'smartphone'
       model: 'X-quad'
-    - regex: '(TM-(?:3000|3200R|4003|4083|4377|4504|451[30]|500[356]|5377|5571|3204R|520[04]|5581|5505|507[13]|5017|6003|5513))'
+    - regex: '(TM-(?:3000|3200R|4003|4083|4377|4504|451[30]|500[356]|5[23]77|5571|3204R|520[04]|5581|5505|507[13]|5017|6003|5513))'
       device: 'smartphone'
       model: '$1'
     - regex: 'TM-5006'