File tree Expand file tree Collapse file tree 7 files changed +29
-11
lines changed Expand file tree Collapse file tree 7 files changed +29
-11
lines changed Original file line number Diff line number Diff line change @@ -192,7 +192,11 @@ impl SeleniumManager for ChromeManager {
192
192
"Reading {} version from {}" ,
193
193
& self . driver_name, driver_url
194
194
) ) ;
195
- match read_version_from_link ( self . get_http_client ( ) , driver_url) {
195
+ match read_version_from_link (
196
+ self . get_http_client ( ) ,
197
+ driver_url,
198
+ self . get_logger ( ) ,
199
+ ) {
196
200
Ok ( version) => {
197
201
driver_version = version;
198
202
break ;
Original file line number Diff line number Diff line change @@ -65,8 +65,12 @@ pub async fn download_driver_to_tmp_folder(
65
65
Ok ( ( tmp_dir, target_path) )
66
66
}
67
67
68
- pub fn read_version_from_link ( http_client : & Client , url : String ) -> Result < String , Box < dyn Error > > {
69
- parse_version ( read_content_from_link ( http_client, url) ?)
68
+ pub fn read_version_from_link (
69
+ http_client : & Client ,
70
+ url : String ,
71
+ log : & Logger ,
72
+ ) -> Result < String , Box < dyn Error > > {
73
+ parse_version ( read_content_from_link ( http_client, url) ?, log)
70
74
}
71
75
72
76
#[ tokio:: main]
@@ -81,6 +85,10 @@ pub async fn read_content_from_link(
81
85
pub async fn read_redirect_from_link (
82
86
http_client : & Client ,
83
87
url : String ,
88
+ log : & Logger ,
84
89
) -> Result < String , Box < dyn Error > > {
85
- parse_version ( http_client. get ( & url) . send ( ) . await ?. url ( ) . path ( ) . to_string ( ) )
90
+ parse_version (
91
+ http_client. get ( & url) . send ( ) . await ?. url ( ) . path ( ) . to_string ( ) ,
92
+ log,
93
+ )
86
94
}
Original file line number Diff line number Diff line change @@ -192,7 +192,8 @@ impl SeleniumManager for EdgeManager {
192
192
"Reading {} version from {}" ,
193
193
& self . driver_name, driver_url
194
194
) ) ;
195
- let driver_version = read_version_from_link ( self . get_http_client ( ) , driver_url) ?;
195
+ let driver_version =
196
+ read_version_from_link ( self . get_http_client ( ) , driver_url, self . get_logger ( ) ) ?;
196
197
197
198
if !browser_version. is_empty ( ) {
198
199
metadata. drivers . push ( create_driver_metadata (
Original file line number Diff line number Diff line change @@ -179,8 +179,9 @@ pub fn get_binary_extension(os: &str) -> &str {
179
179
}
180
180
}
181
181
182
- pub fn parse_version ( version_text : String ) -> Result < String , Box < dyn Error > > {
182
+ pub fn parse_version ( version_text : String , log : & Logger ) -> Result < String , Box < dyn Error > > {
183
183
if version_text. to_ascii_lowercase ( ) . contains ( "error" ) {
184
+ log. debug ( format ! ( "Error parsing version: {}" , version_text) ) ;
184
185
return Err ( PARSE_ERROR . into ( ) ) ;
185
186
}
186
187
let mut parsed_version = "" . to_string ( ) ;
Original file line number Diff line number Diff line change @@ -178,7 +178,8 @@ impl SeleniumManager for FirefoxManager {
178
178
}
179
179
_ => {
180
180
let latest_url = format ! ( "{}{}" , DRIVER_URL , LATEST_RELEASE ) ;
181
- let driver_version = read_redirect_from_link ( self . get_http_client ( ) , latest_url) ?;
181
+ let driver_version =
182
+ read_redirect_from_link ( self . get_http_client ( ) , latest_url, self . get_logger ( ) ) ?;
182
183
183
184
if !browser_version. is_empty ( ) {
184
185
metadata. drivers . push ( create_driver_metadata (
Original file line number Diff line number Diff line change @@ -134,8 +134,10 @@ impl SeleniumManager for IExplorerManager {
134
134
135
135
let index_release =
136
136
driver_url. rfind ( IEDRIVER_RELEASE ) . unwrap ( ) + IEDRIVER_RELEASE . len ( ) ;
137
- let driver_version =
138
- parse_version ( driver_url. as_str ( ) [ index_release..] . to_string ( ) ) ?;
137
+ let driver_version = parse_version (
138
+ driver_url. as_str ( ) [ index_release..] . to_string ( ) ,
139
+ self . get_logger ( ) ,
140
+ ) ?;
139
141
140
142
if !browser_version. is_empty ( ) {
141
143
metadata. drivers . push ( create_driver_metadata (
Original file line number Diff line number Diff line change @@ -170,7 +170,8 @@ pub trait SeleniumManager {
170
170
Ok ( out) => out,
171
171
Err ( _e) => continue ,
172
172
} ;
173
- let full_browser_version = parse_version ( output) . unwrap_or_default ( ) ;
173
+ let full_browser_version =
174
+ parse_version ( output, self . get_logger ( ) ) . unwrap_or_default ( ) ;
174
175
if full_browser_version. is_empty ( ) {
175
176
continue ;
176
177
}
@@ -254,7 +255,7 @@ pub trait SeleniumManager {
254
255
. run_shell_command_with_log ( format_one_arg ( DASH_DASH_VERSION , self . get_driver_name ( ) ) )
255
256
{
256
257
Ok ( output) => {
257
- let parsed_version = parse_version ( output) . unwrap_or_default ( ) ;
258
+ let parsed_version = parse_version ( output, self . get_logger ( ) ) . unwrap_or_default ( ) ;
258
259
if !parsed_version. is_empty ( ) {
259
260
let which_command = if WINDOWS . is ( self . get_os ( ) ) {
260
261
WHERE_COMMAND
You can’t perform that action at this time.
0 commit comments