Adds a parser dependency and refactors the main loop #2

Merged
Dandaedre merged 1 commits from dan into dev 2024-10-31 11:48:36 +01:00
6 changed files with 82 additions and 52 deletions

View File

@ -16,6 +16,7 @@ tracing = { version = "0.1.40", features = ["async-await", "std"] }
uuid = { version = "1.11.0", features = ["v4", "v7", "serde", "fast-rng"] }
simplelog = { version = "0.12.2", features = ["paris"] }
log = { version = "0.4.22", features = ["std"] }
nom = "7.1.3"
[profile.dev]
debug = 0

View File

@ -10,8 +10,31 @@
//! Recover from importing faulty data
//!
use std::fs::File;
use log::LevelFilter;
use serde::{Deserialize, Serialize};
use simplelog::{ColorChoice, CombinedLogger, Config, TermLogger, TerminalMode, WriteLogger};
/// The global config
#[derive(Serialize, Deserialize)]
pub(crate) struct GlobalConfig {}
/// Init the logging
pub fn init_logger() {
CombinedLogger::init(vec![
TermLogger::new(
LevelFilter::Warn,
Config::default(),
TerminalMode::Mixed,
ColorChoice::Auto,
),
WriteLogger::new(
LevelFilter::Info,
Config::default(),
// TODO: Maybe add la date du jour de lancement ?
File::create("idlefox.log").unwrap(),
),
])
.unwrap();
}

23
src/date_parse.rs Normal file
View File

@ -0,0 +1,23 @@
//! Parse a date string sequence into structs
//!
//! The pseudo grammar is defined as:
//! date = (day) (month) | (month) (day)
//! daterange = (date) - (date)
//! dateobject = (date) | (daterange)
//! datelist = (dateobject) (, (dateobject))*
//!
// use std::error::Error;
// use nom::IResult;
// pub fn do_nothing_parser(input: &str) -> IResult<&str, &str> {
// Ok((input, ""))
// }
// fn main() -> Result<(), Box<dyn Error>> {
// let (remaining_input, output) = do_nothing_parser("my_input")?;
// assert_eq!(remaining_input, "my_input");
// assert_eq!(output, "");
// Ok(())
// }

View File

@ -6,3 +6,8 @@
//! Removing ID as needed
// use human_ids::generate;
// use std::{env, time::Instant};
// let tk = env::var("DISCORD_TOKEN");
// let id = generate(None);
// println!("Token: {:?} Id: {}", tk, id);

View File

@ -145,6 +145,31 @@ pub async fn component_modal(ctx: Context<'_>) -> Result<(), GenericError> {
Ok(())
}
/// The main discord interaction loop
///
/// Registers all functions and starts a bot client
pub async fn discord_main_loop() {
let token = std::env::var("DISCORD_TOKEN").expect("missing DISCORD_TOKEN");
let intents = serenity::GatewayIntents::non_privileged();
let framework = poise::Framework::builder()
.options(poise::FrameworkOptions {
commands: vec![vote_command(), vote_modal(), component_modal()],
..Default::default()
})
.setup(|ctx, _ready, framework| {
Box::pin(async move {
poise::builtins::register_globally(ctx, &framework.options().commands).await?;
Ok(Data {})
})
})
.build();
let client = serenity::ClientBuilder::new(token, intents)
.framework(framework)
.await;
client.unwrap().start().await.unwrap();
}
#[cfg(test)]
mod tests {
// use super::*;

View File

@ -5,14 +5,12 @@
// This line is here to force the use of extensive documentation
#![warn(clippy::missing_docs_in_private_items)]
use io::{component_modal, vote_command, vote_modal, Data};
use log::LevelFilter;
use simplelog::{
debug, error, info, ColorChoice, CombinedLogger, Config, TermLogger, TerminalMode, WriteLogger,
};
use config::init_logger;
use io::discord_main_loop;
mod config;
mod date;
mod date_parse;
mod error_handling;
mod ids;
mod io;
@ -22,55 +20,10 @@ mod server;
mod votes;
mod watchdog;
use poise::serenity_prelude as serenity;
use std::fs::File;
#[cfg(not(tarpaulin_include))]
#[tokio::main]
async fn main() {
CombinedLogger::init(vec![
TermLogger::new(
LevelFilter::Warn,
Config::default(),
TerminalMode::Mixed,
ColorChoice::Auto,
),
WriteLogger::new(
LevelFilter::Info,
Config::default(),
// TODO: Maybe add la date du jour de lancement ?
File::create("idlefox.log").unwrap(),
),
])
.unwrap();
init_logger();
error!("Bright red error");
info!("This only appears in the log file");
debug!("This level is currently not enabled for any logger");
// use human_ids::generate;
// use std::{env, time::Instant};
// let tk = env::var("DISCORD_TOKEN");
// let id = generate(None);
// println!("Token: {:?} Id: {}", tk, id);
let token = std::env::var("DISCORD_TOKEN").expect("missing DISCORD_TOKEN");
let intents = serenity::GatewayIntents::non_privileged();
let framework = poise::Framework::builder()
.options(poise::FrameworkOptions {
commands: vec![vote_command(), vote_modal(), component_modal()],
..Default::default()
})
.setup(|ctx, _ready, framework| {
Box::pin(async move {
poise::builtins::register_globally(ctx, &framework.options().commands).await?;
Ok(Data {})
})
})
.build();
let client = serenity::ClientBuilder::new(token, intents)
.framework(framework)
.await;
client.unwrap().start().await.unwrap();
discord_main_loop().await;
}