cel
/
dillo-zet
mirror of https://git.scuttlebot.io/%25R1c3tDmS57iZ5G%2Bg4UkLSWQehG%2FWUVLd1Y9XkTlng8Y%3D.sha256
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preserve query string in rendered zet links

Browse Source
main
cel 5 years ago
parent 3b136aefee
commit 58a831d3fc
Signed by: cel
GPG Key ID: C28D95BB012367EA
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File

36
zet.dpi.c
Unescape View File

@ -73,6 +73,11 @@ struct zet_mtime {
int mtime; int mtime;
}; };
struct zet_renderopt {
struct html_renderopt html;
const char *query;
};
enum page { enum page {
PAGE_NEW, PAGE_NEW,
PAGE_ALL, PAGE_ALL,
@ -618,9 +623,9 @@ static void parse_req_uri(char *path, char **hashp, char **queryp) {
static int static int
md_rndr_link(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *content, void *opaque) md_rndr_link(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *content, void *opaque)
{ {
struct html_renderopt *options = opaque; struct zet_renderopt *options = opaque;
if (link != NULL && (options->flags & HTML_SAFELINK) != 0 && !sd_autolink_issafe(link->data, link->size)) if (link != NULL && (options->html.flags & HTML_SAFELINK) != 0 && !sd_autolink_issafe(link->data, link->size))
return 0; return 0;
BUFPUTSL(ob, "<a href=\""); BUFPUTSL(ob, "<a href=\"");
@ -636,6 +641,11 @@ md_rndr_link(struct buf *ob, const struct buf *link, const struct buf *title, co
} else if (!strncmp((char *)link->data, "§", sigil_size)) { } else if (!strncmp((char *)link->data, "§", sigil_size)) {
houdini_escape_href(ob, link->data + sigil_size, houdini_escape_href(ob, link->data + sigil_size,
link->size - sigil_size); link->size - sigil_size);
const char *query = options->query;
if (query != NULL) {
bufputc(ob, '?');
bufputs(ob, query);
}
} else } else
houdini_escape_href(ob, link->data, link->size); houdini_escape_href(ob, link->data, link->size);
} }
@ -645,9 +655,9 @@ md_rndr_link(struct buf *ob, const struct buf *link, const struct buf *title, co
houdini_escape_html0(ob, title->data, title->size, 0); houdini_escape_html0(ob, title->data, title->size, 0);
} }
if (options->link_attributes) { if (options->html.link_attributes) {
bufputc(ob, '\"'); bufputc(ob, '\"');
options->link_attributes(ob, link, opaque); options->html.link_attributes(ob, link, opaque);
bufputc(ob, '>'); bufputc(ob, '>');
} else { } else {
BUFPUTSL(ob, "\">"); BUFPUTSL(ob, "\">");
@ -661,7 +671,7 @@ md_rndr_link(struct buf *ob, const struct buf *link, const struct buf *title, co
static int static int
md_rndr_image(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *alt, void *opaque) md_rndr_image(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *alt, void *opaque)
{ {
struct html_renderopt *options = opaque; struct zet_renderopt *options = opaque;
if (!link || !link->size) return 0; if (!link || !link->size) return 0;
BUFPUTSL(ob, "<img src=\""); BUFPUTSL(ob, "<img src=\"");
@ -708,12 +718,12 @@ static void put_link_truncated(struct buf *ob, const struct buf *link, int max_l
static int static int
md_rndr_autolink(struct buf *ob, const struct buf *link, enum mkd_autolink type, void *opaque) md_rndr_autolink(struct buf *ob, const struct buf *link, enum mkd_autolink type, void *opaque)
{ {
struct html_renderopt *options = opaque; struct zet_renderopt *options = opaque;
if (!link || !link->size) if (!link || !link->size)
return 0; return 0;
if ((options->flags & HTML_SAFELINK) != 0 && if ((options->html.flags & HTML_SAFELINK) != 0 &&
!sd_autolink_issafe(link->data, link->size) && !sd_autolink_issafe(link->data, link->size) &&
type != MKDA_EMAIL) type != MKDA_EMAIL)
return 0; return 0;
@ -743,9 +753,9 @@ md_rndr_autolink(struct buf *ob, const struct buf *link, enum mkd_autolink type,
} }
} }
if (options->link_attributes) { if (options->html.link_attributes) {
bufputc(ob, '\"'); bufputc(ob, '\"');
options->link_attributes(ob, link, opaque); options->html.link_attributes(ob, link, opaque);
bufputc(ob, '>'); bufputc(ob, '>');
} else { } else {
BUFPUTSL(ob, "\">"); BUFPUTSL(ob, "\">");
@ -844,10 +854,11 @@ static int dpi_serve_zet(int fd, char *path) {
} }
struct sd_callbacks callbacks; struct sd_callbacks callbacks;
struct html_renderopt options; struct zet_renderopt options;
struct sd_markdown *markdown; struct sd_markdown *markdown;
struct buf *ob = bufnew(128); struct buf *ob = bufnew(128);
sdhtml_renderer(&callbacks, &options, HTML_ESCAPE); sdhtml_renderer(&callbacks, &options.html, HTML_ESCAPE);
options.query = query;
callbacks.link = md_rndr_link; callbacks.link = md_rndr_link;
callbacks.image = md_rndr_image; callbacks.image = md_rndr_image;
callbacks.autolink = md_rndr_autolink; callbacks.autolink = md_rndr_autolink;
@ -894,7 +905,8 @@ static int dpi_serve_zet(int fd, char *path) {
result_title[sizeof(result_title)-1] = '\0'; result_title[sizeof(result_title)-1] = '\0';
return 0; return 0;
} }
rc = dprintf(fd, "<li><a href=\"%s\">", result_id); rc = dprintf(fd, "<li><a href=\"%s%s%s\">", result_id,
query ? "?" : "", query ? query : "");
rc |= write_html(fd, result_title, strlen(result_title)); rc |= write_html(fd, result_title, strlen(result_title));
rc |= write_buf(fd, "</a></li>"); rc |= write_buf(fd, "</a></li>");
} while (1); } while (1);

Write Preview
Loading…
Cancel
Save