1
0

feat(cli): implement register and unregister commands with scope support

- Add Target enum to handle user/system scope selection
- Move scope argument from global CLI to register/unregister subcommands
- Implement actual registration logic including ProgId subkey creation
- Update Program::new to accept string path instead of Path
- Add proper error handling and success messages
This commit is contained in:
2025-10-19 17:37:51 +08:00
parent f42c50ce10
commit d493285900
3 changed files with 93 additions and 48 deletions

View File

@ -1,10 +1,28 @@
use clap::{Parser, Subcommand};
use clap::{Parser, Subcommand, ValueEnum};
use wfassoc::Scope;
#[derive(Debug, Clone, ValueEnum)]
pub enum Target {
#[value(name = "user")]
User,
#[value(name = "system")]
System,
}
impl From<Target> for Scope {
fn from(target: Target) -> Self {
match target {
Target::User => Scope::User,
Target::System => Scope::System,
}
}
}
/// Simple program to manage Windows file associations
#[derive(Parser)]
#[command(name = "Windows File Association Operator", version, about)]
pub struct Cli {
/// The toml file introducing the complete program
/// The TOML file representing the complete program
#[arg(
short = 'c',
long = "config",
@ -13,40 +31,30 @@ pub struct Cli {
)]
pub(crate) config_file: String,
/// The scope where wfassoc operate
#[arg(short = 'f', long = "for", value_name = "TARGET", value_enum, default_value_t = ForTarget::User)]
pub(crate) for_which: ForTarget,
#[command(subcommand)]
pub(crate) command: Commands,
}
#[derive(clap::ValueEnum, Clone)]
pub enum ForTarget {
#[value(name = "user")]
User,
#[value(name = "system")]
System,
}
// impl From<ForTarget> for RegisterKind {
// fn from(target: ForTarget) -> Self {
// match target {
// ForTarget::User => RegisterKind::User,
// ForTarget::System => RegisterKind::System,
// }
// }
// }
#[derive(Subcommand)]
pub enum Commands {
/// Register the program
#[command(name = "register")]
Register,
#[command(about = "Register application with given manifest and scope.")]
Register {
/// The scope where wfassoc operate
#[arg(short = 't', long = "target", value_name = "TARGET", value_enum, default_value_t = Target::User)]
target: Target,
},
/// Unregister the program
#[command(name = "unregister")]
Unregister,
#[command(about = "Unregister application with given manifest and scope.")]
Unregister {
/// The scope where wfassoc operate
#[arg(short = 't', long = "target", value_name = "TARGET", value_enum, default_value_t = Target::User)]
target: Target,
},
/// Query file associations
#[command(name = "query")]
#[command(about = "Query file extensions association infos according toh given manifest represented application.")]
Query,
}

View File

@ -2,13 +2,11 @@ pub(crate) mod cli;
pub(crate) mod manifest;
use clap::Parser;
use cli::{Cli, Commands};
use cli::{Cli, Commands, Target};
use comfy_table::Table;
use manifest::Manifest;
use std::collections::HashMap;
use std::path::PathBuf;
use std::process;
use std::str::FromStr;
use thiserror::Error as TeError;
use wfassoc::{Program, Scope, Token, View};
@ -46,10 +44,7 @@ impl Composition {
// Open file and read manifest TOML file
let mf = Manifest::from_file(&cli.config_file)?;
// Create instance
let mut program = Program::new(
&mf.identifier,
PathBuf::from_str(&cli.config_file).unwrap().as_path(),
)?;
let mut program = Program::new(&mf.identifier, &cli.config_file)?;
// Setup manner
let mut manner_token_map: HashMap<&str, Token> = HashMap::new();
for (k, v) in mf.manners.iter() {
@ -82,25 +77,40 @@ impl Composition {
&self.program
}
pub fn get_mut_program(&mut self) -> &mut Program {
&mut self.program
}
pub fn iter_ext_tokens(&self) -> impl Iterator<Item = Token> {
self.ext_tokens.iter().copied()
}
}
fn run_register(cli: &Cli) -> Result<()> {
// let program = Program::new();
// let kind: RegisterKind = cli.for_which.into();
// program.register(kind)?;
fn run_register(cli: &Cli, target: &Target) -> Result<()> {
let composition = Composition::new(cli)?;
let scope = target.clone().into();
// Register program
let program = composition.get_program();
program.register(scope)?;
// Link all file extensions
for token in composition.iter_ext_tokens() {
program.link_ext(token, scope)?;
}
println!("Register OK.");
Ok(())
}
fn run_unregister(cli: &Cli) -> Result<()> {
// let program = Program::new();
// program.unregister()?;
fn run_unregister(cli: &Cli, target: &Target) -> Result<()> {
let composition = Composition::new(cli)?;
let scope = target.clone().into();
// Unlink all file extensions
let program = composition.get_program();
for token in composition.iter_ext_tokens() {
program.unlink_ext(token, scope)?;
}
// Unregister prorgam
program.unregister(scope)?;
println!("Unregister OK.");
Ok(())
}
@ -140,8 +150,8 @@ fn main() {
let cli = Cli::parse();
let rv = match &cli.command {
Commands::Register => run_register(&cli),
Commands::Unregister => run_unregister(&cli),
Commands::Register { target } => run_register(&cli, target),
Commands::Unregister { target } => run_unregister(&cli, target),
Commands::Query => run_query(&cli),
};
rv.unwrap_or_else(|e| {