From 9a0b39ca11769e1a91ba84ab4ce2e55890d752fe Mon Sep 17 00:00:00 2001 From: Xe Iaso Date: Thu, 7 Nov 2024 18:50:48 -0500 Subject: internal/lume: jettison serving from the zipfile Signed-off-by: Xe Iaso --- internal/lume/lume.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/internal/lume/lume.go b/internal/lume/lume.go index 39516d9..24f3451 100644 --- a/internal/lume/lume.go +++ b/internal/lume/lume.go @@ -1,7 +1,6 @@ package lume import ( - "archive/zip" "bytes" "context" "encoding/json" @@ -359,7 +358,7 @@ func (f *FS) build(ctx context.Context, siteCommit string) error { zipLoc := filepath.Join(f.opt.DataDir, "site.zip") - if err := ZipFolder(filepath.Join(cmd.Dir, "_site"), zipLoc); err != nil { + if err := ZipFolder(destDir, zipLoc); err != nil { return fmt.Errorf("lume: can't compress site folder: %w", err) } @@ -369,12 +368,7 @@ func (f *FS) build(ctx context.Context, siteCommit string) error { } } - fs, err := zip.OpenReader(zipLoc) - if err != nil { - return fmt.Errorf("lume: can't open zip with site content: %w", err) - } - - f.fs = fs + f.fs = os.DirFS(destDir) return nil } -- cgit v1.2.3