YGGverse/ggemtext
1
0
Fork 0
mirror of https://github.com/YGGverse/ggemtext.git synced 2026-03-31 17:15:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix protocol-relative URI links resolve #1

Browse source
This commit is contained in:
yggverse 2024-11-12 07:25:36 +02:00
parent 93c7f738b7
commit dfb23931e3
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/line/link.rs
View file

@ -23,7 +23,18 @@ impl Link {
); );
// Detect address required to continue // Detect address required to continue
let unresolved_address = regex.get(1)?; let mut unresolved_address = regex.get(1)?.to_string();
// Seems that [Uri resolver](https://docs.gtk.org/glib/type_func.Uri.resolve_relative.html)
// does not support [protocol-relative URI](https://datatracker.ietf.org/doc/html/rfc3986#section-4.2)
// resolve manually
if unresolved_address.starts_with("//:") {
let scheme = match base {
Some(base) => base.scheme(),
None => return None,
};
unresolved_address = unresolved_address.replace("//:", &format!("{scheme}://"));
}
// Convert address to the valid URI // Convert address to the valid URI
let uri = match base { let uri = match base {
@ -54,7 +65,7 @@ impl Link {
// Base resolve not requested // Base resolve not requested
None => { None => {
// Just try convert address to valid URI // Just try convert address to valid URI
match Uri::parse(unresolved_address, UriFlags::NONE) { match Uri::parse(&unresolved_address, UriFlags::NONE) {
Ok(unresolved_uri) => unresolved_uri, Ok(unresolved_uri) => unresolved_uri,
Err(_) => return None, Err(_) => return None,
} }