Merge pull request #12 from sraaphorst/I02

Switched to reading input directly from AOC as per rules.

Author: sraaphorst

.gitignore

@@ -5,8 +5,8 @@ build/
 !**/src/test/**/build/
 
 ### Advent of Code Input ###
-src/main/resources
 src/main/resources/cookie
+src/main/resources/day*.txt
 
 ### IntelliJ IDEA ###
 .idea

README.md

@@ -2,6 +2,9 @@
 
 My attempt in Kotlin to complete the [2024 Advent of Code](https://adventofcode.com/2024).
 
-**Current status:** Day 5 complete.
+To retrieve input data, you must obtain your session cookie from
+the Advent of Code website and add it to the [resources](src/main/resources) directory.
 
-**Last updated:** 2024-12-05.
+**Current status:** Day 8 complete.
+
+**Last updated:** 2024-12-08.

src/main/kotlin/day01/day01.kt

@@ -3,9 +3,8 @@
 
 package day01
 
-import common.day
+import common.aocreader.fetchAdventOfCodeInput
 import common.parsing.parseColumns
-import common.readInput
 import common.collectionops.toFrequencyMap
 import kotlin.math.abs
 
@@ -25,7 +24,7 @@ fun answer2(input: String): Int =
         }
 
 fun main() {
-    val input = readInput({}::class.day())
+    val input = fetchAdventOfCodeInput(2024, 1)
 
     println("--- Day 1: Historian Hysteria ---")
 

src/main/kotlin/day02/day02.kt

@@ -3,10 +3,9 @@
 
 package day02
 
+import common.aocreader.fetchAdventOfCodeInput
 import common.collectionops.allListDrops
-import common.day
 import common.parsing.parseGrid
-import common.readInput
 
 private const val Lower = 1
 private const val Upper = 3
@@ -30,7 +29,7 @@ fun answer2(input: String): Int =
     parseGrid(input, String::toInt).count(::isReportAlmostSafe)
 
 fun main() {
-    val input = readInput({}::class.day())
+    val input = fetchAdventOfCodeInput(2024, 2)
 
     println("--- Day 2: Red-Nosed Reports ---")
 

src/main/kotlin/day03/day03.kt

@@ -3,8 +3,7 @@
 
 package day03
 
-import common.day
-import common.readInput
+import common.aocreader.fetchAdventOfCodeInput
 
 /**
  * We want to turn off processing for substrings of the form:
@@ -31,7 +30,7 @@ fun answer2(input: String): Int =
     answer1(preprocess(input))
 
 fun main() {
-    val input = readInput({}::class.day())
+    val input = fetchAdventOfCodeInput(2024, 3)
 
     println("--- Day 3: Mull It Over ---")
 

src/main/kotlin/day04/day04.kt

@@ -3,10 +3,9 @@
 
 package day04
 
+import common.aocreader.fetchAdventOfCodeInput
 import common.countSubstrings
-import common.day
 import common.collectionops.*
-import common.readInput
 
 private const val XMAS = "XMAS"
 
@@ -60,7 +59,7 @@ fun answer2(input: String): Int =
     countXXmases(input.lines())
 
 fun main() {
-    val input = readInput({}::class.day())
+    val input = fetchAdventOfCodeInput(2024, 4)
 
     println("--- Day 4: Ceres Search ---")
 

src/main/kotlin/day05/day05.kt

@@ -3,9 +3,8 @@
 
 package day05
 
-import common.day
+import common.aocreader.fetchAdventOfCodeInput
 import common.collectionops.middle
-import common.readInput
 
 private typealias OrderingRules = Map<Int, Set<Int>>
 private typealias Updates = List<Int>
@@ -96,7 +95,7 @@ fun answer2(input: String): Int =
     }
 
 fun main() {
-    val input = readInput({}::class.day()).trim()
+    val input = fetchAdventOfCodeInput(2024, 5)
 
     println("--- Day 5: Print Queue ---")
 

src/main/kotlin/day06/day06.kt

@@ -6,9 +6,8 @@
 
 package day06
 
+import common.aocreader.fetchAdventOfCodeInput
 import common.intpos2d.*
-import common.day
-import common.readInput
 
 /**
  * The direction that the guard is facing and moves in.
@@ -101,7 +100,7 @@ fun answer2(input: String): Int =
     }
 
 fun main() {
-    val input = readInput({}::class.day()).trim()
+    val input = fetchAdventOfCodeInput(2024, 6)
 
     println("--- Day 6: Guard Gallivant ---")
 

src/main/kotlin/day07/day07.kt

@@ -3,6 +3,7 @@
 
 package day07
 
+import common.aocreader.fetchAdventOfCodeInput
 import common.day
 import common.parsing.WhitespaceParser
 import common.readInput
@@ -58,7 +59,7 @@ fun answer2(input: String): BigInteger =
 
 
 fun main() {
-    val input = readInput({}::class.day()).trim()
+    val input = fetchAdventOfCodeInput(2024, 7)
 
     println("--- Day 7: Bridge Repair ---")
 

src/main/kotlin/day08/day08.kt

@@ -3,6 +3,7 @@
 
 package day08
 
+import common.aocreader.fetchAdventOfCodeInput
 import common.day
 import common.intpos2d.*
 import common.readInput
@@ -83,7 +84,7 @@ fun answer2(input: String): Int =
 
 
 fun main() {
-    val input = readInput({}::class.day()).trim()
+    val input = fetchAdventOfCodeInput(2024, 8)
 
     println("--- Day 8: Resonant Collinearity ---")
 

src/main/resources/README.md

@@ -0,0 +1,4 @@
+# Resources
+
+This directory should contain a single file named `cookie` (not included in GitHub)
+that contains, on a single line, the cookie associated with your Advent of Code account.