From 6ae55e44045e0903cf64dc83673ee424bb54eb04 Mon Sep 17 00:00:00 2001 From: Simon Naumov Date: Fri, 22 Dec 2023 09:42:50 +0600 Subject: [PATCH 1/2] fix: calendar multiline task star output --- aoc-client/src/lib.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/aoc-client/src/lib.rs b/aoc-client/src/lib.rs index 87384c2..d4b1201 100644 --- a/aoc-client/src/lib.rs +++ b/aoc-client/src/lib.rs @@ -384,28 +384,28 @@ impl AocClient { )) .unwrap(); - let all_stars = main.contains("calendar calendar-perfect"); - // Remove stars that have not been collected + let mut star_state = ""; + let calendar = cleaned_up .lines() .map(|line| { let class = class_regex .captures(line) .and_then(|c| c.name("class")) - .map(|c| c.as_str()) - .unwrap_or(""); + .map(|c| c.as_str()); - let stars = - if class.contains("calendar-verycomplete") || all_stars { + if let Some(class) = class { + star_state = if class.contains("calendar-verycomplete") { "**" } else if class.contains("calendar-complete") { "*" } else { "" }; + } - star_regex.replace(line, stars) + star_regex.replace(line, star_state) }) .collect::>() .join("\n"); From 2e56e575768283c7ab016cbced7dc6a9af78fca0 Mon Sep 17 00:00:00 2001 From: Simon Naumov Date: Fri, 22 Dec 2023 09:43:29 +0600 Subject: [PATCH 2/2] fix: calendar year 2023 animations --- aoc-client/src/lib.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/aoc-client/src/lib.rs b/aoc-client/src/lib.rs index d4b1201..21434d4 100644 --- a/aoc-client/src/lib.rs +++ b/aoc-client/src/lib.rs @@ -368,9 +368,10 @@ impl AocClient { // Remove 2019 shadows r#"|(]*>\.)"#, - // Remove 2019 "sunbeam" - r#"|(]*>"#, - r#"]*>"#, + r#"(]*style="[^>]*animation-delay[^>]*>[^>]*)+"#, + r#")"#, )) .unwrap() .replace_all(&main, "")