kyfx
/
SeleniumBase
mirror of https://github.com/seleniumbase/SeleniumBase.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve CFT and CHS downloads on Windows

This commit is contained in:
Michael Mintz 2025-01-28 20:43:22 -05:00
parent 270d409d93
commit d94a2c9003
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
seleniumbase/console_scripts/sb_install.py
View File

@ -39,6 +39,7 @@ import time
import tarfile import tarfile
import urllib3 import urllib3
import zipfile import zipfile
from contextlib import suppress
from seleniumbase.fixtures import constants from seleniumbase.fixtures import constants
from seleniumbase.fixtures import shared_utils from seleniumbase.fixtures import shared_utils
from seleniumbase import config as sb_config from seleniumbase import config as sb_config
@ -1200,7 +1201,7 @@ def main(override=None, intel_for_uc=None, force_uc=None):
driver_path = None driver_path = None
driver_file = None driver_file = None
base_path = os.sep.join(zip_file_path.split(os.sep)[:-1]) base_path = os.sep.join(zip_file_path.split(os.sep)[:-1])
folder_name = contents[0].split(os.sep)[0] folder_name = contents[0].split("/")[0]
folder_path = os.path.join(base_path, folder_name) folder_path = os.path.join(base_path, folder_name)
if IS_MAC or IS_LINUX: if IS_MAC or IS_LINUX:
if ( if (
@ -1221,12 +1222,14 @@ def main(override=None, intel_for_uc=None, force_uc=None):
zip_file_path, zip_file_path,
"-DestinationPath", "-DestinationPath",
downloads_folder, downloads_folder,
"-Force",
] ]
) )
else: else:
zip_ref.extractall(downloads_folder) zip_ref.extractall(downloads_folder)
zip_ref.close() zip_ref.close()
os.remove(zip_file_path) with suppress(Exception):
os.remove(zip_file_path)
log_d("%sUnzip Complete!%s\n" % (c2, cr)) log_d("%sUnzip Complete!%s\n" % (c2, cr))
pr_base_path = c3 + base_path + cr pr_base_path = c3 + base_path + cr
pr_sep = c3 + os.sep + cr pr_sep = c3 + os.sep + cr
@ -1240,7 +1243,7 @@ def main(override=None, intel_for_uc=None, force_uc=None):
driver_path = None driver_path = None
driver_file = None driver_file = None
base_path = os.sep.join(zip_file_path.split(os.sep)[:-1]) base_path = os.sep.join(zip_file_path.split(os.sep)[:-1])
folder_name = contents[0].split(os.sep)[0] folder_name = contents[0].split("/")[0]
folder_path = os.path.join(base_path, folder_name) folder_path = os.path.join(base_path, folder_name)
if IS_MAC or IS_LINUX: if IS_MAC or IS_LINUX:
if ( if (
@ -1261,12 +1264,14 @@ def main(override=None, intel_for_uc=None, force_uc=None):
zip_file_path, zip_file_path,
"-DestinationPath", "-DestinationPath",
downloads_folder, downloads_folder,
"-Force",
] ]
) )
else: else:
zip_ref.extractall(downloads_folder) zip_ref.extractall(downloads_folder)
zip_ref.close() zip_ref.close()
os.remove(zip_file_path) with suppress(Exception):
os.remove(zip_file_path)
log_d("%sUnzip Complete!%s\n" % (c2, cr)) log_d("%sUnzip Complete!%s\n" % (c2, cr))
pr_base_path = c3 + base_path + cr pr_base_path = c3 + base_path + cr
pr_sep = c3 + os.sep + cr pr_sep = c3 + os.sep + cr