]> git.scottworley.com Git - voter/blobdiff - src/main.rs
Checkboxes
[voter] / src / main.rs
index 994ffac9b049ab2c6a8d0795ea067a47e5e9e663..506c13bb3cbca05ecdbc40cc587f911e720b6f08 100644 (file)
@@ -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::<Vec<_>>()
-        .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<cgi::Response, cgi::Response> {
@@ -73,19 +75,31 @@ fn set_cookie(mut response: cgi::Response, path: &str) -> Result<cgi::Response,
     Ok(response)
 }
 
+const HTML_HEADER: &str = "
+<html>
+  <head>
+    <style>
+      input { transform: scale(1.5); }
+    </style>
+  </head>
+  <body>
+    <table>";
+const HTML_FOOTER: &str = "
+    </table>
+  </body>
+</html>";
+
 fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result<cgi::Response, cgi::Response> {
     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("<html><body><table>".to_owned()))
-            .chain(
-                std::io::BufReader::new(cfile)
-                    .lines()
-                    .map(|rc| rc.map(|c| format!("<tr><td>{c}</td></tr>"))),
-            )
-            .chain(std::iter::once(Ok("</table></body></html>".to_owned())))
+        std::iter::once(Ok(HTML_HEADER.to_owned()))
+            .chain(std::io::BufReader::new(cfile).lines().map(|rc| {
+                rc.map(|c| format!("<tr><td><input type=\"checkbox\"></td><td>{c}</td></tr>"))
+            }))
+            .chain(std::iter::once(Ok(HTML_FOOTER.to_owned())))
             .collect::<std::io::Result<String>>()
             .map_err(|_| cgi::text_response(503, "Missing candidates"))?,
     );