mirror of
https://github.com/YGGverse/Yoda.git
synced 2026-03-31 16:45:27 +00:00
validate absolute links conversion success
This commit is contained in:
parent
1c5a8d58f0
commit
899bb290e9
1 changed files with 11 additions and 7 deletions
|
|
@ -252,6 +252,7 @@ Glib::ustring Reader::Make::link(
|
|||
const Glib::ustring & DATE,
|
||||
const Glib::ustring & ALT
|
||||
) {
|
||||
// Compose link description using optional date/alt values
|
||||
Glib::ustring description;
|
||||
|
||||
if (!DATE.empty())
|
||||
|
|
@ -264,19 +265,22 @@ Glib::ustring Reader::Make::link(
|
|||
if (!ALT.empty())
|
||||
{
|
||||
description.append(
|
||||
description.empty() ? ALT : description + " " + ALT // append (to date)
|
||||
description.empty() ? ALT : description + " " + ALT
|
||||
);
|
||||
}
|
||||
|
||||
return Glib::ustring::sprintf(
|
||||
"<a href=\"%s\" title=\"%s\">%s</a>\n",
|
||||
Glib::Markup::escape_text(
|
||||
g_uri_resolve_relative(
|
||||
// Make relative links absolute using base given
|
||||
const auto ABSOLUTE = g_uri_resolve_relative(
|
||||
BASE.c_str(),
|
||||
ADDRESS.c_str(),
|
||||
G_URI_FLAGS_NONE,
|
||||
NULL // GError * @TODO
|
||||
)
|
||||
);
|
||||
|
||||
return Glib::ustring::sprintf(
|
||||
"<a href=\"%s\" title=\"%s\">%s</a>\n",
|
||||
Glib::Markup::escape_text(
|
||||
ABSOLUTE == NULL ? ADDRESS : ABSOLUTE // @TODO exception?
|
||||
),
|
||||
Glib::Markup::escape_text(
|
||||
ADDRESS
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue