diff --git a/cmd/root.go b/cmd/root.go index cc46ca4..b6d837f 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -12,7 +12,7 @@ import ( ) const ( - ReleaseVersion string = "3.2.5" + ReleaseVersion string = "3.2.6" ) var ( diff --git a/cmd/sort.go b/cmd/sort.go index e6a78cc..1931a40 100644 --- a/cmd/sort.go +++ b/cmd/sort.go @@ -6,7 +6,6 @@ package cmd import ( "fmt" - "net/url" "sort" "strings" @@ -91,14 +90,6 @@ Loop: return first, last, nil } -func pathUrlEscape(path string) string { - placeholder := strings.Replace(path, "/", "path_placeholder", -1) - - escaped := url.QueryEscape(placeholder) - - return strings.Replace(escaped, "path_placeholder", "/", -1) -} - func paginateSorted(path, first, last, queryParams string, regexes *regexes, formats types.Types) (string, error) { split, err := split(path, regexes) if err != nil { @@ -153,31 +144,31 @@ func paginateSorted(path, first, last, queryParams string, regexes *regexes, for html.WriteString(`
`) - html.WriteString(fmt.Sprintf(``, + html.WriteString(fmt.Sprintf(``, Prefix, mediaPrefix, - pathUrlEscape(first), + first, queryParams, firstStatus)) - html.WriteString(fmt.Sprintf(``, + html.WriteString(fmt.Sprintf(``, Prefix, mediaPrefix, - pathUrlEscape(prevPage), + prevPage, queryParams, prevStatus)) - html.WriteString(fmt.Sprintf(``, + html.WriteString(fmt.Sprintf(``, Prefix, mediaPrefix, - pathUrlEscape(nextPage), + nextPage, queryParams, nextStatus)) - html.WriteString(fmt.Sprintf(``, + html.WriteString(fmt.Sprintf(``, Prefix, mediaPrefix, - pathUrlEscape(last), + last, queryParams, lastStatus))