Skip to content

Commit

Permalink
feat(device) detect brand Huawei model: Honor Pad V6 (KRJ-W09)
Browse files Browse the repository at this point in the history
feat(device) detect brand Lenovo models: TAB3 7 Plus (TB-7703X), M10 (TB-X505X), Tab M8 (TB-8505F)

issue matomo-org#6517
  • Loading branch information
sanchezzzhak committed Dec 10, 2020
1 parent 1cbcf50 commit 636c2fa
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 11 deletions.
73 changes: 72 additions & 1 deletion Tests/fixtures/smartphone-19.yml
Original file line number Diff line number Diff line change
Expand Up @@ -845,4 +845,75 @@
model: HV320WHB-N55
os_family: Android
browser_family: Unknown

-
user_agent: Mozilla/5.0 (Linux; arm; Android 10; KRJ-W09) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 YaApp_Android/20.94.0/apad YaSearchBrowser/20.94.0/apad BroPP/1.0 SA/3 Mobile Safari/537.36
os:
name: Android
version: "10"
platform: ARM
client:
type: browser
name: Yandex Browser
version: 20.94.0
engine: Blink
engine_version: ""
device:
type: tablet
brand: Huawei
model: Honor Pad V6
os_family: Android
browser_family: Unknown
-
user_agent: Mozilla/5.0 (Linux; Android 6.0.1; Lenovo TB-7703X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Mobile Safari/537.36
os:
name: Android
version: 6.0.1
platform: ""
client:
type: browser
name: Chrome Mobile
version: 86.0.4240.198
engine: Blink
engine_version: ""
device:
type: tablet
brand: Lenovo
model: TAB3 7 Plus
os_family: Android
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; Android 9; Lenovo TB-X505X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Safari/537.36
os:
name: Android
version: "9"
platform: ""
client:
type: browser
name: Chrome
version: 83.0.4103.106
engine: Blink
engine_version: ""
device:
type: tablet
brand: Lenovo
model: M10
os_family: Android
browser_family: Chrome
-
user_agent: Mozilla/5.0 (Linux; arm_64; Android 9; Lenovo TB-8505F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 YaApp_Android/20.111.0 YaSearchBrowser/20.111.0 BroPP/1.0 SA/3 Mobile Safari/537.36
os:
name: Android
version: "9"
platform: ARM
client:
type: browser
name: Yandex Browser
version: 20.111.0
engine: Blink
engine_version: ""
device:
type: tablet
brand: Lenovo
model: Tab M8
os_family: Android
browser_family: Unknown
30 changes: 20 additions & 10 deletions regexes/device/mobiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5938,7 +5938,7 @@ Minix:

# Huawei
Huawei:
regex: '(HW-)?(?:Huawei|MediaPad T1|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANE|ARE|ARS|ASK|ATH|ATU|AUM|BAC|BAH[23]?|BG2|BGO|B[ZK]K|BKL|BL[ALN]|BND|BTV|CA[GMNZ]|CH[CM]|CHE[12]?|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|GEM|GRA|HDN|HLK|HMA|Hol|HRY|HWI|H[36]0|INE|JAT|JDN|JDN2|JKM|JMM|JSN|KII|KIW|KNT|KOB|KSA|LDN|LEO|LIO|LLD|LND|LON|LRA|LUA|LY[AO]|MAR|MHA|MRD|MYA|NCE|NEM|NEO|NXT|PAR|PCT|PIC|PLE|PLK|POT|PRA|RIO|RNE|RVL|SCC|SCL|SCM|SEA|SHT|SLA|SNE|SPN|STF|STK|TAG|TIT|TNY|TRT|VCE|VEN|VIE|VKY|VNS|VOG|VRD|VTR|WAS|YAL|G(?:527|620S|621|630|735)|Y(?:221|330|550|6[23]5))-(?:[A-Z]{0,2}[0-9]{1,4}[A-Z]{0,3}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))(?:[);/ ]|$))|hi6210sft|PE-(UL00|TL[12]0|TL00M)|T1-(A21[Lw]|A23L|701u|823L)|G7-(?:L01|TL00)|HW-01K|JNY-(LX[12]|AL10)|OXF-AN[01]0|TAS-(A[LN]00|L29|TL00)|WLZ-(AL10|AN00)|NIC-LX1A|MRX-(AL09|W09)|CDY-(?:[AT]N00|AN90|NX9A)|GLK-[AT]L00|JER-[AT]N10|ELS-(?:[AT]N[10]0|NX9|N39|N04)|AKA-(AL10|L29)|MON-(W|AL)19|BMH-AN[12]0|AQM-([AT]L[01]0|LX1)|MOA-(AL[02]0|LX9N)|NTS-AL00|ART-(?:[AT]L00[xm]|L29N?)|JEF-(?:[AT]N00|AN20)|MED-(?:[AT]L00|LX9N?)|EBG-AN[01]0|ANA-(?:[AT]N00|NX9)|BZ[AK]-W00|BZT-(W09|AL[01]0)|HDL-(AL09|W09)|HWV3[123]|HW-02L|TEL-[AT]N(?:00a?|10)|KKG-AN00|MXW-AN00|JKM-AL00[ab]|TAH-(?:N29|AN00)m|C8817D|T1-821W|d-01J|d-02[HK]|HWT31|Y320-U10|Y541-U02|VAT-L19|70[14]HW|60[58]HW|TNNH-AN00|LIO-(?:[TA]L00|[LN]29|AN00)|KOB2-[LW]09|PPA-LX2|AGS3-L09|DNN-LX9|NEY-NX9|LON-AL00'
regex: '(HW-)?(?:Huawei|MediaPad T1|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANE|ARE|ARS|ASK|ATH|ATU|AUM|BAC|BAH[23]?|BG2|BGO|B[ZK]K|BKL|BL[ALN]|BND|BTV|CA[GMNZ]|CH[CM]|CHE[12]?|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|GEM|GRA|HDN|HLK|HMA|Hol|HRY|HWI|H[36]0|INE|JAT|JDN|JDN2|JKM|JMM|JSN|KII|KIW|KNT|KOB|KSA|LDN|LEO|LIO|LLD|LND|LON|LRA|LUA|LY[AO]|MAR|MHA|MRD|MYA|NCE|NEM|NEO|NXT|PAR|PCT|PIC|PLE|PLK|POT|PRA|RIO|RNE|RVL|SCC|SCL|SCM|SEA|SHT|SLA|SNE|SPN|STF|STK|TAG|TIT|TNY|TRT|VCE|VEN|VIE|VKY|VNS|VOG|VRD|VTR|WAS|YAL|G(?:527|620S|621|630|735)|Y(?:221|330|550|6[23]5))-(?:[A-Z]{0,2}[0-9]{1,4}[A-Z]{0,3}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))(?:[);/ ]|$))|hi6210sft|PE-(UL00|TL[12]0|TL00M)|T1-(A21[Lw]|A23L|701u|823L)|G7-(?:L01|TL00)|HW-01K|JNY-(LX[12]|AL10)|OXF-AN[01]0|TAS-(A[LN]00|L29|TL00)|WLZ-(AL10|AN00)|NIC-LX1A|MRX-(AL09|W09)|CDY-(?:[AT]N00|AN90|NX9A)|GLK-[AT]L00|JER-[AT]N10|ELS-(?:[AT]N[10]0|NX9|N39|N04)|AKA-(AL10|L29)|MON-(W|AL)19|BMH-AN[12]0|AQM-([AT]L[01]0|LX1)|MOA-(AL[02]0|LX9N)|NTS-AL00|ART-(?:[AT]L00[xm]|L29N?)|JEF-(?:[AT]N00|AN20)|MED-(?:[AT]L00|LX9N?)|EBG-AN[01]0|ANA-(?:[AT]N00|NX9)|BZ[AK]-W00|BZT-(W09|AL[01]0)|HDL-(AL09|W09)|HWV3[123]|HW-02L|TEL-[AT]N(?:00a?|10)|KKG-AN00|MXW-AN00|JKM-AL00[ab]|TAH-(?:N29|AN00)m|C8817D|T1-821W|d-01J|d-02[HK]|KRJ-W09|HWT31|Y320-U10|Y541-U02|VAT-L19|70[14]HW|60[58]HW|TNNH-AN00|LIO-(?:[TA]L00|[LN]29|AN00)|KOB2-[LW]09|PPA-LX2|AGS3-L09|DNN-LX9|NEY-NX9|LON-AL00'
device: 'smartphone'
models:
- regex: 'POT-[TA]L00a(?:[);/ ]|$)'
Expand Down Expand Up @@ -6466,6 +6466,9 @@ Huawei:
- regex: 'JDN-(?:AL00|W09)(?:[);/ ]|$)'
model: 'Honor Pad 2'
device: 'tablet'
- regex: 'KRJ-W09(?:[);/ ]|$)'
model: 'Honor Pad V6'
device: 'tablet'
- regex: 'MON-(W|AL)19(?:[);/ ]|$)'
device: 'tablet'
model: 'MatePad C5 8'
Expand Down Expand Up @@ -8112,6 +8115,9 @@ Lenovo:
- regex: 'TB3-710[IF]'
model: 'TAB3 7 Essential'
device: 'tablet'
- regex: 'TB-7703X'
model: 'TAB3 7 Plus'
device: 'tablet'
- regex: 'TB3-X70L'
model: 'TAB3 10 Plus'
device: 'tablet'
Expand Down Expand Up @@ -8203,12 +8209,6 @@ Lenovo:
- regex: 'ThinkPad ?Tablet([^;/]*) Build'
model: 'ThinkPad Tablet$1'
device: 'tablet'
- regex: 'IdeaPad ?([^;/]*) Build'
model: 'IdeaPad $1'
device: 'tablet'
- regex: 'Lenovo TAB ?([^/;]*) Build'
model: 'TAB $1'
device: 'tablet'
- regex: 'Lenovo ?A3300-(?:GV|H)'
model: 'TAB 2 A7-30'
device: 'tablet'
Expand All @@ -8221,10 +8221,10 @@ Lenovo:
- regex: 'TB-X304F'
model: 'TAB4 10'
device: 'tablet'
- regex: 'Lenovo TB-X505F'
- regex: 'TB-X505[FX]'
model: 'M10'
device: 'tablet'
- regex: 'Lenovo TB-X104[FXL]'
- regex: 'TB-X104[FXL]'
model: 'E10'
device: 'tablet'
- regex: 'Tab2A([0-9]-[0-9]{2}[a-z]?)'
Expand All @@ -8236,9 +8236,12 @@ Lenovo:
- regex: 'Yoga Tablet([^;/]+) Build'
model: 'Yoga Tablet$1'
device: 'tablet'
- regex: 'Lenovo TB\-X704F Build/NMF26F'
- regex: 'TB-X704F'
model: 'Tab 4 10 Plus'
device: 'tablet'
- regex: 'TB-8505F'
model: 'Tab M8'
device: 'tablet'
- regex: 'Lenovo (TB[0-9]?\-[a-z0-9\-]+) Build'
model: '$1'
device: 'tablet'
Expand Down Expand Up @@ -8306,11 +8309,18 @@ Lenovo:
model: 'Phab 2'
- regex: '(S90-A|P70-A)(?:[);/ ]|$)'
model: '$1'
- regex: 'IdeaPad ?([^;/]*) Build'
model: 'IdeaPad $1'
device: 'tablet'
- regex: 'Lenovo TAB ?([^/;]*) Build'
model: 'TAB $1'
device: 'tablet'
- regex: 'Lenovo ([^/;]*) Build'
model: '$1'
- regex: '(?:LNV-|Lenovo-)?Lenovo[ \-_]?([a-z0-9_+\-]+)'
model: '$1'


# Lexand
Lexand:
regex: '(?:SC7 PRO HD|S5A[1-4]|S4A[1-5]|S6A1|A811|A802)(?:[);/ ]|$)|Lexand ([^;/]+) Build'
Expand Down

0 comments on commit 636c2fa

Please sign in to comment.