Update for Nix module
This commit is contained in:
parent
677a97d5cc
commit
b374c6ed66
8 changed files with 262 additions and 39 deletions
25
src/utils.rs
25
src/utils.rs
|
@ -1,6 +1,7 @@
|
|||
use crate::serenity;
|
||||
use crate::Context;
|
||||
use crate::Error;
|
||||
use crate::ARGS;
|
||||
use rand::seq::IteratorRandom;
|
||||
use serde_json::Map;
|
||||
use serde_json::Value;
|
||||
|
@ -52,7 +53,7 @@ mod tests {
|
|||
}
|
||||
|
||||
pub fn get_challenge_number() -> i32 {
|
||||
let challenge_dir = format!("{}/content/challenges", env::var("HUGO").unwrap());
|
||||
let challenge_dir = format!("{}/content/challenges", ARGS.hugo);
|
||||
let paths = fs::read_dir(challenge_dir).unwrap();
|
||||
let mut max = 0;
|
||||
for path in paths {
|
||||
|
@ -72,20 +73,12 @@ pub fn get_challenge_number() -> i32 {
|
|||
max
|
||||
}
|
||||
|
||||
pub fn get_domain() -> String {
|
||||
env::var("DOMAIN").unwrap()
|
||||
}
|
||||
|
||||
pub fn get_hugo_path() -> String {
|
||||
env::var("HUGO").unwrap()
|
||||
}
|
||||
|
||||
pub fn get_submission_images_dir() -> String {
|
||||
format!("{}/assets/{}", get_hugo_path(), get_challenge_number())
|
||||
format!("{}/assets/{}", ARGS.hugo, get_challenge_number())
|
||||
}
|
||||
|
||||
pub fn get_submission_data_path(challenge: i32) -> String {
|
||||
format!("{}/data/challenges/{}.json", get_hugo_path(), challenge)
|
||||
format!("{}/data/challenges/{}.json", ARGS.hugo, challenge)
|
||||
}
|
||||
|
||||
pub fn get_current_submission_data_path() -> String {
|
||||
|
@ -153,17 +146,13 @@ pub fn to_fullwidth(string: &str) -> String {
|
|||
|
||||
pub fn rebuild_site() {
|
||||
Command::new("./build.sh")
|
||||
.current_dir(get_hugo_path())
|
||||
.current_dir(&ARGS.hugo)
|
||||
.status()
|
||||
.expect("Failed to rebuild site");
|
||||
}
|
||||
|
||||
pub fn get_guild_data_path() -> String {
|
||||
env::var("GUILD_DATA").unwrap()
|
||||
}
|
||||
|
||||
pub fn get_guild_data() -> Map<String, Value> {
|
||||
let guild_data_path = get_guild_data_path();
|
||||
let guild_data_path = &ARGS.guild_data;
|
||||
let guild_data_json = match File::open(&guild_data_path) {
|
||||
Ok(mut file) => {
|
||||
let mut json = String::new();
|
||||
|
@ -187,7 +176,7 @@ pub fn set_guild_data(guild_data: Map<String, Value>) {
|
|||
let mut guild_data_file = OpenOptions::new()
|
||||
.write(true)
|
||||
.truncate(true)
|
||||
.open(get_guild_data_path())
|
||||
.open(&ARGS.guild_data)
|
||||
.unwrap();
|
||||
guild_data_file
|
||||
.write_all(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue