Skip to content

Commit df49a48

Browse files
committed
Improve Android regexes and add tests
ref #7944
1 parent 631892f commit df49a48

File tree

3 files changed

+62
-15
lines changed

3 files changed

+62
-15
lines changed

Tests/Parser/fixtures/oss.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5805,3 +5805,59 @@
58055805
version: "2"
58065806
platform: x64
58075807
family: GNU/Linux
5808+
-
5809+
user_agent: 14/tclwebkit1.0.2
5810+
os:
5811+
name: Android
5812+
short_name: AND
5813+
version: 4.0.1
5814+
platform: ""
5815+
family: Android
5816+
-
5817+
user_agent: 15/tclwebkit1.0.2
5818+
os:
5819+
name: Android
5820+
short_name: AND
5821+
version: 4.0.3
5822+
platform: ""
5823+
family: Android
5824+
-
5825+
user_agent: 16/tclwebkit1.0.2
5826+
os:
5827+
name: Android
5828+
short_name: AND
5829+
version: "4.2"
5830+
platform: ""
5831+
family: Android
5832+
-
5833+
user_agent: 18/tclwebkit1.0.2
5834+
os:
5835+
name: Android
5836+
short_name: AND
5837+
version: "4.3"
5838+
platform: ""
5839+
family: Android
5840+
-
5841+
user_agent: 19/tclwebkit1.0.2
5842+
os:
5843+
name: Android
5844+
short_name: AND
5845+
version: "4.4"
5846+
platform: ""
5847+
family: Android
5848+
-
5849+
user_agent: 20/tclwebkit1.0.2
5850+
os:
5851+
name: Android
5852+
short_name: AND
5853+
version: "4.4"
5854+
platform: ""
5855+
family: Android
5856+
-
5857+
user_agent: 21/tclwebkit1.0.2
5858+
os:
5859+
name: Android
5860+
short_name: AND
5861+
version: "5"
5862+
platform: ""
5863+
family: Android

regexes/device/mobiles.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21018,11 +21018,8 @@ Oysters:
2101821018
# Panacom
2101921019
Panacom:
2102021020
regex: 'T-i708D'
21021-
device: 'smartphone'
21022-
models:
21023-
- regex: 'T-i708D'
21024-
device: 'tablet'
21025-
model: 'T-i708D'
21021+
device: 'tablet'
21022+
model: 'T-i708D'
2102621023

2102721024
# panasonic
2102821025
Panasonic:

regexes/oss.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -770,22 +770,16 @@
770770
version: '5.1'
771771
- regex: '(?:21/tclwebkit|Android[ /]21)'
772772
version: '5'
773-
- regex: '(?:20|19)/tclwebkit'
774-
version: '4.4'
775-
- regex: 'Android[ /](?:20|19)'
773+
- regex: '(?:(?:20|19)/tclwebkit|Android[ /](?:20|19))'
776774
version: '4.4'
777775
- regex: '(?:18/tclwebkit|Android[ /]18)'
778776
version: '4.3'
779-
- regex: '(?:17/tclwebkit|Android[ /]17)'
780-
version: '4.2'
781-
- regex: '(?:16/tclwebkit|Android[ /]16)'
777+
- regex: '(?:1[67]/tclwebkit|Android[ /]1[67])'
782778
version: '4.2'
783-
- regex: '15/tclwebkit'
779+
- regex: '(?:15/tclwebkit|Android[ /]15)'
784780
version: '4.0.3'
785-
- regex: '15/tclwebkit'
781+
- regex: '14/tclwebkit'
786782
version: '4.0.1'
787-
- regex: 'Android[ /]15'
788-
version: '4'
789783

790784
##########
791785
# Android

0 commit comments

Comments
 (0)