Allow hiding files in markdown mode.

patrickdappollonio · Feb 2, 2025 · 66cc688 · 66cc688
1 parent 2c2591c
commit 66cc688
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 17 deletions.
diff --git a/app.go b/app.go
@@ -123,6 +123,7 @@ func run() error {
 	flags.BoolVar(&srv.DisableDirectoryList, "disable-directory-listing", false, "disable the directory listing feature and return 404s for directories without index")
 	flags.StringVar(&srv.CustomNotFoundPage, "custom-404", "", "custom \"page not found\" to serve")
 	flags.IntVar(&srv.CustomNotFoundStatusCode, "custom-404-code", 0, "custtom status code for pages not found")
+	flags.BoolVar(&srv.HideFilesInMarkdown, "hide-files-in-markdown", false, "hide file and directory listing in markdown rendering")
 
 	//nolint:wrapcheck // no need to wrap this error
 	return rootCmd.Execute()

diff --git a/internal/server/assets/style.css b/internal/server/assets/style.css
@@ -191,7 +191,7 @@ nav ul li a {
 }
 
 #directory-listing {
-  margin-top: 10px;
+  margin-top: 30px;
 }
 
 .files {

diff --git a/internal/server/handlers.go b/internal/server/handlers.go
@@ -163,10 +163,11 @@ func (s *Server) walk(requestedPath string, w http.ResponseWriter, r *http.Reque
 		"PageTitle":         s.PageTitle,
 		"CurrentPath":       r.URL.Path,
 		"CacheBuster":       s.cacheBuster,
-		"Files":             files,
 		"RequestedPath":     requestedPath,
 		"IsRoot":            s.PathPrefix == r.URL.Path,
 		"UpDirectory":       parent,
+		"Files":             files,
+		"ShouldRenderFiles": !s.HideFilesInMarkdown,
 		"HideLinks":         s.HideLinks,
 		"MarkdownContent":   markdownContent.String(),
 		"MarkdownBeforeDir": s.MarkdownBeforeDir,

diff --git a/internal/server/server.go b/internal/server/server.go
@@ -30,15 +30,16 @@ type Server struct {
 	Password string `flagName:"password" validate:"omitempty,alphanum,excluded_with=JWTSigningKey"`
 
 	// Boolean specific settings
-	CorsEnabled        bool
-	HideLinks          bool
-	ETagDisabled       bool
-	ETagMaxSize        string
-	etagMaxSizeBytes   int64
-	GzipEnabled        bool
-	DisableCacheBuster bool
-	DisableMarkdown    bool
-	MarkdownBeforeDir  bool
+	CorsEnabled         bool
+	HideLinks           bool
+	ETagDisabled        bool
+	ETagMaxSize         string
+	etagMaxSizeBytes    int64
+	GzipEnabled         bool
+	DisableCacheBuster  bool
+	DisableMarkdown     bool
+	MarkdownBeforeDir   bool
+	HideFilesInMarkdown bool
 
 	// Redirection handling
 	DisableRedirects bool

diff --git a/internal/server/templates/listing.tmpl b/internal/server/templates/listing.tmpl
@@ -4,11 +4,10 @@
 <section id="directory-listing">
   <div class="container">
     {{- if .MarkdownBeforeDir }}{{- with .MarkdownContent }}
-    <div class="card-large">
-      <div class="markdown-body">{{- . | unsafeHTML }}</div>
-    </div>
+    {{ template "markdown" . }}
     {{- end }}{{- end }}
 
+    {{- if .ShouldRenderFiles }}
     <div class="card-large">
       <ul class="files">
         <li>
@@ -44,13 +43,19 @@
         {{- end }}
       </ul>
     </div>
+    {{- end }}
 
     {{- if not .MarkdownBeforeDir }}{{- with .MarkdownContent }}
-    <div class="card-large">
-      <div class="markdown-body">{{- . | unsafeHTML }}</div>
-    </div>
+    {{ template "markdown" . }}
     {{- end }}{{- end }}
   </div>
 </section>
 
 {{- end }}
+
+
+{{- define "markdown" }}
+<div class="card-large">
+  <div class="markdown-body">{{- . | unsafeHTML }}</div>
+</div>
+{{- end }}