Skip to content

Commit b1e500d

Browse files
committed
Improve output for downloading drivers
1 parent 17dae34 commit b1e500d

File tree

1 file changed

+29
-13
lines changed

1 file changed

+29
-13
lines changed

seleniumbase/console_scripts/sb_install.py

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ def main(override=None):
545545
remote_file = requests_get_with_retry(headless_ie_url)
546546
with open(headless_ie_file_path, "wb") as file:
547547
file.write(remote_file.content)
548-
print("Download Complete!\n")
548+
print("%sDownload Complete!%s\n" % (c1, cr))
549549
zip_file_path = headless_ie_file_path
550550
zip_ref = zipfile.ZipFile(zip_file_path, "r")
551551
contents = zip_ref.namelist()
@@ -589,7 +589,7 @@ def main(override=None):
589589
zip_ref.close()
590590
os.remove(zip_file_path)
591591
shutil.copyfile(driver_path, os.path.join(downloads_folder, filename))
592-
print("Unzip Complete!\n")
592+
print("%sUnzip Complete!%s\n" % (c2, cr))
593593
to_remove = [
594594
"%s/%s/ruby_example/Gemfile" % (downloads_folder, h_ie_fn),
595595
"%s/%s/ruby_example/Gemfile.lock" % (downloads_folder, h_ie_fn),
@@ -614,13 +614,16 @@ def main(override=None):
614614
)
615615
print("Making [%s %s] executable ..." % (driver_file, use_version))
616616
make_executable(driver_path)
617-
print("%s[%s] is now ready for use!%s" % (c1, driver_file, cr))
617+
print(
618+
"%s[%s %s] is now ready for use!%s"
619+
% (c1, driver_file, use_version, cr)
620+
)
618621

619622
print("\nDownloading %s from:\n%s ..." % (file_name, download_url))
620623
remote_file = requests_get_with_retry(download_url)
621624
with open(file_path, "wb") as file:
622625
file.write(remote_file.content)
623-
print("Download Complete!\n")
626+
print("%sDownload Complete!%s\n" % (c1, cr))
624627

625628
if file_name.endswith(".zip"):
626629
zip_file_path = file_path
@@ -639,14 +642,17 @@ def main(override=None):
639642
zip_ref.extractall(downloads_folder)
640643
zip_ref.close()
641644
os.remove(zip_file_path)
642-
print("Unzip Complete!\n")
645+
print("%sUnzip Complete!%s\n" % (c2, cr))
643646
for f_name in contents:
644647
new_file = os.path.join(downloads_folder, str(f_name))
645648
pr_file = c3 + new_file + cr
646649
print("The file [%s] was saved to:\n%s\n" % (f_name, pr_file))
647650
print("Making [%s %s] executable ..." % (f_name, use_version))
648651
make_executable(new_file)
649-
print("%s[%s] is now ready for use!%s" % (c1, f_name, cr))
652+
print(
653+
"%s[%s %s] is now ready for use!%s" %
654+
(c1, f_name, use_version, cr)
655+
)
650656
if copy_to_path and os.path.exists(LOCAL_PATH):
651657
path_file = LOCAL_PATH + f_name
652658
shutil.copyfile(new_file, path_file)
@@ -709,7 +715,7 @@ def main(override=None):
709715
zip_ref.extractall(downloads_folder)
710716
zip_ref.close()
711717
os.remove(zip_file_path)
712-
print("Unzip Complete!\n")
718+
print("%sUnzip Complete!%s\n" % (c2, cr))
713719
to_remove = [
714720
"%s/Driver_Notes/credits.html" % downloads_folder,
715721
"%s/Driver_Notes/EULA" % downloads_folder,
@@ -721,13 +727,17 @@ def main(override=None):
721727
if os.path.exists(os.path.join(downloads_folder, "Driver_Notes/")):
722728
# Only works if the directory is empty
723729
os.rmdir(os.path.join(downloads_folder, "Driver_Notes/"))
730+
pr_driver_path = c3 + driver_path + cr
724731
print(
725732
"The file [%s] was saved to:\n%s\n"
726-
% (driver_file, driver_path)
733+
% (driver_file, pr_driver_path)
727734
)
728735
print("Making [%s %s] executable ..." % (driver_file, use_version))
729736
make_executable(driver_path)
730-
print("%s[%s] is now ready for use!%s" % (c1, driver_file, cr))
737+
print(
738+
"%s[%s %s] is now ready for use!%s"
739+
% (c1, driver_file, use_version, cr)
740+
)
731741
if copy_to_path and os.path.exists(LOCAL_PATH):
732742
path_file = LOCAL_PATH + f_name
733743
shutil.copyfile(new_file, path_file)
@@ -755,7 +765,7 @@ def main(override=None):
755765
zip_ref.extractall(downloads_folder)
756766
zip_ref.close()
757767
os.remove(zip_file_path)
758-
print("Unzip Complete!\n")
768+
print("%sUnzip Complete!%s\n" % (c2, cr))
759769
inner_driver = os.path.join(
760770
downloads_folder, inner_folder, driver_file
761771
)
@@ -770,7 +780,10 @@ def main(override=None):
770780
)
771781
print("Making [%s %s] executable ..." % (driver_file, use_version))
772782
make_executable(driver_path)
773-
print("%s[%s] is now ready for use!%s" % (c1, driver_file, cr))
783+
print(
784+
"%s[%s %s] is now ready for use!%s"
785+
% (c1, driver_file, use_version, cr)
786+
)
774787
if copy_to_path and os.path.exists(LOCAL_PATH):
775788
path_file = LOCAL_PATH + driver_file
776789
shutil.copyfile(driver_path, path_file)
@@ -804,14 +817,17 @@ def main(override=None):
804817
tar.extractall(downloads_folder)
805818
tar.close()
806819
os.remove(tar_file_path)
807-
print("Unzip Complete!\n")
820+
print("%sUnzip Complete!%s\n" % (c2, cr))
808821
for f_name in contents:
809822
new_file = os.path.join(downloads_folder, str(f_name))
810823
pr_file = c3 + new_file + cr
811824
print("The file [%s] was saved to:\n%s\n" % (f_name, pr_file))
812825
print("Making [%s %s] executable ..." % (f_name, use_version))
813826
make_executable(new_file)
814-
print("%s[%s] is now ready for use!%s" % (c1, f_name, cr))
827+
print(
828+
"%s[%s %s] is now ready for use!%s"
829+
% (c1, f_name, use_version, cr)
830+
)
815831
if copy_to_path and os.path.exists(LOCAL_PATH):
816832
path_file = LOCAL_PATH + f_name
817833
shutil.copyfile(new_file, path_file)

0 commit comments

Comments
 (0)