rundb

Author: rene-d

.gitignore

@@ -25,3 +25,4 @@ build/
 
 resolve_error.sh
 resolve_unknown.sh
+.run.db

Cargo.toml

@@ -44,6 +44,8 @@ geo = "*"
 geo-types = "*"
 bytecount = "*"
 divisors = "*"
+rusqlite = "0.33.0"
+sha2 = "0.10.8"
 
 [lints.clippy]
 pedantic = "forbid"

crates/aoc/src/args.rs

@@ -27,11 +27,13 @@ impl Args {
         args
     }
 
+    #[must_use]
     pub const fn input(&self) -> &String {
         &self.input
     }
 
     /// Return `true` if the flag -v/--verbose is on commandline.
+    #[must_use]
     pub const fn is_verbose(&self) -> bool {
         self.verbose
     }
@@ -61,11 +63,13 @@ impl Args {
         }
     }
 
+    #[must_use]
     pub fn has_option(&self, option: &str) -> bool {
         self.options.iter().filter(|s| *s == option).count() != 0
         //self.options.contains(option)
     }
 
+    #[must_use]
     pub fn params(&self) -> &[String] {
         self.params.as_slice()
     }
@@ -101,16 +105,21 @@ fn usage() {
 }
 
 impl Args {
+    /// Run a day solution, with input data read from file `input.txt`
+    /// or the first non flag argument of the commandline.
+    /// Display the elapsed time in the flag `--elapsed` is present.
     pub fn run<U, V, T>(&self, solve: T)
     where
         U: Display,
         V: Display,
         T: Fn(&str) -> (U, V),
     {
-        self.run_data(solve, &self.input);
+        let _ = self.run_data(solve, &self.input);
     }
 
-    pub fn run_data<U, V, T>(&self, solve: T, data: &str)
+    /// Run a day solution with the given input data.
+    /// Display the elapsed time in the flag `--elapsed` is present.
+    pub fn run_data<U, V, T>(&self, solve: T, data: &str) -> Duration
     where
         U: Display,
         V: Display,
@@ -134,5 +143,7 @@ impl Args {
         if self.elapsed {
             println!("elapsed: {micros:?}");
         }
+
+        elapsed
     }
 }

crates/aoc/src/lib.rs

@@ -1,5 +1,3 @@
-use args::Args;
-
 mod args;
 mod coord;
 mod counter;
@@ -12,8 +10,12 @@ pub mod knot;
 pub mod math;
 pub mod ocr;
 mod square;
+mod unwraperror;
 pub mod util;
 
+pub use args::Args;
+pub use unwraperror::DAMN;
+
 pub type Coord = coord::Coord;
 pub type Direction = direction::Direction;
 pub type Grid<T> = grid::Grid<T>;
@@ -64,12 +66,12 @@ impl std::fmt::Display for Christmas {
 /// });
 /// ```
 #[must_use]
-pub fn parse_args() -> args::Args {
+pub fn parse_args() -> Args {
     Args::parse_args()
 }
 
 #[must_use]
-pub fn parse_args_raw() -> args::Args {
+pub fn parse_args_raw() -> Args {
     Args::parse_args_raw()
 }
 

crates/aoc/src/unwraperror.rs

@@ -0,0 +1,14 @@
+use std::error::Error;
+
+#[derive(Debug)]
+pub struct UnwrapError {}
+
+impl std::fmt::Display for UnwrapError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Unwrap error")
+    }
+}
+
+impl Error for UnwrapError {}
+
+pub const DAMN: UnwrapError = UnwrapError {};

src/lib.rs

@@ -1,6 +1,7 @@
-use std::iter::empty;
+pub mod rundb;
 
 use itertools::Itertools;
+use std::iter::empty;
 
 /// Get the array of all available solutions.
 #[must_use]
@@ -54,8 +55,6 @@ macro_rules! make_year {
                     .map_or((day, None), |(day, alt)| (day, Some(alt.to_string())));
                 let day = day.parse().unwrap();
 
-                // eprintln!("=> {year} {day} {alt:?}");
-
                 let solve = |data: &str| {
                     use crate::$year::$day::$day::solve;
                     let (part1, part2) = solve(data);