ari/indir
2
1
Fork 0
Code Issues Pull requests Releases 2 Activity

format fix

Browse source
This commit is contained in:
claire treise 2026-03-16 21:00:51 +01:00
parent 245d6e0fa0
commit 73fdf8bb46
1 changed files with 62 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

142
main.go
View file

@ -1,7 +1,6 @@
package main package main
import ( import (
_ "embed"
"fmt" "fmt"
"html/template" "html/template"
"io/fs" "io/fs"
@ -14,6 +13,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"time" "time"
_ "embed"
"github.com/gomarkdown/markdown" "github.com/gomarkdown/markdown"
"github.com/gomarkdown/markdown/html" "github.com/gomarkdown/markdown/html"
@ -25,25 +25,23 @@ var dirTemplateSrc string
type ( type (
Directory struct { Directory struct {
Name string Name string
Root bool Root bool
Files []*File Files []*File
Readme template.HTML Readme template.HTML
} }
File struct { File struct {
Name string Name string
URI string URI string
IsDir bool IsDir bool
Size string Size string
ModifiedDate string ModifiedDate string
} }
) )
func main() { func main() {
if len(os.Args) < 2 { if len(os.Args) < 2 { printHelp() }
printHelp()
}
host := "127.0.0.1" host := "127.0.0.1"
port := 8080 port := 8080
@ -52,9 +50,7 @@ func main() {
filesDir := "" filesDir := ""
i := 1 i := 1
for { for {
if i >= len(os.Args) { if i >= len(os.Args) { break }
break
}
switch os.Args[i] { switch os.Args[i] {
case "-h": case "-h":
fallthrough fallthrough
@ -62,7 +58,7 @@ func main() {
printHelp() printHelp()
case "--host": case "--host":
if i+1 >= len(os.Args) { if i + 1 >= len(os.Args) {
fmt.Fprintf(os.Stderr, "fatal: --host argument cannot be empty\n") fmt.Fprintf(os.Stderr, "fatal: --host argument cannot be empty\n")
os.Exit(1) os.Exit(1)
} }
@ -70,7 +66,7 @@ func main() {
host = os.Args[i] host = os.Args[i]
case "--port": case "--port":
if i+1 >= len(os.Args) { if i + 1 >= len(os.Args) {
fmt.Fprintf(os.Stderr, "fatal: --port argument cannot be empty\n") fmt.Fprintf(os.Stderr, "fatal: --port argument cannot be empty\n")
os.Exit(1) os.Exit(1)
} }
@ -83,18 +79,14 @@ func main() {
} }
case "--root": case "--root":
if i+1 >= len(os.Args) { if i + 1 >= len(os.Args) {
fmt.Fprintf(os.Stderr, "fatal: --root argument cannot be empty\n") fmt.Fprintf(os.Stderr, "fatal: --root argument cannot be empty\n")
os.Exit(1) os.Exit(1)
} }
i++ i++
root = os.Args[i] root = os.Args[i]
if !strings.HasPrefix(root, "/") { if !strings.HasPrefix(root, "/") { root = "/" + root }
root = "/" + root if !strings.HasSuffix(root, "/") { root += "/" }
}
if !strings.HasSuffix(root, "/") {
root += "/"
}
default: default:
if len(filesDir) > 0 { if len(filesDir) > 0 {
@ -122,9 +114,7 @@ func main() {
} }
fmt.Printf("Now hosting \"%s\" at http://%s:%d", filesDir, host, port) fmt.Printf("Now hosting \"%s\" at http://%s:%d", filesDir, host, port)
if root != "/" { if root != "/" { fmt.Printf("%s", root) }
fmt.Printf("%s", root)
}
fmt.Println(".") fmt.Println(".")
http.ListenAndServe(fmt.Sprintf("%s:%d", host, port), HTTPLog(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { http.ListenAndServe(fmt.Sprintf("%s:%d", host, port), HTTPLog(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@ -178,7 +168,7 @@ func main() {
} }
if !strings.HasSuffix(r.URL.Path, "/") { if !strings.HasSuffix(r.URL.Path, "/") {
http.Redirect(w, r, r.URL.Path+"/", http.StatusFound) http.Redirect(w, r, r.URL.Path + "/", http.StatusFound)
return return
} }
@ -202,9 +192,9 @@ func main() {
} }
data := Directory{ data := Directory{
Root: isRoot, Root: isRoot,
Name: r.URL.Path, Name: r.URL.Path,
Files: []*File{}, Files: []*File{},
Readme: readmeHTML, Readme: readmeHTML,
} }
@ -212,14 +202,10 @@ func main() {
directories, err := fs.ReadDir(fsDir, ".") directories, err := fs.ReadDir(fsDir, ".")
for _, dir := range directories { for _, dir := range directories {
name := dir.Name() name := dir.Name()
if slices.Contains(ignoredFiles, name) { if slices.Contains(ignoredFiles, name) { continue }
continue
}
info, err := dir.Info() info, err := dir.Info()
if err != nil { if err != nil { continue }
continue
}
var uri string var uri string
if isRoot { if isRoot {
@ -250,10 +236,10 @@ func main() {
dateStr := info.ModTime().Format("02-Jan-2006 15:04") dateStr := info.ModTime().Format("02-Jan-2006 15:04")
data.Files = append(data.Files, &File{ data.Files = append(data.Files, &File{
Name: name, Name: name,
URI: uri, URI: uri,
IsDir: info.IsDir(), IsDir: info.IsDir(),
Size: sizeStr, Size: sizeStr,
ModifiedDate: dateStr, ModifiedDate: dateStr,
}) })
} }
@ -269,60 +255,52 @@ func main() {
} }
type LoggingResponseWriter struct { type LoggingResponseWriter struct {
http.ResponseWriter http.ResponseWriter
Status int Status int
} }
var COL_Reset = "\033[0m" var COL_Reset = "\033[0m"
var COL_Red = "\033[31m" var COL_Red = "\033[31m"
var COL_Green = "\033[32m" var COL_Green = "\033[32m"
var COL_Yellow = "\033[33m" var COL_Yellow = "\033[33m"
var COL_Blue = "\033[34m" var COL_Blue = "\033[34m"
var COL_Purple = "\033[35m" var COL_Purple = "\033[35m"
var COL_Cyan = "\033[36m" var COL_Cyan = "\033[36m"
var COL_Gray = "\033[37m" var COL_Gray = "\033[37m"
var COL_White = "\033[97m" var COL_White = "\033[97m"
func HTTPLog(next http.Handler) http.Handler { func HTTPLog(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
start := time.Now() start := time.Now()
lrw := LoggingResponseWriter{w, http.StatusOK} lrw := LoggingResponseWriter{w, http.StatusOK}
next.ServeHTTP(&lrw, r) next.ServeHTTP(&lrw, r)
after := time.Now() after := time.Now()
difference := (after.Nanosecond() - start.Nanosecond()) / 1_000_000 difference := (after.Nanosecond() - start.Nanosecond()) / 1_000_000
elapsed := "<1" elapsed := "<1"
if difference >= 1 { if difference >= 1 {
elapsed = strconv.Itoa(difference) elapsed = strconv.Itoa(difference)
} }
statusColour := COL_Reset statusColour := COL_Reset
if lrw.Status-600 <= 0 { if lrw.Status - 600 <= 0 { statusColour = COL_Red }
statusColour = COL_Red if lrw.Status - 500 <= 0 { statusColour = COL_Yellow }
} if lrw.Status - 400 <= 0 { statusColour = COL_White }
if lrw.Status-500 <= 0 { if lrw.Status - 300 <= 0 { statusColour = COL_Green }
statusColour = COL_Yellow
}
if lrw.Status-400 <= 0 {
statusColour = COL_White
}
if lrw.Status-300 <= 0 {
statusColour = COL_Green
}
fmt.Printf("[%s] %s %s - %s%d%s (%sms) (%s)\n", fmt.Printf("[%s] %s %s - %s%d%s (%sms) (%s)\n",
after.Format(time.UnixDate), after.Format(time.UnixDate),
r.Method, r.Method,
r.URL.Path, r.URL.Path,
statusColour, statusColour,
lrw.Status, lrw.Status,
COL_Reset, COL_Reset,
elapsed, elapsed,
r.Header["User-Agent"][0]) r.Header["User-Agent"][0])
}) })
} }
func printHelp() { func printHelp() {