Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Android regexes #7945

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Improve Android regexes #7945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df49a48
Improve Android regexes and add tests
liviuconcioiu Dec 12, 2024
0e5b6d0
Improve Android regexes
liviuconcioiu Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions Tests/Parser/fixtures/oss.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5805,3 +5805,59 @@
version: "2"
platform: x64
family: GNU/Linux
-
user_agent: 14/tclwebkit1.0.2
os:
name: Android
short_name: AND
version: 4.0.1
platform: ""
family: Android
-
user_agent: 15/tclwebkit1.0.2
os:
name: Android
short_name: AND
version: 4.0.3
platform: ""
family: Android
-
user_agent: 16/tclwebkit1.0.2
os:
name: Android
short_name: AND
version: "4.2"
platform: ""
family: Android
-
user_agent: 18/tclwebkit1.0.2
os:
name: Android
short_name: AND
version: "4.3"
platform: ""
family: Android
-
user_agent: 19/tclwebkit1.0.2
os:
name: Android
short_name: AND
version: "4.4"
platform: ""
family: Android
-
user_agent: 20/tclwebkit1.0.2
os:
name: Android
short_name: AND
version: "4.4"
platform: ""
family: Android
-
user_agent: 21/tclwebkit1.0.2
os:
name: Android
short_name: AND
version: "5"
platform: ""
family: Android
7 changes: 2 additions & 5 deletions regexes/device/mobiles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21018,11 +21018,8 @@ Oysters:
# Panacom
Panacom:
regex: 'T-i708D'
device: 'smartphone'
models:
- regex: 'T-i708D'
device: 'tablet'
model: 'T-i708D'
device: 'tablet'
model: 'T-i708D'

# panasonic
Panasonic:
Expand Down
46 changes: 20 additions & 26 deletions regexes/oss.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,52 +740,46 @@
- regex: '(?:Android API \d+|\d+/tclwebkit(?:\d+[.\d]*)|(?:(?<!\d )Android/\d{2}|(?<!; |\d{4}/)Android (?!1[0-5])\d{2})(?![^ ]))'
name: 'Android'
versions:
- regex: '(?:Android API 35|35/tclwebkit|Android[ /]35)'
- regex: 'Android API 35|35/tclwebkit|Android[ /]35'
version: '15'
- regex: '(?:Android API 34|34/tclwebkit|Android[ /]34)'
- regex: 'Android API 34|34/tclwebkit|Android[ /]34'
version: '14'
- regex: '(?:Android API 33|33/tclwebkit|Android[ /]33)'
- regex: 'Android API 33|33/tclwebkit|Android[ /]33'
version: '13'
- regex: '(?:Android API 32|32/tclwebkit|Android[ /]32)'
- regex: 'Android API 32|32/tclwebkit|Android[ /]32'
version: '12.1'
- regex: '(?:Android API 31|31/tclwebkit|Android[ /]31)'
- regex: 'Android API 31|31/tclwebkit|Android[ /]31'
version: '12'
- regex: '(?:Android API 30|30/tclwebkit|Android[ /]30)'
- regex: 'Android API 30|30/tclwebkit|Android[ /]30'
version: '11'
- regex: '(?:Android API 29|29/tclwebkit|Android[ /]29)'
- regex: 'Android API 29|29/tclwebkit|Android[ /]29'
version: '10'
- regex: '(?:Android API 28|28/tclwebkit|Android[ /]28)'
- regex: 'Android API 28|28/tclwebkit|Android[ /]28'
version: '9'
- regex: '(?:Android API 27|27/tclwebkit|Android[ /]27)'
- regex: 'Android API 27|27/tclwebkit|Android[ /]27'
version: '8.1'
- regex: '(?:Android API 26|26/tclwebkit|Android[ /]26)'
- regex: 'Android API 26|26/tclwebkit|Android[ /]26'
version: '8'
- regex: '(?:Android API 25|25/tclwebkit|Android[ /]25)'
- regex: 'Android API 25|25/tclwebkit|Android[ /]25'
version: '7.1'
- regex: '(?:Android API 24|24/tclwebkit|Android[ /]24)'
- regex: 'Android API 24|24/tclwebkit|Android[ /]24'
version: '7'
- regex: '(?:Android API 23|23/tclwebkit|Android[ /]23)'
- regex: 'Android API 23|23/tclwebkit|Android[ /]23'
version: '6'
- regex: '(?:Android API 22|22/tclwebkit|Android[ /]22)'
- regex: 'Android API 22|22/tclwebkit|Android[ /]22'
version: '5.1'
- regex: '(?:21/tclwebkit|Android[ /]21)'
- regex: 'Android API 21|21/tclwebkit|Android[ /]21'
version: '5'
- regex: '(?:20|19)/tclwebkit'
- regex: 'Android API (?:20|19)|(?:20|19)/tclwebkit|Android[ /](?:20|19)'
version: '4.4'
- regex: 'Android[ /](?:20|19)'
version: '4.4'
- regex: '(?:18/tclwebkit|Android[ /]18)'
- regex: 'Android API 18|18/tclwebkit|Android[ /]18'
version: '4.3'
- regex: '(?:17/tclwebkit|Android[ /]17)'
version: '4.2'
- regex: '(?:16/tclwebkit|Android[ /]16)'
- regex: 'Android API 1[67]|1[67]/tclwebkit|Android[ /]1[67]'
version: '4.2'
- regex: '15/tclwebkit'
- regex: 'Android API 15|15/tclwebkit|Android[ /]15'
version: '4.0.3'
- regex: '15/tclwebkit'
- regex: 'Android API 14|14/tclwebkit|Android[ /]14'
version: '4.0.1'
- regex: 'Android[ /]15'
version: '4'

##########
# Android
Expand Down
Loading