From 3c8f35ae12c10dae21e70e13eaafc39cc08eb9a9 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sun, 15 Dec 2024 11:45:45 -0600
Subject: [PATCH] Updated commands to have slightly better structuring

---
 2024/cmd/generate/cmd.go           |  2 +-
 2024/cmd/generate/fetch_input.go   | 64 +++++++++++++++++++++++-------
 2024/cmd/generate/main_template.go |  2 +-
 2024/cmd/generate/test_template.go |  2 +-
 2024/cmd/root.go                   |  2 -
 5 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/2024/cmd/generate/cmd.go b/2024/cmd/generate/cmd.go
index 6f780ff..1145924 100644
--- a/2024/cmd/generate/cmd.go
+++ b/2024/cmd/generate/cmd.go
@@ -26,7 +26,7 @@ var GenerateCmd = &cobra.Command{
 
 		folder := fmt.Sprintf("./day%02d", day)
 		if err := os.Mkdir(folder, 0755); err != nil {
-			handleErr(err, folder)
+			log.Fatal(err)
 		}
 
 		if err := generateMainCode(day); err != nil {
diff --git a/2024/cmd/generate/fetch_input.go b/2024/cmd/generate/fetch_input.go
index 9f874ec..eb449ec 100644
--- a/2024/cmd/generate/fetch_input.go
+++ b/2024/cmd/generate/fetch_input.go
@@ -1,51 +1,87 @@
 package generate
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"net/http/cookiejar"
+	"net/url"
 	"os"
 )
 
-func retrieveInput(day int) error {
-	cookieValue := os.Getenv("COOKIE")
+const (
+	baseURL       = "https://adventofcode.com/2024/day/%d/input"
+	host          = "adventofcode.com"
+	filePerm      = 0644
+	userAgent     = "github.com/C4theBomb/advent-of-code by c4patino@gmail.com"
+	cookieEnvName = "COOKIE"
+)
+
+func getCookie() (string, error) {
+	cookieValue := os.Getenv(cookieEnvName)
 	if cookieValue == "" {
-		return errors.New("COOKIE environment variable not set")
+		return "", fmt.Errorf("%s environment variable not set", cookieEnvName)
 	}
 
+	return cookieValue, nil
+
+}
+
+func createHTTPClient(cookieValue string) (*http.Client, error) {
 	jar, err := cookiejar.New(nil)
 	if err != nil {
-		return err
+		return nil, fmt.Errorf("failed to create cookie jar: %w", err)
 	}
 
+	domainURL := &url.URL{Scheme: "https", Host: host}
+
 	client := &http.Client{Jar: jar}
+	jar.SetCookies(domainURL, []*http.Cookie{{Name: "session", Value: cookieValue}})
 
-	url := fmt.Sprintf("https://adventofcode.com/2024/day/%d/input", day)
+	return client, nil
+}
+
+func fetchInput(client *http.Client, day int) ([]byte, error) {
+	url := fmt.Sprintf(baseURL, day)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
-		return err
+		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	req.Header.Set("User-Agent", "github.com/C4theBomb/advent-of-code by c4patino@gmail.com")
-
-	cookie := &http.Cookie{Name: "session", Value: cookieValue}
-	req.AddCookie(cookie)
+	req.Header.Set("User-Agent", userAgent)
 
 	resp, err := client.Do(req)
 	if err != nil {
-		return err
+		return nil, fmt.Errorf("request failed: %w", err)
 	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return err
+		return nil, fmt.Errorf("failed to read response body: %w", err)
 	}
 
 	if resp.StatusCode != http.StatusOK {
-		return errors.New(fmt.Sprintf("Unexpected status code: %d\n%s", resp.StatusCode, string(body)))
+		return nil, fmt.Errorf("unexpected status code %d: %s", resp.StatusCode, string(body))
+	}
+
+	return body, nil
+}
+
+func retrieveInput(day int) error {
+	cookieValue, err := getCookie()
+	if err != nil {
+		return err
+	}
+
+	client, err := createHTTPClient(cookieValue)
+	if err != nil {
+		return err
+	}
+
+	body, err := fetchInput(client, day)
+	if err != nil {
+		return err
 	}
 
 	filename := fmt.Sprintf("./day%02d/input.txt", day)
diff --git a/2024/cmd/generate/main_template.go b/2024/cmd/generate/main_template.go
index f796bf4..c1ca455 100644
--- a/2024/cmd/generate/main_template.go
+++ b/2024/cmd/generate/main_template.go
@@ -6,7 +6,7 @@ import (
 	"os/exec"
 )
 
-var mainCodeTemplate = `package day%02d
+const mainCodeTemplate = `package day%02d
 
 import (
 	"bufio"
diff --git a/2024/cmd/generate/test_template.go b/2024/cmd/generate/test_template.go
index 0303eef..48aa6de 100644
--- a/2024/cmd/generate/test_template.go
+++ b/2024/cmd/generate/test_template.go
@@ -6,7 +6,7 @@ import (
 	"os/exec"
 )
 
-var testCodeTemplate = `package day%02d
+const testCodeTemplate = `package day%02d
 
 import (
 	"os"
diff --git a/2024/cmd/root.go b/2024/cmd/root.go
index 5989406..d1f7572 100644
--- a/2024/cmd/root.go
+++ b/2024/cmd/root.go
@@ -22,7 +22,6 @@ import (
 	"cpatino.com/advent-of-code/2024/day11"
 	"cpatino.com/advent-of-code/2024/day12"
 	"cpatino.com/advent-of-code/2024/day13"
-	"cpatino.com/advent-of-code/2024/day14"
 	"cpatino.com/advent-of-code/2024/day15"
 )
 
@@ -40,7 +39,6 @@ var days = map[int]func(string) (int, int){
 	11: day11.Run,
 	12: day12.Run,
 	13: day13.Run,
-	14: day14.Run,
 	15: day15.Run,
 }