From ec19585e9b69ff0e8536fdec1485e7588ea4459b Mon Sep 17 00:00:00 2001 From: vxclutch Date: Tue, 2 Jun 2026 07:52:52 -0400 Subject: [PATCH] maint: changes --- Makefile | 2 +- TODO | 2 - {cmd/lash => bin}/main.go | 1 - internal/app/file.go | 19 -------- internal/app/routes.go | 28 +++++++----- internal/errx/define.go | 5 +++ internal/generator/generator.go | 51 +++++++++++++++++++++ internal/handlers/file.go | 79 +++++++++++++++++++++++++++------ internal/handlers/share.go | 1 - lash.go | 8 ++-- templates/share.html | 10 ++--- version | 2 +- 12 files changed, 147 insertions(+), 61 deletions(-) rename {cmd/lash => bin}/main.go (95%) delete mode 100644 internal/app/file.go create mode 100644 internal/errx/define.go create mode 100644 internal/generator/generator.go diff --git a/Makefile b/Makefile index 687e7bb..4c0c779 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ GO?= go all: build build: - $(GO) build -o lash ./cmd/lash/ + $(GO) build -o lash ./bin/main.go lint: $(GO) fmt ./... diff --git a/TODO b/TODO index f4de28b..ac245a7 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,4 @@ -maint: clean up source code maint: document more -maint: make the colors more cross platform feat: improve flags feat: replace uuid dep with custom id generator feat: multiple files diff --git a/cmd/lash/main.go b/bin/main.go similarity index 95% rename from cmd/lash/main.go rename to bin/main.go index dbd893b..9e42e88 100644 --- a/cmd/lash/main.go +++ b/bin/main.go @@ -35,7 +35,6 @@ func main() { Handler: srv, } - // TODO(vxc): Make this more portable errx.Log("Your share link is %s", share.GenerateShareLink(*port)) errx.Log("Your token is \033[1;92m%s\033[0m", lash.Token) errx.Log("starting server at http://0.0.0.0:%d", *port) diff --git a/internal/app/file.go b/internal/app/file.go deleted file mode 100644 index 126ba59..0000000 --- a/internal/app/file.go +++ /dev/null @@ -1,19 +0,0 @@ -package app - -import ( - "errors" - "flag" - "strings" -) - -func GetFilePath() (string, error) { - fp := "" - - for _, v := range flag.Args() { - if !strings.HasPrefix(v, "-") { - fp = v - return fp, nil - } - } - return "", errors.New("not enough arguments") -} diff --git a/internal/app/routes.go b/internal/app/routes.go index 780d4d9..345e0cb 100644 --- a/internal/app/routes.go +++ b/internal/app/routes.go @@ -1,6 +1,7 @@ package app import ( + "flag" "lash" "lash/internal/errx" "lash/internal/handlers" @@ -11,26 +12,29 @@ import ( func New(ctx *lash.LashContext) http.Handler { mux := http.NewServeMux() - fp, err := GetFilePath() - if err != nil { - errx.FatalPerror(err) - } - - contents, err := os.ReadFile(fp) - if err != nil { - errx.FatalPerror(err) - } - share := handlers.ShareData{ Version: lash.Version, } file := handlers.FileHandler{ Ctx: ctx, - FileData: handlers.FileData{ + } + + fps := flag.Args() + if len(fps) < 1 { + errx.FatalPerror(errx.ErrNotEnoughArgs) + } + + for _, fp := range fps { + contents, err := os.ReadFile(fp) + if err != nil { + errx.FatalPerror(err) + } + + file.FileData = append(file.FileData, handlers.FileData{ Contents: contents, FileName: fp, - }, + }) } mux.HandleFunc("/", share.Handler) diff --git a/internal/errx/define.go b/internal/errx/define.go new file mode 100644 index 0000000..b3d7f72 --- /dev/null +++ b/internal/errx/define.go @@ -0,0 +1,5 @@ +package errx + +import "errors" + +var ErrNotEnoughArgs error = errors.New("not enough arguments") diff --git a/internal/generator/generator.go b/internal/generator/generator.go new file mode 100644 index 0000000..283fd02 --- /dev/null +++ b/internal/generator/generator.go @@ -0,0 +1,51 @@ +package generator + +import ( + "math/rand/v2" +) + +var keys []string = []string{ + "octo", + "cool", + "whip", + "keys", + "cats", + "part", + "rate", + "face", + "lard", + "larp", + "dogs", + "cash", + "city", + "cold", + "desk", + "down", + "dirt", + "long", + "mean", + "news", + "only", + "open", + "year", + "wood", + "wing", + "work", + "wash", + "vote", + "onyx", +} + +func Generate(n int) (code string) { + codeLen := n + + start := rand.IntN(len(keys)) + + for i := range codeLen { + code += keys[(start+i)%len(keys)] + if i != codeLen-1 { + code += "-" + } + } + return +} diff --git a/internal/handlers/file.go b/internal/handlers/file.go index 974152b..3a0831a 100644 --- a/internal/handlers/file.go +++ b/internal/handlers/file.go @@ -1,9 +1,11 @@ package handlers import ( + "archive/zip" "encoding/json" "fmt" "lash" + "lash/internal/errx" "net/http" "os" "strconv" @@ -11,7 +13,7 @@ import ( type FileHandler struct { Ctx *lash.LashContext - FileData FileData + FileData []FileData } type FileData struct { @@ -23,10 +25,17 @@ type ValidateRequest struct { Token string } +type headers map[string]string + +var zipHeaders headers = headers{ + "Content-Disposition": "attachment; filename=lash.zip", + "Content-Type": "application/octet-stream", +} + var sent int = 0 func (h FileHandler) APIHandler(w http.ResponseWriter, r *http.Request) { - if sent >= h.Ctx.N && h.Ctx.N != -1 { + if h.hasHitMax() { w.WriteHeader(http.StatusTooManyRequests) os.Exit(0) return @@ -45,27 +54,71 @@ func (h FileHandler) APIHandler(w http.ResponseWriter, r *http.Request) { return } - w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%s", h.FileData.FileName)) - w.Header().Set("Content-Type", "application/octet-stream") - w.Header().Set("Content-Length", strconv.Itoa(len(h.FileData.Contents))) - w.WriteHeader(http.StatusOK) - w.Write(h.FileData.Contents) + if len(h.FileData) == 1 { + headers := headers{ + "Content-Disposition": fmt.Sprintf("attachment; filename=%s", h.FileData[0].FileName), + "Content-Type": "application/octet-stream", + "Content-Length": strconv.Itoa(len(h.FileData[0].FileName)), + } + headers.set(w) + + w.Write(h.FileData[0].Contents) + } else { + zipHeaders.set(w) + h.writeZip(w) + } sent++ } func (h FileHandler) FileHandler(w http.ResponseWriter, r *http.Request) { - if sent >= h.Ctx.N && h.Ctx.N != -1 { + if h.hasHitMax() { w.WriteHeader(http.StatusTooManyRequests) os.Exit(0) return } - w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%s", h.FileData.FileName)) - w.Header().Set("Content-Type", "application/octet-stream") - w.Header().Set("Content-Length", strconv.Itoa(len(h.FileData.Contents))) - w.WriteHeader(http.StatusOK) - w.Write(h.FileData.Contents) + if len(h.FileData) == 1 { + headers := headers{ + "Content-Disposition": fmt.Sprintf("attachment; filename=%s", h.FileData[0].FileName), + "Content-Type": "application/octet-stream", + "Content-Length": strconv.Itoa(len(h.FileData[0].FileName)), + } + headers.set(w) + + w.Write(h.FileData[0].Contents) + + } else { + zipHeaders.set(w) + h.writeZip(w) + } sent++ } + +func (h FileHandler) writeZip(hw http.ResponseWriter) { + zw := zip.NewWriter(hw) + defer zw.Close() + + for _, f := range h.FileData { + w, err := zw.Create(f.FileName) + if err != nil { + errx.FatalPerror(err) + } + + _, err = w.Write(f.Contents) + if err != nil { + errx.FatalPerror(err) + } + } +} + +func (h headers) set(w http.ResponseWriter) { + for k, v := range h { + w.Header().Set(k, v) + } +} + +func (h FileHandler) hasHitMax() bool { + return sent >= h.Ctx.N && h.Ctx.N != -1 +} diff --git a/internal/handlers/share.go b/internal/handlers/share.go index 5a9fc94..ec11449 100644 --- a/internal/handlers/share.go +++ b/internal/handlers/share.go @@ -13,7 +13,6 @@ type ShareData struct { } func (h *ShareData) Handler(w http.ResponseWriter, r *http.Request) { - // Although `Must` can fail since `Templates` is embeded these files will always exist. tmpl := template.Must(template.ParseFS(lash.Templates, "templates/share.html")) if err := tmpl.ExecuteTemplate(w, "share.html", h); err != nil { diff --git a/lash.go b/lash.go index 12a594f..4b9ff1c 100644 --- a/lash.go +++ b/lash.go @@ -2,9 +2,8 @@ package lash import ( "embed" + "lash/internal/generator" "net/http" - - "github.com/google/uuid" ) type LashContext struct { @@ -18,7 +17,6 @@ var Templates embed.FS //go:embed version var Version string -// TODO(vxc): Replace this with custom token generator -var Token string = uuid.New().String() +var Token string = generator.Generate(5) -var ShareLinkToken string = uuid.New().String() +var ShareLinkToken string = generator.Generate(8) diff --git a/templates/share.html b/templates/share.html index f0a5138..bf37c99 100644 --- a/templates/share.html +++ b/templates/share.html @@ -24,11 +24,10 @@