From ca75ea9f82965e181f8a72a18f2b300fe7f7c9b8 Mon Sep 17 00:00:00 2001 From: euzu Date: Tue, 31 Dec 2024 12:31:40 +0100 Subject: [PATCH] clippy fixes --- src/api/xtream_api.rs | 2 +- src/repository/kodi_repository.rs | 2 +- src/utils/request_utils.rs | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/api/xtream_api.rs b/src/api/xtream_api.rs index 85f60e28b..c58f935b0 100644 --- a/src/api/xtream_api.rs +++ b/src/api/xtream_api.rs @@ -199,7 +199,7 @@ async fn xtream_player_api_stream( } let extension = stream_ext.unwrap_or_else( - || extract_extension_from_url(&pli.url).map_or_else(String::new, |ext| ext.to_string())); + || extract_extension_from_url(&pli.url).map_or_else(String::new, std::string::ToString::to_string)); let query_path = if stream_req.action_path.is_empty() { format!("{}{extension}", pli.provider_id) diff --git a/src/repository/kodi_repository.rs b/src/repository/kodi_repository.rs index e4113298d..36de1cf25 100644 --- a/src/repository/kodi_repository.rs +++ b/src/repository/kodi_repository.rs @@ -400,7 +400,7 @@ fn get_strm_url(credentials_and_server_info: Option<&(ProxyUserCredentials, ApiP _ => None, } { let url = str_item_info.url.as_str(); - let ext = extract_extension_from_url(url).map_or_else(String::new, |ext| ext.to_string()); + let ext = extract_extension_from_url(url).map_or_else(String::new, std::string::ToString::to_string); format!("{}/{stream_type}/{}/{}/{}{ext}", server_info.get_base_url(), user.username, diff --git a/src/utils/request_utils.rs b/src/utils/request_utils.rs index 2ba5148c5..2f3f81016 100644 --- a/src/utils/request_utils.rs +++ b/src/utils/request_utils.rs @@ -370,11 +370,9 @@ pub fn extract_extension_from_url(url: &str) -> Option<&str> { return Some(&path[last_dot_pos..]); } } - } else { - if let Some(last_dot_pos) = url.rfind('.') { - if last_dot_pos > url.rfind('/').unwrap_or(0) { - return Some(&url[last_dot_pos..]); - } + } else if let Some(last_dot_pos) = url.rfind('.') { + if last_dot_pos > url.rfind('/').unwrap_or(0) { + return Some(&url[last_dot_pos..]); } } None