From fe30ff3d6454f433d355c4a1617067044b4e1668 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Wed, 11 Dec 2024 18:40:54 +0100
Subject: [PATCH] [py] Reorganize solution imports

---
 py/aoc/__init__.py       | 65 ++++++----------------------------------
 py/aoc/y2015/__init__.py |  9 ++++++
 py/aoc/y2016/__init__.py |  9 ++++++
 py/aoc/y2017/__init__.py | 13 ++++++++
 py/aoc/y2018/__init__.py | 15 ++++++++++
 py/aoc/y2020/__init__.py |  5 ++++
 py/aoc/y2021/__init__.py |  5 ++++
 py/aoc/y2022/__init__.py | 12 ++++++++
 8 files changed, 77 insertions(+), 56 deletions(-)
 create mode 100644 py/aoc/y2015/__init__.py
 create mode 100644 py/aoc/y2016/__init__.py
 create mode 100644 py/aoc/y2017/__init__.py
 create mode 100644 py/aoc/y2018/__init__.py
 create mode 100644 py/aoc/y2020/__init__.py
 create mode 100644 py/aoc/y2021/__init__.py
 create mode 100644 py/aoc/y2022/__init__.py

diff --git a/py/aoc/__init__.py b/py/aoc/__init__.py
index 7c9987f..bf4d5bf 100644
--- a/py/aoc/__init__.py
+++ b/py/aoc/__init__.py
@@ -1,64 +1,17 @@
-import sys
 import argparse
+import sys
 from pathlib import Path
 
-from .y2015 import d01, d02, d03, d04, d05
-from .y2016 import d01, d02, d03, d04, d05
-from .y2017 import d01, d02, d03, d04, d05, d06, d07, d08, d09
-from .y2018 import d01, d02, d03, d04, d05, d06, d07, d08, d09, d10, d11
-from .y2020 import d10
-from .y2021 import d14
-from .y2022 import d01, d02, d03, d04, d05, d06, d07, d09
+from . import y2015, y2016, y2017, y2018, y2020, y2021, y2022
 
 DAYS = {
-    # 2015
-    "2015_01": y2015.d01.solve,
-    "2015_02": y2015.d02.solve,
-    "2015_03": y2015.d03.solve,
-    "2015_04": y2015.d04.solve,
-    "2015_05": y2015.d05.solve,
-    # 2016
-    "2016_01": y2016.d01.solve,
-    "2016_02": y2016.d02.solve,
-    "2016_03": y2016.d03.solve,
-    "2016_04": y2016.d04.solve,
-    "2016_05": y2016.d05.solve,
-    # 2017
-    "2017_01": y2017.d01.solve,
-    "2017_02": y2017.d02.solve,
-    "2017_03": y2017.d03.solve,
-    "2017_04": y2017.d04.solve,
-    "2017_05": y2017.d05.solve,
-    "2017_06": y2017.d06.solve,
-    "2017_07": y2017.d07.solve,
-    "2017_08": y2017.d08.solve,
-    "2017_09": y2017.d09.solve,
-    # 2018
-    "2018_01": y2018.d01.solve,
-    "2018_02": y2018.d02.solve,
-    "2018_03": y2018.d03.solve,
-    "2018_04": y2018.d04.solve,
-    "2018_05": y2018.d05.solve,
-    "2018_06": y2018.d06.solve,
-    "2018_07": y2018.d07.solve,
-    "2018_08": y2018.d08.solve,
-    "2018_09": y2018.d09.solve,
-    "2018_10": y2018.d10.solve,
-    "2018_11": y2018.d11.solve,
-    # 2019
-    # 2020
-    "2020_10": y2020.d10.solve,
-    # 2021
-    "2021_14": y2021.d14.solve,
-    # 2022
-    "2022_01": y2022.d01.solve,
-    "2022_02": y2022.d02.solve,
-    "2022_03": y2022.d03.solve,
-    "2022_04": y2022.d04.solve,
-    "2022_05": y2022.d05.solve,
-    "2022_06": y2022.d06.solve,
-    "2022_07": y2022.d07.solve,
-    "2022_09": y2022.d09.solve,
+    **y2015.DAYS,
+    **y2016.DAYS,
+    **y2017.DAYS,
+    **y2018.DAYS,
+    **y2020.DAYS,
+    **y2021.DAYS,
+    **y2022.DAYS,
 }
 
 
