fix random output files being left in root.

thushan · Dec 19, 2023 · 9d36cf1 · 9d36cf1
1 parent 6478336
commit 9d36cf1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
@@ -56,15 +56,9 @@ func init() {
 	flags.BoolVarP(&af.HideOutput, "no-output", "", false, "Disable report output")
 	flags.BoolVarP(&af.ShowNerdStats, "nerd-stats", "", false, "Show nerd stats")
 	flags.BoolVarP(&af.ShowVersion, "version", "v", false, "Show version information")
-	flags.StringVarP(&af.OutputFile, "output-file", "o", generateOutputFile(), "Export analysis as JSON (generated automatically otherwise, ./report-*.json)")
+	flags.StringVarP(&af.OutputFile, "output-file", "o", "", "Export analysis as JSON (generated automatically like ./report-*.json)")
 }
 
-func generateOutputFile() string {
-	if f, err := os.CreateTemp(".", "report-*.json"); err == nil {
-		return f.Name()
-	}
-	return ""
-}
 func Main() {
 	log.SetFlags(log.Flags() &^ (log.Ldate | log.Ltime))
 	log.SetOutput(os.Stdout)

diff --git a/internal/smash/app.go b/internal/smash/app.go
@@ -44,6 +44,8 @@ type AppRuntime struct {
 	Files         chan *indexer.FileFS
 }
 
+const ReportOutputTemplate = "report-*.json"
+
 func (app *App) Run() error {
 
 	af := app.Flags
@@ -229,14 +231,10 @@ func (app *App) ExportReport() {
 	if app.Flags.HideOutput {
 		return
 	}
-	if app.Flags.OutputFile == "" {
-		theme.Warn.Println("Could not output report.")
-		return
-	}
 
-	if err := app.Export(app.Flags.OutputFile); err != nil {
+	if filename, err := app.Export(app.Flags.OutputFile); err != nil {
 		theme.Error.Println("Failed to export report because ", err)
 	} else {
-		app.Summary.ReportFilename = app.Flags.OutputFile
+		app.Summary.ReportFilename = filename
 	}
 }
diff --git a/internal/smash/export.go b/internal/smash/export.go
@@ -2,6 +2,7 @@ package smash
 
 import (
 	"encoding/json"
+	"fmt"
 	"os"
 	user2 "os/user"
 	"path/filepath"
@@ -61,14 +62,30 @@ type ReportDuplicateSummary struct {
 	ReportFileSummary
 }
 
-func (app *App) Export(filePath string) error {
-	f, err := os.Create(filePath)
-	if err != nil {
-		return err
+func (app *App) Export(filePath string) (string, error) {
+
+	var fs *os.File
+	var err error
+
+	if filePath == "" {
+		if fs, err = os.CreateTemp(".", ReportOutputTemplate); err != nil {
+			return "", fmt.Errorf("failed to report output: %w", err)
+		}
+	} else {
+		if fs, err = os.Create(filePath); err != nil {
+			return "", fmt.Errorf("failed to report output: %w", err)
+		}
 	}
-	defer f.Close()
+
+	defer fs.Close()
+
+	return fs.Name(), app.ExportFile(fs)
+}
+
+func (app *App) ExportFile(f *os.File) error {
 	return json.NewEncoder(f).Encode(app.GenerateReportOutput())
 }
+
 func (app *App) GenerateReportOutput() ReportOutput {
 	return ReportOutput{
 		Summary:  summariseRunSummary(app.Summary),