Skip to content

Improve regex for chrome version #33

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

Open
brummetj wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Improve regex for chrome version #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fe4681
feat: improve regex for chrome version
jbrumm730 Jun 4, 2020
37224fa
feat: improve regex for chrome version
jbrumm730 Jun 4, 2020
86978a3
Update version.py
brummetj Jun 5, 2020
4289712
fix version logic & pull last entry in the entry list
jbrumm730 Jun 5, 2020
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
2 changes: 1 addition & 1 deletion webdrivermanager/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

VERSION = '0.8.0'
VERSION = '0.8.1'


def get_version():
Expand Down
8 changes: 5 additions & 3 deletions webdrivermanager/webdrivermanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,8 @@ def get_download_url(self, version='latest'):
"""
if version == 'latest':
version = self._get_latest_version_number()
else:
version = version + '.0' if '.' not in version else version

LOGGER.debug('Detected OS: %sbit %s', self.bitness, self.os_name)

Expand All @@ -426,15 +428,15 @@ def get_download_url(self, version='latest'):
else:
local_bitness = self.bitness

matcher = r'{0}/.*{1}{2}.*'.format(version, self.os_name, local_bitness)
matcher = r'{0}.*/.*{1}{2}.*'.format(version, self.os_name, local_bitness)

entry = [obj for obj in chrome_driver_objects['items'] if re.match(matcher, obj['name'])]
if not entry:
raise_runtime_error('Error, unable to find appropriate download for {0}{1}.'.format(self.os_name, self.bitness))

url = entry[0]['mediaLink']
url = entry[-1]['mediaLink']
filename = os.path.basename(entry[0]['name'])
return (url, filename)
return url, filename


class OperaChromiumDriverManager(WebDriverManagerBase):
Expand Down