mirror of
https://framagit.org/veretcle/scootaloo.git
synced 2025-07-21 17:34:37 +02:00
refactor: migrate from clap v2 to clap v4
This commit is contained in:
VC
94
src/main.rs
94
src/main.rs
@@ -1,5 +1,5 @@
|
||||
use clap::{App, Arg, SubCommand};
|
||||
use log::{error, LevelFilter};
|
||||
use clap::{Arg, Command};
|
||||
use log::LevelFilter;
|
||||
use scootaloo::*;
|
||||
use simple_logger::SimpleLogger;
|
||||
use std::str::FromStr;
|
||||
@@ -7,115 +7,121 @@ use std::str::FromStr;
|
||||
const DEFAULT_CONFIG_PATH: &str = "/usr/local/etc/scootaloo.toml";
|
||||
|
||||
fn main() {
|
||||
let matches = App::new(env!("CARGO_PKG_NAME"))
|
||||
let matches = Command::new(env!("CARGO_PKG_NAME"))
|
||||
.version(env!("CARGO_PKG_VERSION"))
|
||||
.about("A Twitter to Mastodon bot")
|
||||
.arg(
|
||||
Arg::with_name("config")
|
||||
.short("c")
|
||||
Arg::new("config")
|
||||
.short('c')
|
||||
.long("config")
|
||||
.value_name("CONFIG_FILE")
|
||||
.help(&format!(
|
||||
"TOML config file for scootaloo (default {})",
|
||||
DEFAULT_CONFIG_PATH
|
||||
))
|
||||
.takes_value(true)
|
||||
.num_args(1)
|
||||
.default_value(DEFAULT_CONFIG_PATH)
|
||||
.display_order(1),
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("log_level")
|
||||
.short("l")
|
||||
Arg::new("log_level")
|
||||
.short('l')
|
||||
.long("loglevel")
|
||||
.value_name("LOGLEVEL")
|
||||
.help("Log level. Valid values are: Off, Warn, Error, Info, Debug")
|
||||
.takes_value(true)
|
||||
.num_args(1)
|
||||
.value_parser(["Off", "Warn", "Error", "Info", "Debug"])
|
||||
.display_order(2),
|
||||
)
|
||||
.subcommand(
|
||||
SubCommand::with_name("register")
|
||||
Command::new("register")
|
||||
.version(env!("CARGO_PKG_VERSION"))
|
||||
.about("Command to register to a Mastodon Instance")
|
||||
.arg(
|
||||
Arg::with_name("host")
|
||||
.short("H")
|
||||
Arg::new("host")
|
||||
.short('H')
|
||||
.long("host")
|
||||
.value_name("HOST")
|
||||
.help("Base URL of the Mastodon instance to register to (no default)")
|
||||
.takes_value(true)
|
||||
.num_args(1)
|
||||
.required(true)
|
||||
.display_order(1)
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("name")
|
||||
.short("n")
|
||||
Arg::new("name")
|
||||
.short('n')
|
||||
.long("name")
|
||||
.help("Twitter Screen Name (like https://twitter.com/screen_name, no default)")
|
||||
.takes_value(true)
|
||||
.num_args(1)
|
||||
.required(true)
|
||||
.display_order(2)
|
||||
),
|
||||
)
|
||||
.subcommand(
|
||||
SubCommand::with_name("init")
|
||||
Command::new("init")
|
||||
.version(env!("CARGO_PKG_VERSION"))
|
||||
.about("Command to init Scootaloo DB")
|
||||
.arg(
|
||||
Arg::with_name("config")
|
||||
.short("c")
|
||||
Arg::new("config")
|
||||
.short('c')
|
||||
.long("config")
|
||||
.value_name("CONFIG_FILE")
|
||||
.help(&format!(
|
||||
"TOML config file for scootaloo (default {})",
|
||||
DEFAULT_CONFIG_PATH
|
||||
))
|
||||
.takes_value(true)
|
||||
.default_value(DEFAULT_CONFIG_PATH)
|
||||
.num_args(1)
|
||||
.display_order(1),
|
||||
),
|
||||
)
|
||||
.subcommand(
|
||||
SubCommand::with_name("migrate")
|
||||
Command::new("migrate")
|
||||
.version(env!("CARGO_PKG_VERSION"))
|
||||
.about("Command to migrate Scootaloo DB")
|
||||
.arg(
|
||||
Arg::with_name("config")
|
||||
.short("c")
|
||||
Arg::new("config")
|
||||
.short('c')
|
||||
.long("config")
|
||||
.value_name("CONFIG_FILE")
|
||||
.help(&format!("TOML config file for scootaloo (default {})", DEFAULT_CONFIG_PATH))
|
||||
.takes_value(true)
|
||||
.default_value(DEFAULT_CONFIG_PATH)
|
||||
.num_args(1)
|
||||
.display_order(1),
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("name")
|
||||
.short("n")
|
||||
Arg::new("name")
|
||||
.short('n')
|
||||
.long("name")
|
||||
.help("Twitter Screen Name (like https://twitter.com/screen_name, no default)")
|
||||
.takes_value(true)
|
||||
.num_args(1)
|
||||
.display_order(2)
|
||||
)
|
||||
)
|
||||
.get_matches();
|
||||
|
||||
match matches.subcommand() {
|
||||
("register", Some(sub_m)) => {
|
||||
Some(("register", sub_m)) => {
|
||||
register(
|
||||
sub_m.value_of("host").unwrap(),
|
||||
sub_m.value_of("name").unwrap(),
|
||||
sub_m.get_one::<String>("host").unwrap(),
|
||||
sub_m.get_one::<String>("name").unwrap(),
|
||||
);
|
||||
return;
|
||||
}
|
||||
("init", Some(sub_m)) => {
|
||||
let config = parse_toml(sub_m.value_of("config").unwrap_or(DEFAULT_CONFIG_PATH));
|
||||
Some(("init", sub_m)) => {
|
||||
let config = parse_toml(sub_m.get_one::<String>("config").unwrap());
|
||||
init_db(&config.scootaloo.db_path).unwrap();
|
||||
return;
|
||||
}
|
||||
("migrate", Some(sub_m)) => {
|
||||
let config = parse_toml(sub_m.value_of("config").unwrap_or(DEFAULT_CONFIG_PATH));
|
||||
Some(("migrate", sub_m)) => {
|
||||
let config = parse_toml(sub_m.get_one::<String>("config").unwrap());
|
||||
let config_twitter_screen_name =
|
||||
&config.mastodon.values().next().unwrap().twitter_screen_name;
|
||||
migrate_db(
|
||||
&config.scootaloo.db_path,
|
||||
sub_m.value_of("name").unwrap_or(config_twitter_screen_name),
|
||||
sub_m
|
||||
.get_one::<String>("name")
|
||||
.unwrap_or(config_twitter_screen_name),
|
||||
)
|
||||
.unwrap();
|
||||
return;
|
||||
@@ -123,20 +129,14 @@ fn main() {
|
||||
_ => (),
|
||||
}
|
||||
|
||||
if matches.is_present("log_level") {
|
||||
match LevelFilter::from_str(matches.value_of("log_level").unwrap()) {
|
||||
Ok(level) => SimpleLogger::new().with_level(level).init().unwrap(),
|
||||
Err(e) => {
|
||||
SimpleLogger::new()
|
||||
.with_level(LevelFilter::Error)
|
||||
.init()
|
||||
.unwrap();
|
||||
error!("Unknown log level filter: {}", e);
|
||||
}
|
||||
};
|
||||
if let Some(level) = matches.get_one::<String>("log_level") {
|
||||
SimpleLogger::new()
|
||||
.with_level(LevelFilter::from_str(level).unwrap())
|
||||
.init()
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
let config = parse_toml(matches.value_of("config").unwrap_or(DEFAULT_CONFIG_PATH));
|
||||
let config = parse_toml(matches.get_one::<String>("config").unwrap());
|
||||
|
||||
run(config);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user