jinql
/
ngx-fancyindex
mirror of https://github.com/aperezdc/ngx-fancyindex
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 8f1e66edee into f50d7b799f

pull/142/merge
Ryan Schmidt 2022-07-20 16:18:16 +03:00 committed by GitHub
parent f50d7b799f 8f1e66edee
commit b2f92e6db6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 216 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
ngx_http_fancyindex_module.c
View File

@ -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) {
@ -633,7 +633,7 @@ 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);
@ -641,10 +641,10 @@ make_header_buf(ngx_http_request_t *r, const ngx_str_t 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;
}
@ -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;
@ -854,17 +854,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
;
@ -926,44 +946,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;
@ -1028,11 +1055,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();
@ -1132,7 +1215,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;
@ -1262,8 +1345,8 @@ add_builtin_header:
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;
@ -1324,8 +1407,8 @@ add_builtin_header:
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 */

83
template.h
View File

@ -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>"
@ -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"
@ -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) \
)

53
template.html
View File

@ -1,4 +1,4 @@
<!-- var t01_head1 -->
<!-- var t_head1 -->
<!DOCTYPE html>
<html>
<head>
@ -40,32 +40,61 @@
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>
<!-- var t02_head2 -->
<!-- var t_head2 -->
<title>Index of
<!-- var NONE -->
/path/to/somewhere
<!-- var t03_head3 -->
<!-- var t_head3 -->
</title>
</head>
<!-- var t04_body1 -->
<!-- var t_body1 -->
<body>
<h1>Index of
<!-- var NONE -->
/path/to/somewhere
<!-- var t05_body2 -->
<!-- var t_body2 -->
</h1>
<!-- var t06_list1 -->
<table id="list">
<!-- var t_list_begin -->
<table id="list" class="
<!-- var NONE -->
asc sort-col-1
<!-- var 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>
<!-- var t_list_colhead_name1 -->
<th colspan="2"
<!-- var 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>
<!-- var t_list_colhead_size1 -->
<th
<!-- var 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>
<!-- var t_list_colhead_date1 -->
<th
<!-- var 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>
<!-- var t_list_mid -->
</tr>
</thead>
@ -93,9 +122,9 @@
<td>666</td>
<td>date</td>
</tr>
<!-- var t07_list2 -->
<!-- var t_list_end -->
</tbody>
</table>
<!-- var t08_foot1 -->
<!-- var t_foot -->
</body>
</html>