From 735c86658d058512f5d86408e18e3c81c32788d1 Mon Sep 17 00:00:00 2001 From: snu-ceyda Date: Thu, 9 Jul 2020 14:56:15 +0900 Subject: fileserver: Enable browse pagination with offset parameter (#3542) * Update browse.go * Update browselisting.go * Update browsetpl.go * fix linter err * Update modules/caddyhttp/fileserver/browse.go Co-authored-by: Matt Holt * Update modules/caddyhttp/fileserver/browselisting.go Co-authored-by: Matt Holt * Update browsetpl.go change from -> offset * Update browse.go * Update browselisting.go Co-authored-by: Matt Holt --- modules/caddyhttp/fileserver/browse.go | 3 ++- modules/caddyhttp/fileserver/browselisting.go | 14 +++++++++++++- modules/caddyhttp/fileserver/browsetpl.go | 24 ++++++++++++------------ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/modules/caddyhttp/fileserver/browse.go b/modules/caddyhttp/fileserver/browse.go index e5e137f..3fecad9 100644 --- a/modules/caddyhttp/fileserver/browse.go +++ b/modules/caddyhttp/fileserver/browse.go @@ -106,6 +106,7 @@ func (fsrv *FileServer) browseApplyQueryParams(w http.ResponseWriter, r *http.Re sortParam := r.URL.Query().Get("sort") orderParam := r.URL.Query().Get("order") limitParam := r.URL.Query().Get("limit") + offsetParam := r.URL.Query().Get("offset") // first figure out what to sort by switch sortParam { @@ -130,7 +131,7 @@ func (fsrv *FileServer) browseApplyQueryParams(w http.ResponseWriter, r *http.Re } // finally, apply the sorting and limiting - listing.applySortAndLimit(sortParam, orderParam, limitParam) + listing.applySortAndLimit(sortParam, orderParam, limitParam, offsetParam) } func (fsrv *FileServer) browseWriteJSON(listing browseListing) (*bytes.Buffer, error) { diff --git a/modules/caddyhttp/fileserver/browselisting.go b/modules/caddyhttp/fileserver/browselisting.go index 9c7c4a2..cebfe8f 100644 --- a/modules/caddyhttp/fileserver/browselisting.go +++ b/modules/caddyhttp/fileserver/browselisting.go @@ -101,6 +101,9 @@ type browseListing struct { // If ≠0 then Items have been limited to that many elements. ItemsLimitedTo int + + // If ≠0 then Items starting from that many elements. + ItemOffset int } // Breadcrumbs returns l.Path where every element maps @@ -131,7 +134,7 @@ func (l browseListing) Breadcrumbs() []crumb { return result } -func (l *browseListing) applySortAndLimit(sortParam, orderParam, limitParam string) { +func (l *browseListing) applySortAndLimit(sortParam, orderParam, limitParam string, offsetParam string) { l.Sort = sortParam l.Order = orderParam @@ -159,8 +162,17 @@ func (l *browseListing) applySortAndLimit(sortParam, orderParam, limitParam stri } } + if offsetParam != "" { + offset, _ := strconv.Atoi(offsetParam) + if offset > 0 && offset <= len(l.Items) { + l.Items = l.Items[offset:] + l.ItemOffset = offset + } + } + if limitParam != "" { limit, _ := strconv.Atoi(limitParam) + if limit > 0 && limit <= len(l.Items) { l.Items = l.Items[:limit] l.ItemsLimitedTo = limit diff --git a/modules/caddyhttp/fileserver/browsetpl.go b/modules/caddyhttp/fileserver/browsetpl.go index 567e8dd..6415d59 100644 --- a/modules/caddyhttp/fileserver/browsetpl.go +++ b/modules/caddyhttp/fileserver/browsetpl.go @@ -296,37 +296,37 @@ footer { {{- if and (eq .Sort "namedirfirst") (ne .Order "desc")}} - + {{- else if and (eq .Sort "namedirfirst") (ne .Order "asc")}} - + {{- else}} - + {{- end}} {{- if and (eq .Sort "name") (ne .Order "desc")}} - Name + Name {{- else if and (eq .Sort "name") (ne .Order "asc")}} - Name + Name {{- else}} - Name + Name {{- end}} {{- if and (eq .Sort "size") (ne .Order "desc")}} - Size + Size {{- else if and (eq .Sort "size") (ne .Order "asc")}} - Size + Size {{- else}} - Size + Size {{- end}} {{- if and (eq .Sort "time") (ne .Order "desc")}} - Modified + Modified {{- else if and (eq .Sort "time") (ne .Order "asc")}} - Modified + Modified {{- else}} - Modified + Modified {{- end}} -- cgit v1.2.3