From: Scott Worley Date: Sat, 19 Nov 2022 10:53:52 +0000 (-0800) Subject: Preserve visibility of users' votes across page refresh X-Git-Tag: v0.2.0~5 X-Git-Url: http://git.scottworley.com/voter/commitdiff_plain/75cfd491c8e5e8883b492008f98c0eb37cdbf64d?hp=7717ed89ce2c276f1e2adc15bd859d6167deda98 Preserve visibility of users' votes across page refresh --- diff --git a/src/main.rs b/src/main.rs index 98cfc35..61875d6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,5 @@ use rand::prelude::*; +use std::collections::{HashMap, HashSet}; use std::io::prelude::*; use std::path::{Path, PathBuf}; @@ -44,6 +45,31 @@ fn get_voter(request: &cgi::Request) -> Result<&[u8], cgi::Response> { } } +fn tally_votes(dir: PathBuf) -> std::io::Result>> { + let mut tally: HashMap> = HashMap::new(); + let vfile = std::fs::File::open(dir.join("votes"))?; + for liner in std::io::BufReader::new(vfile).lines() { + let line = liner?; + if let Some((voter, datum)) = line.split_once(' ') { + if voter.len() == COOKIE_LENGTH { + if let Some((vote, candidate)) = datum.split_once(' ') { + if vote == "0" { + if let Some(entry) = tally.get_mut(candidate) { + entry.remove(voter); + } + } else if vote == "1" { + tally + .entry(candidate.to_owned()) + .or_default() + .insert(voter.to_owned()); + } + } + } + } + } + Ok(tally) +} + fn make_random_id() -> [u8; COOKIE_LENGTH] { let mut id = [0; COOKIE_LENGTH]; for i in 0..COOKIE_LENGTH { @@ -108,7 +134,7 @@ const HTML_HEADER: &str = " } }) req.open('PUT', window.location.href) - req.send((cb.checked ? 1 : 0) + ' ' + cb.parentElement.nextSibling.innerHTML) + req.send((cb.checked ? 1 : 0) + ' ' + cb.parentElement.nextElementSibling.innerHTML) } })(cb)) cb.disabled = false @@ -123,8 +149,22 @@ const HTML_FOOTER: &str = " "; +fn supports(tally: &HashMap>, me: &str, candidate: &str) -> bool { + tally + .get(candidate) + .map(|supporters| supporters.contains(me)) + .unwrap_or(false) +} + fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result { let voter = get_voter(&request); + let me = if let Ok(id) = voter { + std::str::from_utf8(id).ok() + } else { + None + }; + let tally = + tally_votes(dir.clone()).map_err(|_| cgi::text_response(503, "Couldn't tally votes"))?; let cfile = std::fs::File::open(dir.join("candidates")) .map_err(|_| cgi::text_response(503, "No candidates"))?; let mut response = cgi::html_response( @@ -132,7 +172,17 @@ fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result{c}") + let checked = if me.map(|me| supports(&tally, me, &c)).unwrap_or(false) { + "checked" + } else { + "" + }; + format!( + " + + {c} + " + ) }) })) .chain(std::iter::once(Ok(HTML_FOOTER.to_owned())))