style: fix lint errors

Author: MrMarble

cmd/termsvg/export/export.go

@@ -3,6 +3,7 @@ package export
 import (
 	"bytes"
 	"os"
+	"path/filepath"
 
 	"github.com/mrmarble/termsvg/internal/svg"
 	"github.com/mrmarble/termsvg/pkg/asciicast"
@@ -37,7 +38,7 @@ func (cmd *Cmd) Run() error {
 }
 
 func export(input, output string, mini bool, bgColor, textColor string, noWindow bool) error {
-	inputFile, err := os.ReadFile(input)
+	inputFile, err := os.ReadFile(filepath.Clean(input))
 	if err != nil {
 		return err
 	}
@@ -47,31 +48,31 @@ func export(input, output string, mini bool, bgColor, textColor string, noWindow
 		return err
 	}
 
-	outputFile, err := os.Create(output)
-	if err != nil {
-		return err
-	}
-	defer outputFile.Close()
+	out := new(bytes.Buffer)
+	var data []byte
 
+	svg.Export(*cast, out, bgColor, textColor, noWindow)
 	if mini {
-		out := new(bytes.Buffer)
-		svg.Export(*cast, out, bgColor, textColor, noWindow)
-
 		m := minify.New()
 		m.AddFunc("image/svg+xml", msvg.Minify)
-
 		b, err := m.Bytes("image/svg+xml", out.Bytes())
 		if err != nil {
 			return err
 		}
-
-		_, err = outputFile.Write(b)
-		if err != nil {
-			return err
-		}
+		data = b
 	} else {
-		svg.Export(*cast, outputFile, bgColor, textColor, noWindow)
+		data = out.Bytes()
+	}
+	outputFile, err := os.Create(output)
+	if err != nil {
+		return err
+	}
+	_, err = outputFile.Write(data)
+	if err != nil {
+		//nolint:gosec,errcheck
+		outputFile.Close()
+		return err
 	}
 
-	return nil
+	return outputFile.Close()
 }

cmd/termsvg/play/play.go

@@ -3,6 +3,7 @@ package play
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"time"
 
 	"github.com/mrmarble/termsvg/pkg/asciicast"
@@ -19,7 +20,7 @@ func (cmd *Cmd) Run() error {
 }
 
 func play(path string, idleCap, speed float64) error {
-	file, err := os.ReadFile(path)
+	file, err := os.ReadFile(filepath.Clean(path))
 	if err != nil {
 		return err
 	}

cmd/termsvg/rec/rec.go

@@ -66,7 +66,7 @@ func rec(file, command string, skipFirstLine bool) error {
 		return err
 	}
 
-	err = os.WriteFile(file, js, os.ModePerm)
+	err = os.WriteFile(file, js, 0o600)
 	if err != nil {
 		return err
 	}

internal/svg/svg.go

@@ -65,7 +65,6 @@ func createCanvas(svg *svg.SVG, cast asciicast.Cast, noWindow bool) {
 		} else {
 			canvas.Rect(0, 0, canvas.paddedWidth(), canvas.paddedHeight(), "fill:"+backgroundColorOverride)
 		}
-		//nolint:gomnd
 		canvas.Group(fmt.Sprintf(`transform="translate(%d,%d)"`, padding, int(padding*1.5)))
 	}
 	canvas.addStyles()
@@ -152,7 +151,7 @@ func (c *Canvas) addStyles() {
 		colors = append(colors, css.Block{Selector: fmt.Sprintf(".%s", class), Rules: css.Rules{"fill": color}})
 	}
 
-	styles := generateKeyframes(c.Cast, int32(c.paddedWidth()))
+	styles := generateKeyframes(c.Cast, c.paddedWidth())
 	// If custom colors have been provided, use them instead
 	if foregroundColorOverride != "" {
 		styles += fmt.Sprintf(".a{fill:%s}", foregroundColorOverride)
@@ -234,17 +233,17 @@ func (c *Canvas) applyBG(bg vt10x.Color) string {
 	return ""
 }
 
-func generateKeyframes(cast asciicast.Cast, width int32) string {
+func generateKeyframes(cast asciicast.Cast, width int) string {
 	css := "@keyframes k {"
 	for i, frame := range cast.Events {
-		css += generateKeyframe(float32(frame.Time*100/cast.Header.Duration), width*int32(i))
+		css += generateKeyframe(float32(frame.Time*100/cast.Header.Duration), width*i)
 	}
 
 	css += "}"
 
 	return css
 }
 
-func generateKeyframe(percent float32, translate int32) string {
+func generateKeyframe(percent float32, translate int) string {
 	return fmt.Sprintf("%.3f%%{transform:translateX(-%dpx)}", percent, translate)
 }

internal/testutils/testutils.go

@@ -17,10 +17,13 @@ func GoldenData(t Helper, identifier string) []byte {
 
 	goldenPath := "testdata/" + identifier + ".golden"
 
+	//nolint:gosec
 	f, err := os.Open(goldenPath)
 	if err != nil {
 		t.Fatalf("Error opening file %s: %s", goldenPath, err)
 	}
+
+	//nolint:errcheck
 	defer f.Close()
 
 	data, err := io.ReadAll(f)

internal/uniqueid/unique_test.go

@@ -47,6 +47,6 @@ func diff(t *testing.T, x interface{}, y interface{}) {
 
 	diff := cmp.Diff(x, y)
 	if diff != "" {
-		t.Fatalf(diff)
+		t.Fatal(diff)
 	}
 }

pkg/asciicast/event_test.go

@@ -40,7 +40,7 @@ func TestJSONMarshal(t *testing.T) {
 
 			diff := cmp.Diff(string(output), tc.output)
 			if diff != "" {
-				t.Fatalf(diff)
+				t.Fatal(diff)
 			}
 		})
 	}
@@ -76,7 +76,7 @@ func TestJSONUnmarshal(t *testing.T) {
 			}
 			diff := cmp.Diff(output, tc.output)
 			if diff != "" {
-				t.Fatalf(diff)
+				t.Fatal(diff)
 			}
 		})
 	}

pkg/color/color.go

@@ -14,14 +14,15 @@ func GetColor(c vt10x.Color) string {
 	case c >= 1<<24:
 		return colors[int(vt10x.LightGrey)]
 	case c >= 1<<8:
-		rgb := intToRGB(int(c))
+		rgb := intToRGB(uint32(c))
 		return fmt.Sprintf("#%02x%02x%02x", rgb.R, rgb.B, rgb.G)
 	default:
 		return colors[int(c)]
 	}
 }
 
-func intToRGB(c int) color.RGBA {
+func intToRGB(c uint32) color.RGBA {
+	//nolint:gosec
 	return color.RGBA{
 		R: uint8(c >> 16),
 		G: uint8(c >> 8),