Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: Add table sort classes and aria-sort attribute #142

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Draft: Add table sort classes and aria-sort attribute #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a68453
Rename template variables to omit leading numbers
ryandesign May 9, 2022
c07bc57
Add aria-sort attribute to the appropriate th
ryandesign May 9, 2022
8f1e66e
Add sort criterion and order classes to table tag
ryandesign May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 112 additions & 29 deletions ngx_http_fancyindex_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,10 +617,10 @@ make_header_buf(ngx_http_request_t *r, const ngx_str_t css_href)
{
ngx_buf_t *b;
size_t blen = r->uri.len
+ ngx_sizeof_ssz(t01_head1)
+ ngx_sizeof_ssz(t02_head2)
+ ngx_sizeof_ssz(t03_head3)
+ ngx_sizeof_ssz(t04_body1)
+ ngx_sizeof_ssz(t_head1)
+ ngx_sizeof_ssz(t_head2)
+ ngx_sizeof_ssz(t_head3)
+ ngx_sizeof_ssz(t_body1)
;

if (css_href.len) {
Expand All @@ -633,18 +633,18 @@ make_header_buf(ngx_http_request_t *r, const ngx_str_t css_href)
if ((b = ngx_create_temp_buf(r->pool, blen)) == NULL)
return NULL;

b->last = ngx_cpymem_ssz(b->last, t01_head1);
b->last = ngx_cpymem_ssz(b->last, t_head1);

if (css_href.len) {
b->last = ngx_cpymem_str(b->last, css_href_pre);
b->last = ngx_cpymem_str(b->last, css_href);
b->last = ngx_cpymem_str(b->last, css_href_post);
}

b->last = ngx_cpymem_ssz(b->last, t02_head2);
b->last = ngx_cpymem_ssz(b->last, t_head2);
b->last = ngx_cpymem_str(b->last, r->uri);
b->last = ngx_cpymem_ssz(b->last, t03_head3);
b->last = ngx_cpymem_ssz(b->last, t04_body1);
b->last = ngx_cpymem_ssz(b->last, t_head3);
b->last = ngx_cpymem_ssz(b->last, t_body1);

return b;
}
Expand All @@ -667,7 +667,7 @@ make_content_buf(
ngx_tm_t tm;
ngx_array_t entries;
ngx_time_t *tp;
ngx_uint_t i, j;
ngx_uint_t i, j, sort_criterion;
ngx_str_t path;
ngx_dir_t dir;
ngx_buf_t *b;
Expand Down Expand Up @@ -851,17 +851,37 @@ make_content_buf(

if (alcf->show_path)
len = r->uri.len + escape_html
+ ngx_sizeof_ssz(t05_body2)
+ ngx_sizeof_ssz(t06_list1)
+ ngx_sizeof_ssz(t_body2)
+ ngx_sizeof_ssz(t_list_begin)
+ ngx_sizeof_ssz(t_list_head)
+ ngx_sizeof_ssz("desc sort-col-1")
+ ngx_sizeof_ssz(t_list_colhead_name1)
+ ngx_sizeof_ssz(t_list_colhead_name2)
+ ngx_sizeof_ssz(t_list_colhead_size1)
+ ngx_sizeof_ssz(t_list_colhead_size2)
+ ngx_sizeof_ssz(t_list_colhead_date1)
+ ngx_sizeof_ssz(t_list_colhead_date2)
+ ngx_sizeof_ssz(" aria-sort=\"descending\"")
+ ngx_sizeof_ssz(t_list_mid)
+ ngx_sizeof_ssz(t_parentdir_entry)
+ ngx_sizeof_ssz(t07_list2)
+ ngx_sizeof_ssz(t_list_end)
+ ngx_fancyindex_timefmt_calc_size (&alcf->time_format) * entries.nelts
;
else
len = r->uri.len + escape_html
+ ngx_sizeof_ssz(t06_list1)
+ ngx_sizeof_ssz(t_list_begin)
+ ngx_sizeof_ssz(t_list_head)
+ ngx_sizeof_ssz("desc sort-col-1")
+ ngx_sizeof_ssz(t_list_colhead_name1)
+ ngx_sizeof_ssz(t_list_colhead_name2)
+ ngx_sizeof_ssz(t_list_colhead_size1)
+ ngx_sizeof_ssz(t_list_colhead_size2)
+ ngx_sizeof_ssz(t_list_colhead_date1)
+ ngx_sizeof_ssz(t_list_colhead_date2)
+ ngx_sizeof_ssz(" aria-sort=\"descending\"")
+ ngx_sizeof_ssz(t_list_mid)
+ ngx_sizeof_ssz(t_parentdir_entry)
+ ngx_sizeof_ssz(t07_list2)
+ ngx_sizeof_ssz(t_list_end)
+ ngx_fancyindex_timefmt_calc_size (&alcf->time_format) * entries.nelts
;

Expand Down Expand Up @@ -923,44 +943,51 @@ make_content_buf(
case 'M': /* Sort by mtime */
if (sort_descending) {
sort_cmp_func = ngx_http_fancyindex_cmp_entries_mtime_desc;
if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE_DESC)
sort_criterion = NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE_DESC;
if (sort_criterion != alcf->default_sort)
sort_url_args = "?C=M&O=D";
}
else {
sort_cmp_func = ngx_http_fancyindex_cmp_entries_mtime_asc;
if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE)
sort_criterion = NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE;
if (sort_criterion != alcf->default_sort)
sort_url_args = "?C=M&O=A";
}
break;
case 'S': /* Sort by size */
if (sort_descending) {
sort_cmp_func = ngx_http_fancyindex_cmp_entries_size_desc;
if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE_DESC)
sort_criterion = NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE_DESC;
if (sort_criterion != alcf->default_sort)
sort_url_args = "?C=S&O=D";
}
else {
sort_cmp_func = ngx_http_fancyindex_cmp_entries_size_asc;
if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE)
sort_url_args = "?C=S&O=A";
sort_criterion = NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE;
if (sort_criterion != alcf->default_sort)
sort_url_args = "?C=S&O=A";
}
break;
case 'N': /* Sort by name */
default:
if (sort_descending) {
sort_cmp_func = ngx_http_fancyindex_cmp_entries_name_desc;
if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME_DESC)
sort_criterion = NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME_DESC;
if (sort_criterion != alcf->default_sort)
sort_url_args = "?C=N&O=D";
}
else {
sort_cmp_func = ngx_http_fancyindex_cmp_entries_name_asc;
if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME)
sort_criterion = NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME;
if (sort_criterion != alcf->default_sort)
sort_url_args = "?C=N&O=A";
}
break;
}
}
else {
switch (alcf->default_sort) {
sort_criterion = alcf->default_sort;
switch (sort_criterion) {
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE_DESC:
sort_cmp_func = ngx_http_fancyindex_cmp_entries_mtime_desc;
break;
Expand Down Expand Up @@ -1025,11 +1052,67 @@ make_content_buf(
/* Display the path, if needed */
if (alcf->show_path){
b->last = last = (u_char *) ngx_escape_html(b->last, r->uri.data, r->uri.len);
b->last = ngx_cpymem_ssz(b->last, t05_body2);
b->last = ngx_cpymem_ssz(b->last, t_body2);
}

/* Open the <table> tag */
b->last = ngx_cpymem_ssz(b->last, t06_list1);
b->last = ngx_cpymem_ssz(b->last, t_list_begin);
switch (sort_criterion) {
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME_DESC:
b->last = ngx_cpymem_ssz(b->last, "desc sort-col-1");
break;
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME:
b->last = ngx_cpymem_ssz(b->last, "asc sort-col-1");
break;
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE_DESC:
b->last = ngx_cpymem_ssz(b->last, "desc sort-col-2");
break;
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE:
b->last = ngx_cpymem_ssz(b->last, "asc sort-col-2");
break;
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE_DESC:
b->last = ngx_cpymem_ssz(b->last, "desc sort-col-3");
break;
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE:
b->last = ngx_cpymem_ssz(b->last, "asc sort-col-3");
break;
}
b->last = ngx_cpymem_ssz(b->last, t_list_head);

/* Write the column headers */
b->last = ngx_cpymem_ssz(b->last, t_list_colhead_name1);
switch (sort_criterion) {
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME_DESC:
b->last = ngx_cpymem_ssz(b->last, " aria-sort=\"descending\"");
break;
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME:
b->last = ngx_cpymem_ssz(b->last, " aria-sort=\"ascending\"");
break;
}
b->last = ngx_cpymem_ssz(b->last, t_list_colhead_name2);
b->last = ngx_cpymem_ssz(b->last, t_list_colhead_size1);
switch (sort_criterion) {
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE_DESC:
b->last = ngx_cpymem_ssz(b->last, " aria-sort=\"descending\"");
break;
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE:
b->last = ngx_cpymem_ssz(b->last, " aria-sort=\"ascending\"");
break;
}
b->last = ngx_cpymem_ssz(b->last, t_list_colhead_size2);
b->last = ngx_cpymem_ssz(b->last, t_list_colhead_date1);
switch (sort_criterion) {
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE_DESC:
b->last = ngx_cpymem_ssz(b->last, " aria-sort=\"descending\"");
break;
case NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE:
b->last = ngx_cpymem_ssz(b->last, " aria-sort=\"ascending\"");
break;
}
b->last = ngx_cpymem_ssz(b->last, t_list_colhead_date2);

/* Begin the table body */
b->last = ngx_cpymem_ssz(b->last, t_list_mid);

tp = ngx_timeofday();

Expand Down Expand Up @@ -1129,7 +1212,7 @@ make_content_buf(
}

/* Output table bottom */
b->last = ngx_cpymem_ssz(b->last, t07_list2);
b->last = ngx_cpymem_ssz(b->last, t_list_end);

*pb = b;
return NGX_OK;
Expand Down Expand Up @@ -1259,8 +1342,8 @@ ngx_http_fancyindex_handler(ngx_http_request_t *r)
out[last].buf->pos = alcf->footer.local.data;
out[last].buf->last = alcf->footer.local.data + alcf->footer.local.len;
} else {
out[last].buf->pos = (u_char*) t08_foot1;
out[last].buf->last = (u_char*) t08_foot1 + sizeof(t08_foot1) - 1;
out[last].buf->pos = (u_char*) t_foot;
out[last].buf->last = (u_char*) t_foot + sizeof(t_foot) - 1;
}

out[last-1].buf->last_in_chain = 0;
Expand Down Expand Up @@ -1321,8 +1404,8 @@ ngx_http_fancyindex_handler(ngx_http_request_t *r)
if (out[0].buf == NULL)
return NGX_ERROR;
out[0].buf->memory = 1;
out[0].buf->pos = (u_char*) t08_foot1;
out[0].buf->last = (u_char*) t08_foot1 + sizeof(t08_foot1) - 1;
out[0].buf->pos = (u_char*) t_foot;
out[0].buf->last = (u_char*) t_foot + sizeof(t_foot) - 1;
out[0].buf->last_in_chain = 1;
out[0].buf->last_buf = 1;
/* Directly send out the builtin footer */
Expand Down
83 changes: 63 additions & 20 deletions template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Automagically generated, do not edit! */
static const u_char t01_head1[] = ""
static const u_char t_head1[] = ""
"<!DOCTYPE html>"
"<html>"
"<head>"
Expand Down Expand Up @@ -41,33 +41,68 @@ static const u_char t01_head1[] = ""
"text-overflow: '>';"
"overflow: hidden;"
"}"
".sort-col-1 th:nth-of-type(1),"
".sort-col-2 th:nth-of-type(2),"
".sort-col-3 th:nth-of-type(3) {"
"background:#ddd;"
"}"
".sort-col-1 td:nth-of-type(1),"
".sort-col-2 td:nth-of-type(2),"
".sort-col-3 td:nth-of-type(3) {"
"background:#eee;"
"}"
".sort-col-1 tr:nth-child(even) td:nth-of-type(1),"
".sort-col-2 tr:nth-child(even) td:nth-of-type(2),"
".sort-col-3 tr:nth-child(even) td:nth-of-type(3) {"
"background:#e4e4e4;"
"}"
"</style>"
"\n"
;
static const u_char t02_head2[] = ""
static const u_char t_head2[] = ""
"\n"
"<title>Index of "
;
static const u_char t03_head3[] = ""
static const u_char t_head3[] = ""
"</title>"
"\n"
"</head>"
;
static const u_char t04_body1[] = ""
static const u_char t_body1[] = ""
"<body>"
"<h1>Index of "
;
static const u_char t05_body2[] = ""
static const u_char t_body2[] = ""
"</h1>"
"\n"
;
static const u_char t06_list1[] = ""
"<table id=\"list\">"
static const u_char t_list_begin[] = ""
"<table id=\"list\" class=\""
;
static const u_char t_list_head[] = ""
"\">"
"<thead>"
"<tr>"
"<th colspan=\"2\"><a href=\"?C=N&amp;O=A\">File Name</a>&nbsp;<a href=\"?C=N&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
"<th><a href=\"?C=S&amp;O=A\">File Size</a>&nbsp;<a href=\"?C=S&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
"<th><a href=\"?C=M&amp;O=A\">Date</a>&nbsp;<a href=\"?C=M&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
;
static const u_char t_list_colhead_name1[] = ""
"<th colspan=\"2\""
;
static const u_char t_list_colhead_name2[] = ""
"><a href=\"?C=N&amp;O=A\">File Name</a>&nbsp;<a href=\"?C=N&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
;
static const u_char t_list_colhead_size1[] = ""
"<th"
;
static const u_char t_list_colhead_size2[] = ""
"><a href=\"?C=S&amp;O=A\">File Size</a>&nbsp;<a href=\"?C=S&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
;
static const u_char t_list_colhead_date1[] = ""
"<th"
;
static const u_char t_list_colhead_date2[] = ""
"><a href=\"?C=M&amp;O=A\">Date</a>&nbsp;<a href=\"?C=M&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
;
static const u_char t_list_mid[] = ""
"</tr>"
"</thead>"
"\n"
Expand All @@ -81,22 +116,30 @@ static const u_char t_parentdir_entry[] = ""
"</tr>"
"\n"
;
static const u_char t07_list2[] = ""
static const u_char t_list_end[] = ""
"</tbody>"
"</table>"
;
static const u_char t08_foot1[] = ""
static const u_char t_foot[] = ""
"</body>"
"</html>"
;
#define NFI_TEMPLATE_SIZE (0 \
+ nfi_sizeof_ssz(t01_head1) \
+ nfi_sizeof_ssz(t02_head2) \
+ nfi_sizeof_ssz(t03_head3) \
+ nfi_sizeof_ssz(t04_body1) \
+ nfi_sizeof_ssz(t05_body2) \
+ nfi_sizeof_ssz(t06_list1) \
+ nfi_sizeof_ssz(t_head1) \
+ nfi_sizeof_ssz(t_head2) \
+ nfi_sizeof_ssz(t_head3) \
+ nfi_sizeof_ssz(t_body1) \
+ nfi_sizeof_ssz(t_body2) \
+ nfi_sizeof_ssz(t_list_begin) \
+ nfi_sizeof_ssz(t_list_head) \
+ nfi_sizeof_ssz(t_list_colhead_name1) \
+ nfi_sizeof_ssz(t_list_colhead_name2) \
+ nfi_sizeof_ssz(t_list_colhead_size1) \
+ nfi_sizeof_ssz(t_list_colhead_size2) \
+ nfi_sizeof_ssz(t_list_colhead_date1) \
+ nfi_sizeof_ssz(t_list_colhead_date2) \
+ nfi_sizeof_ssz(t_list_mid) \
+ nfi_sizeof_ssz(t_parentdir_entry) \
+ nfi_sizeof_ssz(t07_list2) \
+ nfi_sizeof_ssz(t08_foot1) \
+ nfi_sizeof_ssz(t_list_end) \
+ nfi_sizeof_ssz(t_foot) \
)
Loading