♻️ refactor: rename Config to Rules
- rename Config struct to Rules to better reflect its purpose - update all references to Config to Rules
This commit is contained in:
committed by
Jeremiah Russell
parent
0300653299
commit
0bc71f5b75
@@ -4,7 +4,7 @@ mod labels_cli;
|
||||
mod messages_cli;
|
||||
mod rules_cli;
|
||||
|
||||
use cull_gmail::{Config, GmailClient, Result};
|
||||
use cull_gmail::{GmailClient, Result, Rules};
|
||||
use std::error::Error as stdError;
|
||||
|
||||
use labels_cli::LabelsCli;
|
||||
@@ -86,14 +86,14 @@ fn get_logging(level: log::LevelFilter) -> env_logger::Builder {
|
||||
builder
|
||||
}
|
||||
|
||||
fn get_config() -> Result<Config> {
|
||||
match Config::load() {
|
||||
fn get_config() -> Result<Rules> {
|
||||
match Rules::load() {
|
||||
Ok(c) => Ok(c),
|
||||
Err(_) => {
|
||||
log::warn!("Configuration not found, creating default config.");
|
||||
let config = Config::new();
|
||||
config.save()?;
|
||||
Ok(config)
|
||||
let rules = Rules::new();
|
||||
rules.save()?;
|
||||
Ok(rules)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ use clap::{Parser, Subcommand};
|
||||
mod config_cli;
|
||||
mod run_cli;
|
||||
|
||||
use cull_gmail::{Config, GmailClient, Result};
|
||||
use cull_gmail::{Rules, GmailClient, Result};
|
||||
|
||||
use config_cli::ConfigCli;
|
||||
use run_cli::RunCli;
|
||||
@@ -25,7 +25,7 @@ pub struct RulesCli {
|
||||
}
|
||||
|
||||
impl RulesCli {
|
||||
pub async fn run(&self, client: &mut GmailClient, config: Config) -> Result<()> {
|
||||
pub async fn run(&self, client: &mut GmailClient, config: Rules) -> Result<()> {
|
||||
match &self.sub_command {
|
||||
SubCmds::Config(config_cli) => config_cli.run(config),
|
||||
SubCmds::Run(run_cli) => run_cli.run(client, config).await,
|
||||
|
||||
@@ -5,7 +5,7 @@ mod label_cli;
|
||||
mod rules_cli;
|
||||
|
||||
use action_cli::ActionCli;
|
||||
use cull_gmail::{Config, Result};
|
||||
use cull_gmail::{Rules, Result};
|
||||
use label_cli::LabelCli;
|
||||
use rules_cli::RulesCli;
|
||||
|
||||
@@ -31,7 +31,7 @@ pub struct ConfigCli {
|
||||
}
|
||||
|
||||
impl ConfigCli {
|
||||
pub fn run(&self, config: Config) -> Result<()> {
|
||||
pub fn run(&self, config: Rules) -> Result<()> {
|
||||
match &self.sub_command {
|
||||
SubCmds::Rules(rules_cli) => rules_cli.run(config),
|
||||
SubCmds::Label(label_cli) => label_cli.run(config),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use clap::{Parser, ValueEnum};
|
||||
use cull_gmail::{Config, EolAction, Error, Result};
|
||||
use cull_gmail::{Rules, EolAction, Error, Result};
|
||||
|
||||
#[derive(Debug, Clone, Parser, ValueEnum)]
|
||||
pub enum Action {
|
||||
@@ -22,7 +22,7 @@ pub struct ActionCli {
|
||||
}
|
||||
|
||||
impl ActionCli {
|
||||
pub fn run(&self, mut config: Config) -> Result<()> {
|
||||
pub fn run(&self, mut config: Rules) -> Result<()> {
|
||||
if config.get_rule(self.id).is_none() {
|
||||
return Err(Error::RuleNotFound(self.id));
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use clap::{Parser, Subcommand};
|
||||
use cull_gmail::{Config, Error};
|
||||
use cull_gmail::{Rules, Error};
|
||||
|
||||
mod add_cli;
|
||||
mod list_cli;
|
||||
@@ -30,7 +30,7 @@ pub struct LabelCli {
|
||||
}
|
||||
|
||||
impl LabelCli {
|
||||
pub fn run(&self, config: Config) -> Result<(), Error> {
|
||||
pub fn run(&self, config: Rules) -> Result<(), Error> {
|
||||
match &self.command {
|
||||
LabelCommands::List(list_cli) => list_cli.run(config),
|
||||
LabelCommands::Add(add_cli) => add_cli.run(config),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use clap::Parser;
|
||||
|
||||
use cull_gmail::{Config, Error, Result};
|
||||
use cull_gmail::{Rules, Error, Result};
|
||||
|
||||
#[derive(Debug, Parser)]
|
||||
pub struct AddCli {
|
||||
@@ -13,7 +13,7 @@ pub struct AddCli {
|
||||
}
|
||||
|
||||
impl AddCli {
|
||||
pub fn run(&self, mut config: Config) -> Result<()> {
|
||||
pub fn run(&self, mut config: Rules) -> Result<()> {
|
||||
if config.get_rule(self.id).is_none() {
|
||||
return Err(Error::RuleNotFound(self.id));
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use clap::Parser;
|
||||
|
||||
use cull_gmail::{Config, Error, Result};
|
||||
use cull_gmail::{Rules, Error, Result};
|
||||
|
||||
#[derive(Debug, Parser)]
|
||||
pub struct ListCli {
|
||||
@@ -10,7 +10,7 @@ pub struct ListCli {
|
||||
}
|
||||
|
||||
impl ListCli {
|
||||
pub fn run(&self, config: Config) -> Result<()> {
|
||||
pub fn run(&self, config: Rules) -> Result<()> {
|
||||
let Some(rule) = config.get_rule(self.id) else {
|
||||
return Err(Error::RuleNotFound(self.id));
|
||||
};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use clap::Parser;
|
||||
|
||||
use cull_gmail::{Config, Error, Result};
|
||||
use cull_gmail::{Rules, Error, Result};
|
||||
|
||||
#[derive(Debug, Parser)]
|
||||
pub struct RemoveCli {
|
||||
@@ -13,7 +13,7 @@ pub struct RemoveCli {
|
||||
}
|
||||
|
||||
impl RemoveCli {
|
||||
pub fn run(&self, mut config: Config) -> Result<()> {
|
||||
pub fn run(&self, mut config: Rules) -> Result<()> {
|
||||
if config.get_rule(self.id).is_none() {
|
||||
return Err(Error::RuleNotFound(self.id));
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use clap::{Parser, Subcommand};
|
||||
use cull_gmail::{Config, Error};
|
||||
use cull_gmail::{Rules, Error};
|
||||
|
||||
mod add_cli;
|
||||
mod rm_cli;
|
||||
@@ -28,7 +28,7 @@ pub struct RulesCli {
|
||||
}
|
||||
|
||||
impl RulesCli {
|
||||
pub fn run(&self, config: Config) -> Result<(), Error> {
|
||||
pub fn run(&self, config: Rules) -> Result<(), Error> {
|
||||
match &self.command {
|
||||
RulesCommands::List => config.list_rules(),
|
||||
RulesCommands::Add(add_cli) => add_cli.run(config),
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use std::fmt;
|
||||
|
||||
use clap::{Parser, ValueEnum};
|
||||
use cull_gmail::{Config, Error, MessageAge, Retention};
|
||||
use cull_gmail::{Rules, Error, MessageAge, Retention};
|
||||
|
||||
#[derive(Debug, Clone, Parser, ValueEnum)]
|
||||
pub enum Period {
|
||||
@@ -39,7 +39,7 @@ pub struct AddCli {
|
||||
}
|
||||
|
||||
impl AddCli {
|
||||
pub fn run(&self, mut config: Config) -> Result<(), Error> {
|
||||
pub fn run(&self, mut config: Rules) -> Result<(), Error> {
|
||||
let generate = self.label.is_none();
|
||||
let message_age = MessageAge::new(self.period.to_string().as_str(), self.count);
|
||||
let retention = Retention::new(message_age, generate);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use clap::Parser;
|
||||
use cull_gmail::{Config, Error};
|
||||
use cull_gmail::{Rules, Error};
|
||||
|
||||
#[derive(Debug, Parser)]
|
||||
pub struct RmCli {
|
||||
@@ -12,7 +12,7 @@ pub struct RmCli {
|
||||
}
|
||||
|
||||
impl RmCli {
|
||||
pub fn run(&self, mut config: Config) -> Result<(), Error> {
|
||||
pub fn run(&self, mut config: Rules) -> Result<(), Error> {
|
||||
if self.id.is_none() && self.label.is_none() {
|
||||
return Err(Error::NoRuleSelector);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use clap::Parser;
|
||||
use cull_gmail::{Config, EolAction, GmailClient, Result, RuleProcessor};
|
||||
use cull_gmail::{Rules, EolAction, GmailClient, Result, RuleProcessor};
|
||||
|
||||
#[derive(Debug, Parser)]
|
||||
pub struct RunCli {
|
||||
@@ -15,7 +15,7 @@ pub struct RunCli {
|
||||
}
|
||||
|
||||
impl RunCli {
|
||||
pub async fn run(&self, client: &mut GmailClient, config: Config) -> Result<()> {
|
||||
pub async fn run(&self, client: &mut GmailClient, config: Rules) -> Result<()> {
|
||||
let rules = config.get_rules_by_label();
|
||||
|
||||
for label in config.labels() {
|
||||
|
||||
Reference in New Issue
Block a user