input.rs: save token in config directory (fix #2)

Author: remi-dupre

Cargo.lock

@@ -14,3 +14,4 @@ attohttpc = { version = "0.16.0", default_features = false, features = ["tls"] }
 clap = "3.0.0-beta.2"
 colored = "2.0.0"
 criterion = "0.3.3"
+dirs = "3.0.1"

Cargo.toml

@@ -77,6 +77,9 @@ following procedure (quoted from [cargo-aoc][2]):
   - Google Chrome / Chromium: "Application" tab, Cookies, and copy the "Value"
     field of the session cookie.
 
+If you wish to change or forget your connection token, you will have to remove
+`aoc` in your config directory (eg. `$HOME/.config/aoc` for linux users).
+
 
 [1]: https://adventofcode.com
 [2]: https://github.com/gobanos/cargo-aoc

README.md

@@ -4,14 +4,25 @@ use std::error::Error;
 use std::fs::{create_dir_all, read_to_string, File};
 use std::io::Write;
 use std::io::{stdin, stdout};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::time::Instant;
 
 use crate::utils::Line;
 
 const BASE_URL: &str = "https://adventofcode.com";
-const INPUT_DIR: &str = "input";
-const CONN_TOKEN_FILE: &str = ".token";
+
+fn input_path(year: u16, day: u8) -> PathBuf {
+    format!("input/{}/day{}.txt", year, day).into()
+}
+
+fn token_path() -> PathBuf {
+    dirs::config_dir()
+        .map(|mut cfg| {
+            cfg.push("aoc/token.txt");
+            cfg
+        })
+        .unwrap_or_else(|| ".token".into())
+}
 
 pub fn get_input(year: u16, day: u8) -> Result<String, Box<dyn Error>> {
     let mut result = get_from_path_or_else(&input_path(year, day), || {
@@ -38,12 +49,20 @@ pub fn get_input(year: u16, day: u8) -> Result<String, Box<dyn Error>> {
     Ok(result)
 }
 
-fn input_path(year: u16, day: u8) -> String {
-    format!("{}/{}/day{}.txt", INPUT_DIR, year, day)
+fn get_conn_token() -> Result<String, std::io::Error> {
+    get_from_path_or_else(&token_path(), || {
+        let mut stdout = stdout();
+        write!(&mut stdout, "Write your connection token: ")?;
+        stdout.flush()?;
+
+        let mut output = String::new();
+        stdin().read_line(&mut output)?;
+        Ok(output.trim().to_string())
+    })
 }
 
 fn get_from_path_or_else<E: Error>(
-    path: &str,
+    path: &Path,
     fallback: impl FnOnce() -> Result<String, E>,
 ) -> Result<String, E> {
     let from_path = read_to_string(path);
@@ -52,25 +71,10 @@ fn get_from_path_or_else<E: Error>(
         Ok(res.trim().to_string())
     } else {
         let res = fallback()?;
-        create_dir_all(PathBuf::from(path).parent().expect("no parent directory"))
+        create_dir_all(path.parent().expect("no parent directory"))
             .and_then(|_| File::create(path))
             .and_then(|mut file| file.write_all(res.as_bytes()))
-            .unwrap_or_else(|err| eprintln!("could not write {}: {}", path, err));
+            .unwrap_or_else(|err| eprintln!("could not write {}: {}", path.display(), err));
         Ok(res)
     }
 }
-
-fn get_conn_token() -> Result<String, std::io::Error> {
-    get_from_path_or_else(CONN_TOKEN_FILE, || {
-        let mut stdout = stdout();
-        write!(&mut stdout, "Write your connection token: ")?;
-        stdout.flush()?;
-
-        let mut output = String::new();
-        stdin().read_line(&mut output)?;
-
-        let mut file = File::create(CONN_TOKEN_FILE)?;
-        file.write_all(output.as_bytes())?;
-        Ok(output.trim().to_string())
-    })
-}