X-Git-Url: http://git.scottworley.com/voter/blobdiff_plain/381eeda53fb8a9a574b96ce5cc91b28c5a99b105..3a28e7710ce3acd2817d40b65bcc313171adf41e:/src/main.rs diff --git a/src/main.rs b/src/main.rs index 994ffac..4c09c10 100644 --- a/src/main.rs +++ b/src/main.rs @@ -45,14 +45,16 @@ fn get_voter(request: &cgi::Request) -> Result<&[u8], cgi::Response> { } fn make_random_id() -> [u8; COOKIE_LENGTH] { - std::iter::from_fn(random) - .filter(|c| { - (b'A'..=b'Z').contains(c) || (b'a'..=b'z').contains(c) || (b'0'..=b'9').contains(c) - }) - .take(COOKIE_LENGTH) - .collect::>() - .try_into() - .unwrap() + let mut id = [0; COOKIE_LENGTH]; + for i in 0..COOKIE_LENGTH { + while !(b'A'..=b'Z').contains(&id[i]) + && !(b'a'..=b'z').contains(&id[i]) + && !(b'0'..=b'9').contains(&id[i]) + { + id[i] = random() + } + } + id } fn set_cookie(mut response: cgi::Response, path: &str) -> Result { @@ -73,19 +75,33 @@ fn set_cookie(mut response: cgi::Response, path: &str) -> Result + Vote! + + + + "; +const HTML_FOOTER: &str = " +
+ +"; + fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result { let voter = get_voter(&request); let cfile = std::fs::File::open(dir.join("candidates")) .map_err(|_| cgi::text_response(503, "No candidates"))?; let mut response = cgi::html_response( 200, - std::iter::once(Ok("".to_owned())) - .chain( - std::io::BufReader::new(cfile) - .lines() - .map(|rc| rc.map(|c| format!(""))), - ) - .chain(std::iter::once(Ok("
{c}
".to_owned()))) + std::iter::once(Ok(HTML_HEADER.to_owned())) + .chain(std::io::BufReader::new(cfile).lines().map(|rc| { + rc.map(|c| format!("{c}")) + })) + .chain(std::iter::once(Ok(HTML_FOOTER.to_owned()))) .collect::>() .map_err(|_| cgi::text_response(503, "Missing candidates"))?, );