From f977c98bed7e744d83d538becd4499467480df67 Mon Sep 17 00:00:00 2001 From: gennyble Date: Wed, 18 Dec 2024 06:33:05 -0600 Subject: Meow 2024-12-18 06:32 CST --- src/main.rs | 18 +++++------------- src/timeparse.rs | 13 +++++++++++-- 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/main.rs b/src/main.rs index 0ddbb51..fa1ac5c 100755 --- a/src/main.rs +++ b/src/main.rs @@ -132,17 +132,9 @@ async fn falible_handler( let content = Filesystem::read_to_string(&resolve.filepath).await?; let result = Templated::from_str(&content); - tracing::trace!("full return from Templated::from_str"); match result { - Ok(templated) => { - //tracing::trace!("sending template for {resolve}"); - - std::io::stdout().write_all(b"meow meow meow!!").unwrap(); - std::io::stdout().flush().unwrap(); - - send_template(templated, resolve, webpath, settings).await - } + Ok(templated) => send_template(templated, resolve, webpath, settings, sid).await, Err(e) => { tracing::warn!("error sending template {e}"); @@ -212,8 +204,9 @@ async fn send_template( resolve: PathResolution, webpath: Webpath, settings: Settings, + sid: SessionId, ) -> Result { - tracing::trace!("sending template"); + tracing::trace!("[{sid}] sending template"); let template_stem = templated.frontmatter.get("template").expect("no template"); let template_name = Utf8PathBuf::from(format!("{template_stem}.html")); let template_path = settings.template_dir.join(template_name); @@ -247,7 +240,7 @@ async fn send_template( let og_image_alt = match templated.frontmatter.get("art_alt") { Some(alt) => alt, None => { - tracing::warn!("{} has art but no alt", resolve.filepath); + tracing::warn!("[{sid}] {} has art but no alt", resolve.filepath); "" } }; @@ -271,7 +264,6 @@ async fn send_template( template.set_pattern(pat); } - tracing::trace!("poppin'!"); // path to the file for navigation let mut path: Vec<&str> = webpath.webcanon.iter().collect(); // we don't want the directory/filename itself @@ -287,7 +279,7 @@ async fn send_template( None => 0, Some(Err(_)) => { tracing::error!( - "path-offset in template {} is not an integer", + "[{sid}] path-offset in template {} is not an integer", resolve.filepath ); diff --git a/src/timeparse.rs b/src/timeparse.rs index 5df731e..4d5f63f 100755 --- a/src/timeparse.rs +++ b/src/timeparse.rs @@ -119,9 +119,18 @@ pub fn parse(raw: &str) -> Result { Some(raw) => parse_time(raw)?, }; + let calculated_offset = us_dst_central_offset(PrimitiveDateTime::new(date, time)); let offset = match splits.next() { - None => us_dst_central_offset(PrimitiveDateTime::new(date, time)), - Some(raw) => parse_offset(raw), + None => calculated_offset, + Some(raw) => { + let offset = parse_offset(raw); + if offset != calculated_offset { + //FIXME: gen 2024-12; warn here but format it rightly. + () + } + + offset + } }; Ok(OffsetDateTime::new_in_offset(date, time, offset)) -- cgit 1.4.1-3-g733a5