allow downloading of recent versions of chrome

webdriver_manager/core/archive.py

@@ -43,19 +43,18 @@ def __extract_zip(self, to_directory):
                 "Permission denied",
             ]:
                 raise e
-            file_names = []
-            for n in archive.namelist():
-                if "/" not in n:
-                    file_names.append(n)
-                else:
-                    file_path, file_name = n.split("/")
-                    full_file_path = os.path.join(to_directory, file_path)
-                    source = os.path.join(full_file_path, file_name)
-                    destination = os.path.join(to_directory, file_name)
-                    os.rename(source, destination)
-                    file_names.append(file_name)
-            return sorted(file_names, key=lambda x: x.lower())
-        return archive.namelist()
+        file_names = []
+        for n in archive.namelist():
+            if "/" not in n:
+                file_names.append(n)
+            else:
+                file_path, file_name = n.split("/")
+                full_file_path = os.path.join(to_directory, file_path)
+                source = os.path.join(full_file_path, file_name)
+                destination = os.path.join(to_directory, file_name)
+                os.rename(source, destination)
+                file_names.append(file_name)
+        return sorted(file_names, key=lambda x: x.lower())
 
     def __extract_tar_file(self, to_directory):
         try:

webdriver_manager/core/utils.py

@@ -24,10 +24,15 @@ def filename(self) -> str:
             return self.file_name
         try:
             content = self.__stream.headers["content-disposition"]
-
-            content_disposition_list = re.split(";", content)
-            filenames = [re.findall(self.__regex_filename, element) for element in content_disposition_list]
-            filename = next(filter(None, next(filter(None, next(filter(None, filenames))))))
+            if "attachment" in content.lower():
+                if "octe" in self.__stream.headers["content-type"]:
+                    filename = f"{self.__temp_name}.zip"
+                else:
+                    raise Exception("Unknown Attachment Type")
+            else:
+                content_disposition_list = re.split(";", content)
+                filenames = [re.findall(self.__regex_filename, element) for element in content_disposition_list]
+                filename = next(filter(None, next(filter(None, next(filter(None, filenames))))))  # type: ignore
         except KeyError:
             filename = f"{self.__temp_name}.zip"
         except (IndexError, StopIteration):

webdriver_manager/drivers/chrome.py

@@ -3,6 +3,7 @@
 from webdriver_manager.core.driver import Driver
 from webdriver_manager.core.logger import log
 from webdriver_manager.core.utils import ChromeType, is_arch, is_mac_os
+import re
 
 
 class ChromeDriver(Driver):
@@ -45,15 +46,30 @@ def get_driver_download_url(self):
         if version.parse(driver_version_to_download) < version.parse("106.0.5249.61"):
             os_type = os_type.replace("mac_arm64", "mac64_m1")
 
-        if version.parse(driver_version_to_download) >= version.parse("113"):
+        if version.parse(driver_version_to_download) >= version.parse("115"):
             if os_type == "mac64":
                 os_type = "mac-x64"
+            if os_type == "mac_x64":
+                os_type = "mac-x64"
             if os_type in ["mac_64", "mac64_m1", "mac_arm64"]:
                 os_type = "mac-arm64"
-
             modern_version_url = self.get_url_for_version_and_platform(driver_version_to_download, os_type)
-            log(f"Modern chrome version {modern_version_url}")
-            return modern_version_url
+            if modern_version_url != None:
+                log(f"Modern chrome version {modern_version_url}")
+                return modern_version_url
+            else:
+                if len(driver_version_to_download) < 4:
+                    release_version = self.get_latest_release_for_version(driver_version_to_download)
+                    modern_version_url = self.get_url_for_version_and_platform(release_version, os_type)
+                    if modern_version_url != None:
+                        log(f"Modern chrome version {modern_version_url}")
+                        return modern_version_url
+                elif re.search(r"^\d+\.\d+\.\d+$", driver_version_to_download):
+                    release_version = self.get_latest_patch_version_for_build_version(build_version=driver_version_to_download)
+                    modern_version_url = self.get_url_for_version_and_platform(release_version, os_type)
+                    if modern_version_url != None:
+                        log(f"Modern chrome version {modern_version_url}")
+                        return modern_version_url
 
         return f"{self._url}/{driver_version_to_download}/{self.get_name()}_{os_type}.zip"
 
@@ -62,6 +78,11 @@ def get_browser_type(self):
 
     def get_latest_release_version(self):
         determined_browser_version = self.get_browser_version_from_os()
+
+        if isinstance(determined_browser_version, str):
+            if version.parse(determined_browser_version) >= version.parse("115"):
+                return determined_browser_version
+
         log(f"Get LATEST {self._name} version for {self._browser_type}")
         if version.parse(determined_browser_version) >= version.parse("113"):
             return determined_browser_version
@@ -74,6 +95,7 @@ def get_latest_release_version(self):
         resp = self._http_client.get(url=latest_release_url)
         return resp.text.rstrip()
 
+
     def get_url_for_version_and_platform(self, browser_version, platform):
         url = "https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json"
         response = self._http_client.get(url)
@@ -85,5 +107,20 @@ def get_url_for_version_and_platform(self, browser_version, platform):
                 for d in downloads:
                     if d["platform"] == platform:
                         return d["url"]
+        return None
 
-        raise Exception(f"No such driver version {browser_version} for {platform}")
+    def get_latest_release_for_version(self, version):
+        url = "https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json"
+        response = self._http_client.get(url)
+        data = response.json()
+        versions =[v["version"] for v in data["channels"].values()]
+        for v in versions:
+            if version in v:
+                return v 
+        return None
+
+    def get_latest_patch_version_for_build_version(self, build_version):
+        url = "https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build.json"
+        response = self._http_client.get(url)
+        data = response.json()
+        return data["builds"][build_version]["version"]