diff --git a/py/aoc/y2015/__init__.py b/py/aoc/y2015/__init__.py
new file mode 100644
index 0000000..e89eddf
--- /dev/null
+++ b/py/aoc/y2015/__init__.py
@@ -0,0 +1,9 @@
+from . import d01, d02, d03, d04, d05
+
+DAYS = {
+    "2015_01": d01.solve,
+    "2015_02": d02.solve,
+    "2015_03": d03.solve,
+    "2015_04": d04.solve,
+    "2015_05": d05.solve,
+}
diff --git a/py/aoc/y2016/__init__.py b/py/aoc/y2016/__init__.py
new file mode 100644
index 0000000..9e1dd85
--- /dev/null
+++ b/py/aoc/y2016/__init__.py
@@ -0,0 +1,9 @@
+from . import d01, d02, d03, d04, d05
+
+DAYS = {
+    "2016_01": d01.solve,
+    "2016_02": d02.solve,
+    "2016_03": d03.solve,
+    "2016_04": d04.solve,
+    "2016_05": d05.solve,
+}
diff --git a/py/aoc/y2017/__init__.py b/py/aoc/y2017/__init__.py
new file mode 100644
index 0000000..00f60f1
--- /dev/null
+++ b/py/aoc/y2017/__init__.py
@@ -0,0 +1,13 @@
+from . import d01, d02, d03, d04, d05, d06, d07, d08, d09
+
+DAYS = {
+    "2017_01": d01.solve,
+    "2017_02": d02.solve,
+    "2017_03": d03.solve,
+    "2017_04": d04.solve,
+    "2017_05": d05.solve,
+    "2017_06": d06.solve,
+    "2017_07": d07.solve,
+    "2017_08": d08.solve,
+    "2017_09": d09.solve,
+}
diff --git a/py/aoc/y2018/__init__.py b/py/aoc/y2018/__init__.py
new file mode 100644
index 0000000..fede50d
--- /dev/null
+++ b/py/aoc/y2018/__init__.py
@@ -0,0 +1,15 @@
+from . import d01, d02, d03, d04, d05, d06, d07, d08, d09, d10, d11
+
+DAYS = {
+    "2018_01": d01.solve,
+    "2018_02": d02.solve,
+    "2018_03": d03.solve,
+    "2018_04": d04.solve,
+    "2018_05": d05.solve,
+    "2018_06": d06.solve,
+    "2018_07": d07.solve,
+    "2018_08": d08.solve,
+    "2018_09": d09.solve,
+    "2018_10": d10.solve,
+    "2018_11": d11.solve,
+}
diff --git a/py/aoc/y2020/__init__.py b/py/aoc/y2020/__init__.py
new file mode 100644
index 0000000..a2f0142
--- /dev/null
+++ b/py/aoc/y2020/__init__.py
@@ -0,0 +1,5 @@
+from . import d10
+
+DAYS = {
+    "2020_10": d10.solve,
+}
diff --git a/py/aoc/y2021/__init__.py b/py/aoc/y2021/__init__.py
new file mode 100644
index 0000000..1d8abf9
--- /dev/null
+++ b/py/aoc/y2021/__init__.py
@@ -0,0 +1,5 @@
+from . import d14
+
+DAYS = {
+    "2021_14": d14.solve,
+}
diff --git a/py/aoc/y2022/__init__.py b/py/aoc/y2022/__init__.py
new file mode 100644
index 0000000..ce4fe43
--- /dev/null
+++ b/py/aoc/y2022/__init__.py
@@ -0,0 +1,12 @@
+from . import d01, d02, d03, d04, d05, d06, d07, d09
+
+DAYS = {
+    "2022_01": d01.solve,
+    "2022_02": d02.solve,
+    "2022_03": d03.solve,
+    "2022_04": d04.solve,
+    "2022_05": d05.solve,
+    "2022_06": d06.solve,
+    "2022_07": d07.solve,
+    "2022_09": d09.solve,
+}