From 4db9fdd0d694404fb952b4acb49e746f966de554 Mon Sep 17 00:00:00 2001 From: Madis Liias Date: Fri, 6 Jan 2023 22:21:21 +0200 Subject: [PATCH] fix opening an ip --- src/browser_repository.rs | 2 +- src/lib.rs | 10 +++++++--- src/ui.rs | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/browser_repository.rs b/src/browser_repository.rs index 733042d..fb47047 100644 --- a/src/browser_repository.rs +++ b/src/browser_repository.rs @@ -639,7 +639,7 @@ fn convert_spotify_uri(_: Option<&String>, url: &str) -> String { } let url1 = result.unwrap(); - //let domain_maybe = url1.domain(); + //let host_maybe = url1.host_str(); // verify it's "open.spotify.com" ? //let x = url1.path(); diff --git a/src/lib.rs b/src/lib.rs index 6c53a88..63367ec 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -360,7 +360,7 @@ fn get_rule_for_source_app_and_url<'a>( return None; } let given_url = url_result.unwrap(); - let given_url_domain = given_url.domain().unwrap(); + let given_url_host_maybe = given_url.host_str(); for r in opening_rules { let mut source_app_match = false; @@ -371,8 +371,12 @@ fn get_rule_for_source_app_and_url<'a>( continue; } let url_rule = url_rule_result.unwrap(); - let domains_match = url_rule.domain().unwrap() == given_url_domain; - domains_match + + if let Some(given_url_host) = given_url_host_maybe { + url_rule.host_str().unwrap() == given_url_host + } else { + false + } } else { true }; diff --git a/src/ui.rs b/src/ui.rs index 0e5f856..307a7f0 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -879,7 +879,7 @@ impl FilteredBrowsersLens { let url_result = Url::parse(url_str.as_str()); let domain_maybe = url_result .ok() - .map(|url| url.domain().map(|d| d.to_string())) + .map(|url| url.host_str().map(|d| d.to_string())) .flatten(); let mut filtered: Vec = data