From 938f3e2f33190c085d71d5460f5d94a6a7bc978d Mon Sep 17 00:00:00 2001
From: Jordan Orelli <jordanorelli@gmail.com>
Date: Thu, 9 Dec 2021 13:52:48 -0600
Subject: [PATCH] construct zip in memory

I don't like this but I want to get on with my day
---
 go.mod |  7 +++----
 go.sum |  1 +
 zip.go | 38 ++++++++++++++++----------------------
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/go.mod b/go.mod
index 413623c..7e6848b 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,6 @@ module orel.li/modrn
 
 go 1.18
 
-require (
-	golang.org/x/mod v0.5.1 // indirect
-	golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect
-)
+require golang.org/x/mod v0.5.1
+
+require golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect
diff --git a/go.sum b/go.sum
index 2db7d92..7214757 100644
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,5 @@
 golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
 golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e h1:aZzprAO9/8oim3qStq3wc1Xuxx4QmAGriC4VU4ojemQ=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/zip.go b/zip.go
index 16da6d6..ade88ee 100644
--- a/zip.go
+++ b/zip.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"flag"
 	"fmt"
 	"io/ioutil"
@@ -44,7 +45,7 @@ func zipcmd(args []string) {
 		bail(1, "unable to read modfile: %v", err)
 	}
 
-	log_info.Printf("checking modfile at path %q", modfilePath)
+	log_info.Printf("checking modfile at path %s", modfilePath)
 	f, err := modfile.Parse(modfilePath, b, nil)
 	if err != nil {
 		bail(1, "unable to parse modfile: %v", err)
@@ -70,36 +71,29 @@ func zipcmd(args []string) {
 	log_info.Printf("destination: %s", outputPath)
 	switch _, err := os.Stat(outputPath); {
 	case err == nil:
-		bail(1, "a file at %q already exists", outputPath)
+		bail(1, "a file at %s already exists", outputPath)
 	case os.IsNotExist(err):
 		break
 	default:
-		bail(1, "unable to check for file at %q: %v", outputPath, err)
+		bail(1, "unable to check for file at %s: %v", outputPath, err)
 	}
 
-	zf, err := os.CreateTemp("", fmt.Sprintf("modrn_*_%s_%s.zip", modbasename(modpath), version))
-	if err != nil {
-		bail(1, "creating zip failed to get a temp file: %v", err)
+	// zip into memory
+	var buf bytes.Buffer
+	log_info.Printf("constructing zip in memory")
+	mv := module.Version{Path: modpath, Version: version}
+	if err := zip.CreateFromDir(&buf, mv, pkgdir); err != nil {
+		bail(1, "zip not created: %v", err)
 	}
-	defer zf.Close()
 
-	fi, err := zf.Stat()
+	fout, err := os.OpenFile(outputPath, os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0644)
 	if err != nil {
-		// is this even possible?
-		bail(1, "unable to stat resultant tempfile: %v", err)
-	}
-	abspath := filepath.Join(os.TempDir(), fi.Name())
-	log_info.Printf("zipping into temp file at %s", abspath)
-
-	mv := module.Version{Path: modpath, Version: version}
-	if err := zip.CreateFromDir(zf, mv, pkgdir); err != nil {
-		bail(1, "zip not created: %v", err)
+		bail(1, "unable to open output file at path %s: %v", outputPath, err)
 	}
+	defer fout.Close()
 
-	// filepath.IsAbs
-	log_info.Printf("created zip archive at %v", abspath)
-	if err := os.Rename(abspath, outputPath); err != nil {
-		bail(1, "unable to move zip into place: %v", err)
+	if _, err := buf.WriteTo(fout); err != nil {
+		bail(1, "unable to write output file at path %s: %v", outputPath, err)
 	}
-	log_info.Printf("moved zip archive to %v", outputPath)
+	log_info.Printf("wrote archive to %s", outputPath)
 }