Use toml config file instead of arguments

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2023-05-27 17:20:58 +02:00
commit 135a2c1611
3 changed files with 104 additions and 15 deletions

View file

@ -14,18 +14,23 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
#![feature(let_chains)]
#![feature(never_type)]
mod error;
mod web;
mod webhook;
mod xmpp;
use crate::error::Error;
use crate::web::webhooks;
use crate::webhook::WebHook;
use crate::xmpp::XmppClient;
use std::convert::Infallible;
use std::net::SocketAddr;
use std::fs::File;
use std::io::{Error as IoError, ErrorKind as IoErrorKind, Read};
use std::net::{IpAddr, Ipv6Addr, SocketAddr};
use std::path::{Path, PathBuf};
use std::sync::{Arc, Mutex};
use clap::Parser;
@ -33,45 +38,100 @@ use hyper::{
service::{make_service_fn, service_fn},
Server,
};
use serde::{Deserialize, Serialize};
use tokio::sync::mpsc;
use xmpp_parsers::BareJid;
#[derive(Parser, Debug)]
#[command(author, version, about, long_about = None)]
struct Args {
/// Account address
/// Config file path
#[arg(short, long)]
config: Option<PathBuf>,
}
#[derive(Debug, Serialize, Deserialize)]
struct Config {
/// Account address
jid: BareJid,
/// Account password
#[arg(short, long)]
password: String,
/// Rooms to join, e.g., room@chat.example.org
#[arg(short, long = "room", value_name = "ROOM")]
#[serde(default = "Vec::new")]
rooms: Vec<BareJid>,
/// Nickname to use in rooms
#[arg(short, long, default_value = "bot")]
#[serde(default = "default_nickname")]
nickname: String,
/// Token to match the one provided by the Webhook service
#[arg(short, long)]
#[serde(rename = "webhook-token")]
webhook_token: Option<String>,
/// HTTP Webhook listening address and port, e.g., 127.0.0.1:1234 or [::1]:1234
#[arg(long, default_value = "[::1]:3000")]
#[serde(default = "default_addr")]
addr: SocketAddr,
}
fn default_nickname() -> String {
String::from("cusku")
}
fn default_addr() -> SocketAddr {
SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)), 3000)
}
fn config_from_file(file: PathBuf) -> Result<Config, Error> {
if file.try_exists().is_err() {
let err = IoError::new(IoErrorKind::NotFound, format!("{:?} not found", file));
return Err(Error::Io(err));
}
let mut buf = String::new();
let mut f = File::open(file)?;
f.read_to_string(&mut buf)?;
Ok(toml::from_str(&buf)?)
}
#[tokio::main]
async fn main() {
async fn main() -> Result<!, Error> {
pretty_env_logger::init();
let args = Args::parse();
let config = {
let path = match args.config {
Some(path) => {
if !path.starts_with("/") {
std::env::current_dir()?.join(path)
} else {
path
}
}
None => {
let confdir: PathBuf = match std::env::var("XDG_CONFIG_HOME") {
Ok(ref dir) => Path::new(dir).to_path_buf(),
Err(_) => {
let home = std::env::var("HOME")?;
Path::new(home.as_str()).join(".config")
}
};
confdir.join("cusku/config.toml")
}
};
match config_from_file(path) {
Ok(config) => config,
Err(err) => return Err(err),
}
};
let (value_tx, mut value_rx) = mpsc::unbounded_channel::<WebHook>();
if let Some(token) = args.webhook_token {
if let Some(token) = config.webhook_token {
let value_tx = Arc::new(Mutex::new(value_tx));
let make_svc = make_service_fn(move |_conn| {
let value_tx = value_tx.clone();
@ -84,17 +144,17 @@ async fn main() {
}))
}
});
let server = Server::bind(&args.addr).serve(make_svc);
println!("Listening on http://{}", &args.addr);
let server = Server::bind(&config.addr).serve(make_svc);
println!("Listening on http://{}", &config.addr);
let _join = tokio::spawn(server);
}
let mut client = XmppClient::new(
&String::from(args.jid),
args.password.as_str(),
args.rooms,
args.nickname,
&String::from(config.jid),
config.password.as_str(),
config.rooms,
config.nickname,
);
loop {