file-server: fix ShowList on root dir

Former-commit-id: 6795382235d76942bcfd31ecc0b4ab02ecb85a8a

context/context.go

@@ -444,16 +444,18 @@ type Context interface {
 	// Header adds a header to the response writer.
 	Header(name string, value string)
 
-	// ContentType sets the response writer's header key "Content-Type" to the 'cType'.
+	// ContentType sets the response writer's
+	// header "Content-Type" to the 'cType'.
 	ContentType(cType string)
-	// GetContentType returns the response writer's header value of "Content-Type"
-	// which may, set before with the 'ContentType'.
+	// GetContentType returns the response writer's
+	// header value of "Content-Type".
 	GetContentType() string
-	// GetContentType returns the request's header value of "Content-Type".
+	// GetContentType returns the request's
+	// trim-ed(without the charset and priority values)
+	// header value of "Content-Type".
 	GetContentTypeRequested() string
-
-	// GetContentLength returns the request's header value of "Content-Length".
-	// Returns 0 if header was unable to be found or its value was not a valid number.
+	// GetContentLength returns the request's
+	// header value of "Content-Length".
 	GetContentLength() int64
 
 	// StatusCode sets the status code header to the response.
@@ -2256,7 +2258,8 @@ func (ctx *context) contentTypeOnce(cType string, charset string) {
 	ctx.writer.Header().Set(ContentTypeHeaderKey, cType)
 }
 
-// ContentType sets the response writer's header key "Content-Type" to the 'cType'.
+// ContentType sets the response writer's
+// header "Content-Type" to the 'cType'.
 func (ctx *context) ContentType(cType string) {
 	if cType == "" {
 		return
@@ -2282,19 +2285,21 @@ func (ctx *context) ContentType(cType string) {
 	ctx.writer.Header().Set(ContentTypeHeaderKey, cType)
 }
 
-// GetContentType returns the response writer's header value of "Content-Type"
-// which may, set before with the 'ContentType'.
+// GetContentType returns the response writer's
+// header value of "Content-Type".
 func (ctx *context) GetContentType() string {
 	return ctx.writer.Header().Get(ContentTypeHeaderKey)
 }
 
-// GetContentType returns the request's header value of "Content-Type".
+// GetContentType returns the request's
+// trim-ed(without the charset and priority values)
+// header value of "Content-Type".
 func (ctx *context) GetContentTypeRequested() string {
 	return TrimHeaderValue(ctx.GetHeader(ContentTypeHeaderKey))
 }
 
-// GetContentLength returns the request's header value of "Content-Length".
-// Returns 0 if header was unable to be found or its value was not a valid number.
+// GetContentLength returns the request's
+// header value of "Content-Length".
 func (ctx *context) GetContentLength() int64 {
 	if v := ctx.GetHeader(ContentLengthHeaderKey); v != "" {
 		n, _ := strconv.ParseInt(v, 10, 64)
@@ -3427,7 +3432,7 @@ func (ctx *context) TryWriteGzip(b []byte) (int, error) {
 	n, err := ctx.WriteGzip(b)
 	if err != nil {
 		// check if the error came from gzip not allowed and not the writer itself
-		if errors.Is(err, ErrGzipNotSupported) {
+		if err == ErrGzipNotSupported {
 			// client didn't supported gzip, write them uncompressed:
 			return ctx.writer.Write(b)
 		}
@@ -4239,6 +4244,8 @@ type N struct {
 	Other []byte // custom content types.
 }
 
+var _ ContentSelector = N{}
+
 // SelectContent returns a content based on the matched negotiated "mime".
 func (n N) SelectContent(mime string) interface{} {
 	switch mime {
@@ -4419,7 +4426,6 @@ func (ctx *context) Negotiate(v interface{}) (int, error) {
 			ctx.StatusCode(http.StatusNotAcceptable)
 			return -1, ErrContentNotSupported
 		}
-
 	}
 }
 

context/route.go

@@ -2,10 +2,6 @@ package context
 
 import (
 	"io"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/kataras/iris/v12/macro"
@@ -66,13 +62,6 @@ type RouteReadOnly interface {
 	// MainHandlerIndex returns the first registered handler's index for the route.
 	MainHandlerIndex() int
 
-	// StaticSites if not empty, refers to the system (or virtual if embedded) directory
-	// and sub directories that this "GET" route was registered to serve files and folders
-	// that contain index.html (a site). The index handler may registered by other
-	// route, manually or automatic by the framework,
-	// get the route by `Application#GetRouteByPath(staticSite.RequestPath)`.
-	StaticSites() []StaticSite
-
 	// Sitemap properties: https://www.sitemaps.org/protocol.html
 
 	// GetLastMod returns the date of last modification of the file served by this route.
@@ -82,51 +71,3 @@ type RouteReadOnly interface {
 	// GetPriority returns the priority of this route's URL relative to other URLs on your site.
 	GetPriority() float32
 }
-
-// StaticSite is a structure which is used as field on the `Route`
-// and route registration on the `APIBuilder#HandleDir`.
-// See `GetStaticSites` and `APIBuilder#HandleDir`.
-type StaticSite struct {
-	Dir         string `json:"dir"`
-	RequestPath string `json:"requestPath"`
-}
-
-// GetStaticSites search for a relative filename of "indexName" in "rootDir" and all its subdirectories
-// and returns a list of structures which contains the directory found an "indexName" and the request path
-// that a route should be registered to handle this "indexName".
-// The request path is given by the directory which an index exists on.
-func GetStaticSites(rootDir, rootRequestPath, indexName string) (sites []StaticSite) {
-	f, err := os.Open(rootDir)
-	if err != nil {
-		return nil
-	}
-
-	list, err := f.Readdir(-1)
-	f.Close()
-	if err != nil {
-		return nil
-	}
-
-	if len(list) == 0 {
-		return nil
-	}
-
-	for _, l := range list {
-		dir := filepath.Join(rootDir, l.Name())
-
-		if l.IsDir() {
-			sites = append(sites, GetStaticSites(dir, path.Join(rootRequestPath, l.Name()), indexName)...)
-			continue
-		}
-
-		if l.Name() == strings.TrimPrefix(indexName, "/") {
-			sites = append(sites, StaticSite{
-				Dir:         filepath.FromSlash(rootDir),
-				RequestPath: rootRequestPath,
-			})
-			continue
-		}
-	}
-
-	return
-}