From 773a676ba0cd1a9a796c9f41b8acd0bb9f410a38 Mon Sep 17 00:00:00 2001 From: C4 Patino Date: Wed, 11 Dec 2024 17:37:51 -0600 Subject: [PATCH] Renamed to have nicer folder order --- 2024/cmd/root.go | 40 ++++++------ 2024/cmd/submit/cmd.go | 40 ------------ 2024/cmd/submit/submit_input.go | 63 ------------------- 2024/cmd/update/main.go | 18 +++--- 2024/{day1/day1.go => day01/day01.go} | 2 +- .../day1_test.go => day01/day01_test.go} | 2 +- 2024/{day1 => day01}/input.txt | 0 2024/{day1 => day01}/test.txt | 0 2024/{day2/day2.go => day02/day02.go} | 2 +- .../day2_test.go => day02/day02_test.go} | 2 +- 2024/{day2 => day02}/input.txt | 0 2024/{day2 => day02}/test.txt | 0 2024/{day3/day3.go => day03/day03.go} | 2 +- .../day3_test.go => day03/day03_test.go} | 2 +- 2024/{day3 => day03}/input.txt | 0 2024/{day3 => day03}/test.txt | 0 2024/{day4/day4.go => day04/day04.go} | 2 +- .../day4_test.go => day04/day04_test.go} | 2 +- 2024/{day4 => day04}/input.txt | 0 2024/{day4 => day04}/test.txt | 0 2024/{day5/day5.go => day05/day05.go} | 2 +- .../day5_test.go => day05/day05_test.go} | 2 +- 2024/{day5 => day05}/input.txt | 0 2024/{day5 => day05}/test.txt | 0 2024/{day6/day6.go => day06/day06.go} | 2 +- .../day6_test.go => day06/day06_test.go} | 2 +- 2024/{day6 => day06}/input.txt | 0 2024/{day6 => day06}/test.txt | 0 2024/{day7/day7.go => day07/day07.go} | 2 +- .../day7_test.go => day07/day07_test.go} | 2 +- 2024/{day7 => day07}/input.txt | 0 2024/{day7 => day07}/test.txt | 0 2024/{day8/day8.go => day08/day08.go} | 2 +- .../day8_test.go => day08/day08_test.go} | 2 +- 2024/{day8 => day08}/input.txt | 0 2024/{day8 => day08}/test.txt | 0 2024/{day9/day9.go => day09/day09.go} | 2 +- .../day9_test.go => day09/day09_test.go} | 2 +- 2024/{day9 => day09}/input.txt | 0 2024/{day9 => day09}/test.txt | 0 40 files changed, 48 insertions(+), 149 deletions(-) delete mode 100644 2024/cmd/submit/cmd.go delete mode 100644 2024/cmd/submit/submit_input.go rename 2024/{day1/day1.go => day01/day01.go} (98%) rename 2024/{day1/day1_test.go => day01/day01_test.go} (98%) rename 2024/{day1 => day01}/input.txt (100%) rename 2024/{day1 => day01}/test.txt (100%) rename 2024/{day2/day2.go => day02/day02.go} (99%) rename 2024/{day2/day2_test.go => day02/day02_test.go} (98%) rename 2024/{day2 => day02}/input.txt (100%) rename 2024/{day2 => day02}/test.txt (100%) rename 2024/{day3/day3.go => day03/day03.go} (99%) rename 2024/{day3/day3_test.go => day03/day03_test.go} (98%) rename 2024/{day3 => day03}/input.txt (100%) rename 2024/{day3 => day03}/test.txt (100%) rename 2024/{day4/day4.go => day04/day04.go} (99%) rename 2024/{day4/day4_test.go => day04/day04_test.go} (98%) rename 2024/{day4 => day04}/input.txt (100%) rename 2024/{day4 => day04}/test.txt (100%) rename 2024/{day5/day5.go => day05/day05.go} (99%) rename 2024/{day5/day5_test.go => day05/day05_test.go} (98%) rename 2024/{day5 => day05}/input.txt (100%) rename 2024/{day5 => day05}/test.txt (100%) rename 2024/{day6/day6.go => day06/day06.go} (99%) rename 2024/{day6/day6_test.go => day06/day06_test.go} (98%) rename 2024/{day6 => day06}/input.txt (100%) rename 2024/{day6 => day06}/test.txt (100%) rename 2024/{day7/day7.go => day07/day07.go} (99%) rename 2024/{day7/day7_test.go => day07/day07_test.go} (98%) rename 2024/{day7 => day07}/input.txt (100%) rename 2024/{day7 => day07}/test.txt (100%) rename 2024/{day8/day8.go => day08/day08.go} (99%) rename 2024/{day8/day8_test.go => day08/day08_test.go} (98%) rename 2024/{day8 => day08}/input.txt (100%) rename 2024/{day8 => day08}/test.txt (100%) rename 2024/{day9/day9.go => day09/day09.go} (99%) rename 2024/{day9/day9_test.go => day09/day09_test.go} (98%) rename 2024/{day9 => day09}/input.txt (100%) rename 2024/{day9 => day09}/test.txt (100%) diff --git a/2024/cmd/root.go b/2024/cmd/root.go index 5f7cb6f..2f4e160 100644 --- a/2024/cmd/root.go +++ b/2024/cmd/root.go @@ -7,34 +7,33 @@ import ( "strconv" "cpatino.com/advent-of-code/2024/cmd/generate" - "cpatino.com/advent-of-code/2024/cmd/submit" "github.com/spf13/cobra" - "cpatino.com/advent-of-code/2024/day1" + "cpatino.com/advent-of-code/2024/day01" + "cpatino.com/advent-of-code/2024/day02" + "cpatino.com/advent-of-code/2024/day03" + "cpatino.com/advent-of-code/2024/day04" + "cpatino.com/advent-of-code/2024/day05" + "cpatino.com/advent-of-code/2024/day06" + "cpatino.com/advent-of-code/2024/day07" + "cpatino.com/advent-of-code/2024/day08" + "cpatino.com/advent-of-code/2024/day09" "cpatino.com/advent-of-code/2024/day10" "cpatino.com/advent-of-code/2024/day11" - "cpatino.com/advent-of-code/2024/day2" - "cpatino.com/advent-of-code/2024/day3" - "cpatino.com/advent-of-code/2024/day4" - "cpatino.com/advent-of-code/2024/day5" - "cpatino.com/advent-of-code/2024/day6" - "cpatino.com/advent-of-code/2024/day7" - "cpatino.com/advent-of-code/2024/day8" - "cpatino.com/advent-of-code/2024/day9" ) var days = map[int]func(string) (int, int){ - 1: day1.Run, + 1: day01.Run, + 2: day02.Run, + 3: day03.Run, + 4: day04.Run, + 5: day05.Run, + 6: day06.Run, + 7: day07.Run, + 8: day08.Run, + 9: day09.Run, 10: day10.Run, 11: day11.Run, - 2: day2.Run, - 3: day3.Run, - 4: day4.Run, - 5: day5.Run, - 6: day6.Run, - 7: day7.Run, - 8: day8.Run, - 9: day9.Run, } var rootCmd = &cobra.Command{ @@ -49,7 +48,7 @@ var rootCmd = &cobra.Command{ file, _ := cmd.Flags().GetString("file") if file == "" { - file = fmt.Sprintf("./day%d/input.txt", day) + file = fmt.Sprintf("./day%02d/input.txt", day) } if _, err := os.Stat(file); os.IsNotExist(err) { @@ -67,7 +66,6 @@ var rootCmd = &cobra.Command{ func init() { rootCmd.AddCommand(generate.GenerateCmd) - rootCmd.AddCommand(submit.SubmitCmd) rootCmd.Flags().String("file", "", "Path to a file") } diff --git a/2024/cmd/submit/cmd.go b/2024/cmd/submit/cmd.go deleted file mode 100644 index 6be39f3..0000000 --- a/2024/cmd/submit/cmd.go +++ /dev/null @@ -1,40 +0,0 @@ -package submit - -import ( - "log" - "os" - "strconv" - - "github.com/spf13/cobra" -) - -func handleErr(err error, folder string) { - os.RemoveAll(folder) - log.Fatal(err) -} - -var SubmitCmd = &cobra.Command{ - Use: "submit", - Short: "Submit solution to Advent of Code 2024", - Args: cobra.ExactArgs(3), - Run: func(cmd *cobra.Command, args []string) { - day, err := strconv.Atoi(args[0]) - if err != nil { - log.Fatal(err) - } - - part, err := strconv.Atoi(args[1]) - if err != nil { - log.Fatal(err) - } - - answer, err := strconv.Atoi(args[2]) - if err != nil { - log.Fatal(err) - } - - if err := submitInput(day, part, answer); err != nil { - log.Fatal(err) - } - }, -} diff --git a/2024/cmd/submit/submit_input.go b/2024/cmd/submit/submit_input.go deleted file mode 100644 index d3fdb7f..0000000 --- a/2024/cmd/submit/submit_input.go +++ /dev/null @@ -1,63 +0,0 @@ -package submit - -import ( - "errors" - "fmt" - "io" - "net/http" - "net/http/cookiejar" - "net/url" - "os" - "strings" -) - -func submitInput(day, level, answer int) error { - cookieValue := os.Getenv("COOKIE") - if cookieValue == "" { - return errors.New("COOKIE environment variable not set") - } - - jar, err := cookiejar.New(nil) - if err != nil { - return err - } - - data := url.Values{} - data.Set("level", fmt.Sprintf("%d", level)) - data.Set("answer", fmt.Sprintf("%d", answer)) - - client := &http.Client{Jar: jar} - - reqUrl := fmt.Sprintf("https://adventofcode.com/2024/day/%d/answer", day) - req, err := http.NewRequest("POST", reqUrl, strings.NewReader(data.Encode())) - if err != nil { - return 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) - - resp, err := client.Do(req) - if err != nil { - return err - } - defer resp.Body.Close() - - body, err := io.ReadAll(resp.Body) - if err != nil { - return err - } - - if resp.StatusCode != http.StatusOK { - return errors.New(fmt.Sprintf("Unexpected status code: %d\nBody: %s", resp.StatusCode, string(body))) - } - - filename := fmt.Sprintf("./day%02d/input.txt", day) - if err := os.WriteFile(filename, []byte(body), 0755); err != nil { - return err - } - - return nil -} diff --git a/2024/cmd/update/main.go b/2024/cmd/update/main.go index 0bac7a6..3b80431 100644 --- a/2024/cmd/update/main.go +++ b/2024/cmd/update/main.go @@ -2,9 +2,11 @@ package main import ( "fmt" + "log" "os" "os/exec" "path/filepath" + "strconv" "strings" ) @@ -19,7 +21,6 @@ import ( "github.com/spf13/cobra" "cpatino.com/advent-of-code/2024/cmd/generate" - "cpatino.com/advent-of-code/2024/cmd/submit" %s ) @@ -40,7 +41,7 @@ var rootCmd = &cobra.Command{ file, _ := cmd.Flags().GetString("file") if file == "" { - file = fmt.Sprintf("./day%%d/input.txt", day) + file = fmt.Sprintf("./day%%02d/input.txt", day) } if _, err := os.Stat(file); os.IsNotExist(err) { @@ -58,7 +59,6 @@ var rootCmd = &cobra.Command{ func init() { rootCmd.AddCommand(generate.GenerateCmd) - rootCmd.AddCommand(submit.SubmitCmd) rootCmd.Flags().String("file", "", "Path to a file") } @@ -85,11 +85,15 @@ func Execute() error { return nil } - dayStr := info.Name() - dayNum := strings.TrimPrefix(dayStr, "day") + dayStr := strings.TrimPrefix(info.Name(), "day") - imports.WriteString(fmt.Sprintf("\t\"cpatino.com/advent-of-code/2024/%s\"\n", dayStr)) - mappings.WriteString(fmt.Sprintf("\t%s: %s.Run,\n", dayNum, dayStr)) + day, err := strconv.Atoi(dayStr) + if err != nil { + log.Fatal(err) + } + + imports.WriteString(fmt.Sprintf("\t\"cpatino.com/advent-of-code/2024/day%02d\"\n", day)) + mappings.WriteString(fmt.Sprintf("\t%d: day%02d.Run,\n", day, day)) return nil }) diff --git a/2024/day1/day1.go b/2024/day01/day01.go similarity index 98% rename from 2024/day1/day1.go rename to 2024/day01/day01.go index 96e1fe7..822d8c2 100644 --- a/2024/day1/day1.go +++ b/2024/day01/day01.go @@ -1,4 +1,4 @@ -package day1 +package day01 import ( "bufio" diff --git a/2024/day1/day1_test.go b/2024/day01/day01_test.go similarity index 98% rename from 2024/day1/day1_test.go rename to 2024/day01/day01_test.go index 042c47f..9050391 100644 --- a/2024/day1/day1_test.go +++ b/2024/day01/day01_test.go @@ -1,4 +1,4 @@ -package day1 +package day01 import ( "os" diff --git a/2024/day1/input.txt b/2024/day01/input.txt similarity index 100% rename from 2024/day1/input.txt rename to 2024/day01/input.txt diff --git a/2024/day1/test.txt b/2024/day01/test.txt similarity index 100% rename from 2024/day1/test.txt rename to 2024/day01/test.txt diff --git a/2024/day2/day2.go b/2024/day02/day02.go similarity index 99% rename from 2024/day2/day2.go rename to 2024/day02/day02.go index b918366..154e401 100644 --- a/2024/day2/day2.go +++ b/2024/day02/day02.go @@ -1,4 +1,4 @@ -package day2 +package day02 import ( "bufio" diff --git a/2024/day2/day2_test.go b/2024/day02/day02_test.go similarity index 98% rename from 2024/day2/day2_test.go rename to 2024/day02/day02_test.go index 0aa2a9f..a9008e4 100644 --- a/2024/day2/day2_test.go +++ b/2024/day02/day02_test.go @@ -1,4 +1,4 @@ -package day2 +package day02 import ( "os" diff --git a/2024/day2/input.txt b/2024/day02/input.txt similarity index 100% rename from 2024/day2/input.txt rename to 2024/day02/input.txt diff --git a/2024/day2/test.txt b/2024/day02/test.txt similarity index 100% rename from 2024/day2/test.txt rename to 2024/day02/test.txt diff --git a/2024/day3/day3.go b/2024/day03/day03.go similarity index 99% rename from 2024/day3/day3.go rename to 2024/day03/day03.go index 8984de6..a6e9c54 100644 --- a/2024/day3/day3.go +++ b/2024/day03/day03.go @@ -1,4 +1,4 @@ -package day3 +package day03 import ( "bufio" diff --git a/2024/day3/day3_test.go b/2024/day03/day03_test.go similarity index 98% rename from 2024/day3/day3_test.go rename to 2024/day03/day03_test.go index 4cf64c8..9e8460e 100644 --- a/2024/day3/day3_test.go +++ b/2024/day03/day03_test.go @@ -1,4 +1,4 @@ -package day3 +package day03 import ( "os" diff --git a/2024/day3/input.txt b/2024/day03/input.txt similarity index 100% rename from 2024/day3/input.txt rename to 2024/day03/input.txt diff --git a/2024/day3/test.txt b/2024/day03/test.txt similarity index 100% rename from 2024/day3/test.txt rename to 2024/day03/test.txt diff --git a/2024/day4/day4.go b/2024/day04/day04.go similarity index 99% rename from 2024/day4/day4.go rename to 2024/day04/day04.go index ba23db0..62fe0f7 100644 --- a/2024/day4/day4.go +++ b/2024/day04/day04.go @@ -1,4 +1,4 @@ -package day4 +package day04 import ( "bufio" diff --git a/2024/day4/day4_test.go b/2024/day04/day04_test.go similarity index 98% rename from 2024/day4/day4_test.go rename to 2024/day04/day04_test.go index 153829f..776e71a 100644 --- a/2024/day4/day4_test.go +++ b/2024/day04/day04_test.go @@ -1,4 +1,4 @@ -package day4 +package day04 import ( "os" diff --git a/2024/day4/input.txt b/2024/day04/input.txt similarity index 100% rename from 2024/day4/input.txt rename to 2024/day04/input.txt diff --git a/2024/day4/test.txt b/2024/day04/test.txt similarity index 100% rename from 2024/day4/test.txt rename to 2024/day04/test.txt diff --git a/2024/day5/day5.go b/2024/day05/day05.go similarity index 99% rename from 2024/day5/day5.go rename to 2024/day05/day05.go index d6cc5f7..4f3171b 100644 --- a/2024/day5/day5.go +++ b/2024/day05/day05.go @@ -1,4 +1,4 @@ -package day5 +package day05 import ( "bufio" diff --git a/2024/day5/day5_test.go b/2024/day05/day05_test.go similarity index 98% rename from 2024/day5/day5_test.go rename to 2024/day05/day05_test.go index 813fdc0..fbf32f0 100644 --- a/2024/day5/day5_test.go +++ b/2024/day05/day05_test.go @@ -1,4 +1,4 @@ -package day5 +package day05 import ( "os" diff --git a/2024/day5/input.txt b/2024/day05/input.txt similarity index 100% rename from 2024/day5/input.txt rename to 2024/day05/input.txt diff --git a/2024/day5/test.txt b/2024/day05/test.txt similarity index 100% rename from 2024/day5/test.txt rename to 2024/day05/test.txt diff --git a/2024/day6/day6.go b/2024/day06/day06.go similarity index 99% rename from 2024/day6/day6.go rename to 2024/day06/day06.go index 6c73214..24045cb 100644 --- a/2024/day6/day6.go +++ b/2024/day06/day06.go @@ -1,4 +1,4 @@ -package day6 +package day06 import ( "bufio" diff --git a/2024/day6/day6_test.go b/2024/day06/day06_test.go similarity index 98% rename from 2024/day6/day6_test.go rename to 2024/day06/day06_test.go index a3ba3fa..c913e8f 100644 --- a/2024/day6/day6_test.go +++ b/2024/day06/day06_test.go @@ -1,4 +1,4 @@ -package day6 +package day06 import ( "os" diff --git a/2024/day6/input.txt b/2024/day06/input.txt similarity index 100% rename from 2024/day6/input.txt rename to 2024/day06/input.txt diff --git a/2024/day6/test.txt b/2024/day06/test.txt similarity index 100% rename from 2024/day6/test.txt rename to 2024/day06/test.txt diff --git a/2024/day7/day7.go b/2024/day07/day07.go similarity index 99% rename from 2024/day7/day7.go rename to 2024/day07/day07.go index 241d22a..d0b9c4c 100644 --- a/2024/day7/day7.go +++ b/2024/day07/day07.go @@ -1,4 +1,4 @@ -package day7 +package day07 import ( "bufio" diff --git a/2024/day7/day7_test.go b/2024/day07/day07_test.go similarity index 98% rename from 2024/day7/day7_test.go rename to 2024/day07/day07_test.go index 65904e5..907aace 100644 --- a/2024/day7/day7_test.go +++ b/2024/day07/day07_test.go @@ -1,4 +1,4 @@ -package day7 +package day07 import ( "os" diff --git a/2024/day7/input.txt b/2024/day07/input.txt similarity index 100% rename from 2024/day7/input.txt rename to 2024/day07/input.txt diff --git a/2024/day7/test.txt b/2024/day07/test.txt similarity index 100% rename from 2024/day7/test.txt rename to 2024/day07/test.txt diff --git a/2024/day8/day8.go b/2024/day08/day08.go similarity index 99% rename from 2024/day8/day8.go rename to 2024/day08/day08.go index 44a6fd7..9482612 100644 --- a/2024/day8/day8.go +++ b/2024/day08/day08.go @@ -1,4 +1,4 @@ -package day8 +package day08 import ( "bufio" diff --git a/2024/day8/day8_test.go b/2024/day08/day08_test.go similarity index 98% rename from 2024/day8/day8_test.go rename to 2024/day08/day08_test.go index 2e74740..73c3c60 100644 --- a/2024/day8/day8_test.go +++ b/2024/day08/day08_test.go @@ -1,4 +1,4 @@ -package day8 +package day08 import ( "os" diff --git a/2024/day8/input.txt b/2024/day08/input.txt similarity index 100% rename from 2024/day8/input.txt rename to 2024/day08/input.txt diff --git a/2024/day8/test.txt b/2024/day08/test.txt similarity index 100% rename from 2024/day8/test.txt rename to 2024/day08/test.txt diff --git a/2024/day9/day9.go b/2024/day09/day09.go similarity index 99% rename from 2024/day9/day9.go rename to 2024/day09/day09.go index c2ada8a..fa428e3 100644 --- a/2024/day9/day9.go +++ b/2024/day09/day09.go @@ -1,4 +1,4 @@ -package day9 +package day09 import ( "bufio" diff --git a/2024/day9/day9_test.go b/2024/day09/day09_test.go similarity index 98% rename from 2024/day9/day9_test.go rename to 2024/day09/day09_test.go index 33ddda9..65d565e 100644 --- a/2024/day9/day9_test.go +++ b/2024/day09/day09_test.go @@ -1,4 +1,4 @@ -package day9 +package day09 import ( "os" diff --git a/2024/day9/input.txt b/2024/day09/input.txt similarity index 100% rename from 2024/day9/input.txt rename to 2024/day09/input.txt diff --git a/2024/day9/test.txt b/2024/day09/test.txt similarity index 100% rename from 2024/day9/test.txt rename to 2024/day09/test.txt