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

fix: update ecosia browser regex to match multiple versioning structures #595

Merged
merged 1 commit into from
Jul 10, 2024
Merged

fix: update ecosia browser regex to match multiple versioning structures #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions regexes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,9 +487,9 @@ user_agent_parsers:
family_replacement: 'Tenta Browser'

# Ecosia on iOS / Android
- regex: '(Ecosia) ios@(\d+)\.(\d+)\.(\d+)\.(\d+)'
- regex: '(Ecosia) ios@(\d+)(?:\.(\d+)|)(?:\.(\d+)|)(?:\.(\d+)|)'
family_replacement: 'Ecosia iOS'
- regex: '(Ecosia) android@(\d+)\.(\d+)\.(\d+)\.(\d+)'
- regex: '(Ecosia) android@(\d+)(?:\.(\d+)|)(?:\.(\d+)|)(?:\.(\d+)|)'
Copy link

@ecotopian ecotopian Jul 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@csazevedo Loads of thanks for creating the PR! ✨ 🌳

For the sake of simplicity I would suggest to use (Ecosia) android@(\d+)

This would also match both versions, is easier to read and takes less processing steps. Same for iOS. What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would be ok with that but it doesn't follow the same pattern as the other ones that try to capture major, minor and patch versions. In this case if only the major version is provided it will be captured. If there's more detailed information it also captures it.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see - I did not consider that part. In that case your solution works just fine!

family_replacement: 'Ecosia Android'

# Chrome Mobile
Expand Down
7 changes: 7 additions & 0 deletions tests/test_ua.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8797,6 +8797,13 @@ test_cases:
patch: '4951'
patch_minor: '41'

- user_agent_string: 'Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Mobile Safari/537.36 (Ecosia android@119)'
family: 'Ecosia Android'
major: '119'
minor:
patch:
patch_minor:

- user_agent_string: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 MullvadBrowser/102.13.0'
family: 'MullvadBrowser'
major: '102'
Expand Down
Loading