Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add private-leaderboard command #12

Merged
merged 1 commit into from
Dec 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ html2text = "0.4"
http = "0.2"
log = "0.4"
regex = "1.7"
reqwest = { version = "0.11", features = ["blocking"] }
reqwest = { version = "0.11", features = ["blocking", "json"] }
serde = { version = "1.0", features=["derive"] }
term_size = "0.3"
thiserror = "1.0"

Expand Down
103 changes: 103 additions & 0 deletions src/aoc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ use reqwest::header::{
USER_AGENT,
};
use reqwest::redirect::Policy;
use serde::Deserialize;
use std::cmp::Reverse;
use std::collections::HashMap;
use std::env;
use std::fs::{read_to_string, OpenOptions};
use std::io::Write;
Expand Down Expand Up @@ -317,3 +320,103 @@ pub fn read(
println!("\n{}", from_read(desc.as_bytes(), col_width));
Ok(())
}

fn get_private_leaderboard_results(
args: &Args,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need args here

session: &str,
leaderboard: &str,
year: PuzzleYear,
) -> AocResult<PrivateLeaderboard> {
debug!("🦌 Fetching private leaderboard {}", leaderboard);

let url = format!(
"https://adventofcode.com/{}/leaderboard/private/view/{}.json",
year, leaderboard
);

let leaderboard: PrivateLeaderboard =
build_client(session, "application/json")?
.get(&url)
.send()
.and_then(|response| response.error_for_status())
.and_then(|response| response.json())
.map_err(AocError::from)?;
Ok(leaderboard)
}

pub fn show_private_leaderboard_results(
args: &Args,
session: &str,
leaderboard: &str,
) -> AocResult<()> {
let (year, day) = puzzle_year_day(args.year, args.day)?;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think instead of calling puzzle_year_day we need a new function. Something that: 1) unwraps the year if given or returns the latest event year, e.g. let year = args.year.unwrap_or_else(latest_event_year); and 2) returns the last unlocked day for the selected year.

let leaderboard =
get_private_leaderboard_results(args, session, leaderboard, year)?;

let mut members: Vec<_> = leaderboard.members.values().collect();
members.sort_by_key(|m| Reverse(m.local_score));
members.iter().enumerate().for_each(|(idx, m)| {
let display_name = m
.name
.clone()
.unwrap_or(format!("anonymous user #{}", m.id));

let stars: String = (1..=25)
.map(|d| {
if d > day {
' '
} else {
let stars = m.stars_per_day(d);
match stars {
2 => '★',
1 => '☆',
_ => '.',
}
}
})
.collect();

let order = idx + 1;
println!("{}\t{}\t{}\t{}", order, m.local_score, stars, display_name);
});

Ok(())
}

#[derive(Deserialize)]
struct PrivateLeaderboard {
owner_id: usize,
event: String,
members: HashMap<String, Member>,
}

#[derive(Deserialize)]
struct Member {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could simplify this by implementing TryFrom<&Value> for Member so we only load the fields we need. We could even count the number of stars for each day then rather than when we're writing to the terminal. This would avoid all the fields xxx are never read clippy warnings.

name: Option<String>,
id: u64,
global_score: u64,
local_score: u64,
stars: u8,
completion_day_level: HashMap<u32, DayLevel>,
}

impl Member {
fn stars_per_day(&self, day: u32) -> u8 {
self.completion_day_level
.get(&day)
.map(|d| d.stars.len() as u8)
.unwrap_or(0)
}
}

#[derive(Deserialize)]
struct DayLevel {
#[serde(flatten)]
stars: HashMap<String, Star>,
}

#[derive(Deserialize)]
struct Star {
get_star_ts: u64,
star_index: u64,
}
4 changes: 4 additions & 0 deletions src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ pub enum Command {
/// Puzzle answer
answer: String,
},

/// Get private leaderboard results
#[command(visible_alias = "pr")]
PrivateLeaderboard { leaderboard: String },
}

fn convert_number<T: FromStr>(s: &str) -> Result<T, String>
Expand Down
3 changes: 3 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ fn run(args: &Args) -> AocResult<()> {
Some(Command::Submit { part, answer }) => {
submit(args, &session, width, part, answer)
}
Some(Command::PrivateLeaderboard { leaderboard }) => {
show_private_leaderboard_results(args, &session, leaderboard)
}
_ => read(args, &session, width),
}
}