Refactor basic framework

cmd/day1/main.go

@@ -2,32 +2,13 @@ package main
 
 import (
 	"aoc2023/internal/day1"
-	"fmt"
-	"log"
-	"os"
+	"aoc2023/internal/puzzle"
 )
 
 func main() {
-	file, err := os.Open("day1.txt")
-	if err != nil {
-		log.Fatalf("Could not open file: %v", err)
-	}
-	defer file.Close()
-
-	part1, err := day1.CalculatePart1(file)
-	if err != nil {
-		log.Fatalf("Could not calculate part 1 because %v", err)
-	}
-
-	if _, err := file.Seek(0, 0); err != nil {
-		log.Fatalf("Could not seek to beginning of file, %v", err)
-	}
-
-	part2, err := day1.CalculatePart2(file)
-	if err != nil {
-		log.Fatalf("Could not calculate part 2 because %v", err)
-	}
-
-	fmt.Printf("Day 1, part 1: %d\n", part1)
-	fmt.Printf("Day 1, part 2: %d\n", part2)
+	puzzle.Solve(puzzle.Opts{
+		Filename: "day1.txt",
+		Part1:    puzzle.IntSolverFunc(day1.CalculatePart1),
+		Part2:    puzzle.IntSolverFunc(day1.CalculatePart2),
+	})
 }

cmd/day2/main.go

@@ -2,31 +2,13 @@ package main
 
 import (
 	"aoc2023/internal/day2"
-	"fmt"
-	"log"
-	"os"
+	"aoc2023/internal/puzzle"
 )
 
 func main() {
-	file, err := os.Open("day2.txt")
-	if err != nil {
-		log.Fatalf("Could not open file: %v", err)
-	}
-	defer file.Close()
-
-	part1, err := day2.SumPossibleGames(file)
-	if err != nil {
-		log.Fatalf("Could not calculate part 1 because %v", err)
-	}
-
-	if _, err := file.Seek(0, 0); err != nil {
-		log.Fatalf("Could not seek to beginning of file, %v", err)
-	}
-	part2, err := day2.CubeMinimumGame(file)
-	if err != nil {
-		log.Fatalf("Could not calculate part 2 because %v", err)
-	}
-
-	fmt.Printf("Day 2, part 1: %d\n", part1)
-	fmt.Printf("Day 2, part 2: %d\n", part2)
+	puzzle.Solve(puzzle.Opts{
+		Filename: "day2.txt",
+		Part1:    puzzle.IntSolverFunc(day2.SumPossibleGames),
+		Part2:    puzzle.IntSolverFunc(day2.CubeMinimumGame),
+	})
 }

internal/puzzle/puzzle.go

@@ -0,0 +1,44 @@
+package puzzle
+
+import (
+	"fmt"
+	"log"
+	"os"
+)
+
+type Opts struct {
+	Filename string
+	Part1    Solver
+	Part2    Solver
+}
+
+func Solve(puzzle Opts) {
+	file, err := os.Open(puzzle.Filename)
+	if err != nil {
+		log.Fatalf("Could not open file: %v", err)
+	}
+	defer file.Close()
+
+	if puzzle.Part1 == nil {
+		return
+	}
+
+	part1, err := puzzle.Part1.Solve(file)
+	if err != nil {
+		log.Fatalf("Could not calculate part 1 because %v", err)
+	}
+	fmt.Printf("Part 1: %s\n", part1)
+
+	if _, err := file.Seek(0, 0); err != nil {
+		log.Fatalf("Could not seek to beginning of file, %v", err)
+	}
+
+	if puzzle.Part2 == nil {
+		return
+	}
+	part2, err := puzzle.Part2.Solve(file)
+	if err != nil {
+		log.Fatalf("Could not calculate part 2 because %v", err)
+	}
+	fmt.Printf("Part 2: %s\n", part2)
+}

internal/puzzle/solver.go

@@ -0,0 +1,23 @@
+package puzzle
+
+import (
+	"io"
+	"strconv"
+)
+
+type Solver interface {
+	Solve(reader io.Reader) (string, error)
+}
+
+type SolverFunc func(reader io.Reader) (string, error)
+
+func (r SolverFunc) Solve(reader io.Reader) (string, error) {
+	return r(reader)
+}
+
+type IntSolverFunc func(reader io.Reader) (int, error)
+
+func (r IntSolverFunc) Solve(reader io.Reader) (string, error) {
+	solve, err := r(reader)
+	return strconv.Itoa(solve), err
+}