X-Git-Url: http://git.scottworley.com/voter/blobdiff_plain/ae9be1b6ecd0c0823129bf6bb41149bd9404e902..5a0934fa0c470a490122ae68fc22a15b1df603fb:/src/main.rs diff --git a/src/main.rs b/src/main.rs index 9d8daa5..a810597 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 { @@ -75,7 +77,20 @@ fn set_cookie(mut response: cgi::Response, path: &str) -> Result Result { let voter = get_voter(&request); - let mut response = cgi::html_response(200, "You should vote"); + 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()))) + .collect::>() + .map_err(|_| cgi::text_response(503, "Missing candidates"))?, + ); if voter.is_err() { response = set_cookie(response, request.uri().path())? }